diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplier.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplier.java index 7cff5f38..8445506e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplier.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplier.java @@ -125,6 +125,12 @@ public class SysSupplier extends BaseEntity @Excel(name = "开户银行账号") private String bankAccount; + @Excel(name="开票公司名称") + private String invoiceCompanyName; + + @Excel(name="开票公司税号") + private String companyTaxNumber; + /** RMB注册资金 */ @Excel(name = "RMB注册资金") private String rmbRegisteredCapital; @@ -153,6 +159,21 @@ public class SysSupplier extends BaseEntity @Excel(name = "税率") private String taxRate; + @Excel(name = "发货人") + private String deliverPerson; + @Excel(name = "发货人电话") + private String deliverPersonPhone; + + @Excel(name = "发货地址") + private String deliverAddress; + + @Excel(name = "收货人") + private String receivePerson; + @Excel(name = "收货人电话") + private String receivePersonPhone; + @Excel(name = "收货地址") + private String receiveAddress; + /** 流程实例ID */ private String instanceId; @@ -635,7 +656,69 @@ public class SysSupplier extends BaseEntity return taxRate; } + public String getInvoiceCompanyName() { + return invoiceCompanyName; + } + + public void setInvoiceCompanyName(String invoiceCompanyName) { + invoiceCompanyName = invoiceCompanyName; + } + + public String getCompanyTaxNumber() { + return companyTaxNumber; + } + + public void setCompanyTaxNumber(String companyTaxNumber) { + this.companyTaxNumber = companyTaxNumber; + } + + public String getDeliverPerson() { + return deliverPerson; + } + + public void setDeliverPerson(String deliverPerson) { + this.deliverPerson = deliverPerson; + } + + public String getDeliverPersonPhone() { + return deliverPersonPhone; + } + + public void setDeliverPersonPhone(String deliverPersonPhone) { + this.deliverPersonPhone = deliverPersonPhone; + } + + public String getDeliverAddress() { + return deliverAddress; + } + + public void setDeliverAddress(String deliverAddress) { + this.deliverAddress = deliverAddress; + } + + public String getReceivePerson() { + return receivePerson; + } + + public void setReceivePerson(String receivePerson) { + this.receivePerson = receivePerson; + } + public String getReceivePersonPhone() { + return receivePersonPhone; + } + + public void setReceivePersonPhone(String receivePersonPhone) { + this.receivePersonPhone = receivePersonPhone; + } + + public String getReceiveAddress() { + return receiveAddress; + } + + public void setReceiveAddress(String receiveAddress) { + this.receiveAddress = receiveAddress; + } @Override public String toString() { @@ -672,6 +755,15 @@ public class SysSupplier extends BaseEntity .append("financialContact", getFinancialContact()) .append("confirmTax", getConfirmTax()) .append("taxRate", getTaxRate()) + .append("InvoiceCompanyName", getInvoiceCompanyName()) + .append("companyTaxNumber", getCompanyTaxNumber()) + .append("deliverPerson", getDeliverPerson()) + .append("deliverPersonPhone", getDeliverPersonPhone()) + .append("deliverAddress", getDeliverAddress()) + .append("receivePerson", getReceivePerson()) + .append("receivePersonPhone", getReceivePersonPhone()) + .append("receiveAddress",getReceiveAddress()) + .toString(); } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml index 87bf0fd7..70622a35 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml @@ -34,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -41,6 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -67,9 +72,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" legal_representative, customer_contact, contact_number, customer_fax, customer_email, website, payment_terms, supplier_days, actual_payment_days, settlement_bank, exchange_settlement_account, deposit_bank, bank_account, - rmb_registered_capital, Industry_code, merchandiser, merchandiser_telephone, - financial_contact, confirm_tax, tax_rate, create_by, - create_time, update_by, update_time, remark, + invoice_company_name, company_tax_number,rmb_registered_capital, Industry_code, + merchandiser, merchandiser_telephone,financial_contact, confirm_tax, tax_rate, + receive_person, receive_person_phone, receive_address, + create_by,create_time, update_by, update_time, remark, instance_type, instance_id, restore_instance_id, cancel_instance_id, submit_instance_id, apply_title, apply_user, apply_time,del_flag from sys_supplier @@ -83,8 +89,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sup.legal_representative, sup.customer_contact, sup.contact_number, sup.customer_fax, sup.customer_email, sup.website, sup.payment_terms, sup.supplier_days, sup.actual_payment_days, sup.settlement_bank, sup.exchange_settlement_account, sup.deposit_bank, sup.bank_account, - sup.rmb_registered_capital, sup.Industry_code, sup.merchandiser, sup.merchandiser_telephone, - sup.financial_contact, sup.confirm_tax, sup.tax_rate, sup.first_add_time, sup.update_info_time, + sup.invoice_company_name, sup.company_tax_number,sup.rmb_registered_capital, sup.Industry_code, + sup.merchandiser, sup.merchandiser_telephone,sup.financial_contact, sup.confirm_tax, sup.tax_rate, + sup.receive_person, sup.receive_person_phone, sup.receive_address,sup.first_add_time, sup.update_info_time, sup.create_by, sup.create_time, sup.update_by, sup.update_time, sup.remark,sup.del_flag, sup.instance_type, sup.instance_id, sup.restore_instance_id, sup.cancel_instance_id, sup.submit_instance_id, sup.apply_title, sup.apply_user, sup.apply_time,p.dict_value as instance_type_name,file.url as photo_url @@ -114,6 +121,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sup.enterprise_name like concat('%', #{enterpriseName}, '%') and sup.customer_contact like concat('%', #{customerContact}, '%') and sup.merchandiser like concat('%', #{merchandiser}, '%') + or sup.deliver_person like concat('%',#{deliverPerson},'%') + or sup.deliver_person_phone like concat('%',#{deliverPersonPhone},'%') + or sup.deliver_address like concat('%',#{deliverAddress},'%') + or sup.receive_person like concat('%',#{receivePerson},'%') + or sup.receive_person_phone like concat('%',#{receivePersonPhone},'%') + or sup.receive_address like concat('%',#{receiveAddress},'%') + and sup.invoice_company_name like concat('%', #{invoiceCompanyName}, '%') + and sup.company_tax_number like concat('%', #{companyTaxNumber}, '%') + and sup.instance_id = #{instanceId} and sup.instance_type = #{instanceType} and sup.submit_instance_id = #{submitInstanceId} @@ -122,7 +138,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sup.apply_title = #{applyTitle} and sup.apply_user = #{applyUser} and sup.apply_time = #{applyTime} - and sup.create_time between #{params.beginCreateTime} and #{params.endCreateTime} and ((sup.supplierCode like concat('%',#{keyword},'%') or sup.suppplierName like concat('%',#{keyword},'%')) @@ -137,6 +152,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sup.legal_representative, sup.customer_contact, sup.contact_number, sup.customer_fax, sup.customer_email, sup.website, sup.payment_terms, sup.supplier_days, sup.actual_payment_days, sup.settlement_bank, sup.exchange_settlement_account, sup.deposit_bank, sup.bank_account, + sup.deliver_person, sup.deliver_person_phone, sup.deliver_address, sup.receive_person, + sup.receive_person_phone, sup.receive_address, sup.invoice_company_name, sup.company_tax_number, sup.rmb_registered_capital, sup.Industry_code, sup.merchandiser, sup.merchandiser_telephone, sup.financial_contact, sup.confirm_tax, sup.tax_rate, sup.first_add_time, sup.update_info_time, sup.create_by, sup.create_time, sup.update_by, sup.update_time, sup.remark,sup.del_flag, @@ -209,6 +226,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" exchange_settlement_account, deposit_bank, bank_account, + invoice_company_name, + company_tax_number, + deliver_person, + deliver_person_phone, + deliver_address, + receive_person, + receive_person_phone, + receive_address, rmb_registered_capital, Industry_code, merchandiser, @@ -258,6 +283,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{exchangeSettlementAccount}, #{depositBank}, #{bankAccount}, + #{invoiceCompanyName}, + #{companyTaxNumber}, + #{deliverPerson}, + #{deliverPersonPhone}, + #{deliverAddress}, + #{receivePerson}, + #{receivePersonPhone}, + #{receiveAddress}, #{rmbRegisteredCapital}, #{industryCode}, #{merchandiser}, @@ -311,6 +344,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" exchange_settlement_account = #{exchangeSettlementAccount}, deposit_bank = #{depositBank}, bank_account = #{bankAccount}, + invoice_company_name = #{invoiceCompanyName}, + company_tax_number = #{companyTaxNumber}, + deliver_person = #{deliverPerson}, + deliver_person_phone = #{deliverPersonPhone}, + deliver_address = #{deliverAddress}, + receive_person = #{receivePerson}, + receive_person_phone = #{receivePersonPhone}, + receive_address = #{receiveAddress}, rmb_registered_capital = #{rmbRegisteredCapital}, Industry_code = #{industryCode}, merchandiser = #{merchandiser}, diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html index 170e6bfb..a2402651 100644 --- a/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html @@ -207,6 +207,18 @@ +
+ +
+ +
+
+
+ +
+ +
+
@@ -248,6 +260,42 @@ class="form-control" type="text" placeholder="%">
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgzgVerify.html index 1046e38e..279bd231 100644 --- a/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgzgVerify.html @@ -207,6 +207,18 @@
+
+ +
+ +
+
+
+ +
+ +
+
@@ -248,6 +260,42 @@ class="form-control" type="text" placeholder="%">
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/supplier/taskModifyApply.html index d65507db..051c8e8c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/supplier/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/supplier/taskModifyApply.html @@ -180,6 +180,18 @@
+
+ +
+ +
+
+
+ +
+ +
+
@@ -219,6 +231,42 @@
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+