From 29e5ad406850de92a84ae2e36b6a9c93b90596c6 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Fri, 14 Jun 2024 13:52:14 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BALong=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=82=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=B5=84=E6=96=99=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/domain/SysSalesOrder.java | 6 +- .../service/impl/SysCustomerServiceImpl.java | 58 +++++++++---------- .../system/salesOrder/salesOrder.html | 5 +- 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java index 4469f7ca..39759ba4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java @@ -59,7 +59,7 @@ public class SysSalesOrder extends BaseEntity { /*物料合计*/ private Double materialSum; /*数量合计*/ - private Double enterpriseSum; + private Long enterpriseSum; /*不含税单价(RMB)*/ private Double noRmbPrice; /*不含税总价(RMB)*/ @@ -305,11 +305,11 @@ public class SysSalesOrder extends BaseEntity { this.materialSum = materialSum; } - public Double getEnterpriseSum() { + public Long getEnterpriseSum() { return enterpriseSum; } - public void setEnterpriseSum(Double enterpriseSum) { + public void setEnterpriseSum(Long enterpriseSum) { this.enterpriseSum = enterpriseSum; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index 1a0c66fe..6e46e2cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -161,36 +161,36 @@ public class SysCustomerServiceImpl implements ISysCustomerService sysCustomer.setCreateTime(DateUtils.getNowDate()); SysContacts sysContacts = new SysContacts(); //添加联系人 - sysContacts.setCustomerName(sysCustomer.getCustomerContact()); - sysContacts.setCellPhone(sysCustomer.getContactNumber()); - sysContacts.setCustomerPosition(sysCustomer.getCustomerOffice()); - sysContacts.setCustomerFax(sysCustomer.getCustomerFax()); - sysContacts.setCommonEmail(sysCustomer.getCustomerEmail()); - sysContacts.setEnterpriseCode(sysCustomer.getEnterpriseCode()); - sysContacts.setEnterpriseName(sysCustomer.getEnterpriseName()); - sysContactsService.insertSysContacts(sysContacts); - sysCustomer.setCustomerContactId(sysContacts.getContactid()); +// sysContacts.setCustomerName(sysCustomer.getCustomerContact()); +// sysContacts.setCellPhone(sysCustomer.getContactNumber()); +// sysContacts.setCustomerPosition(sysCustomer.getCustomerOffice()); +// sysContacts.setCustomerFax(sysCustomer.getCustomerFax()); +// sysContacts.setCommonEmail(sysCustomer.getCustomerEmail()); +// sysContacts.setEnterpriseCode(sysCustomer.getEnterpriseCode()); +// sysContacts.setEnterpriseName(sysCustomer.getEnterpriseName()); +// sysContactsService.insertSysContacts(sysContacts); +// sysCustomer.setCustomerContactId(sysContacts.getContactid()); //添加发货地址 - SysShippingAddress sysShippingAddress = new SysShippingAddress(); - sysShippingAddress.setCustomerName(sysCustomer.getCustomerContact()); - sysShippingAddress.setCustomerPhone(sysCustomer.getDeliveryCustomerPhone()); - sysShippingAddress.setCustomerName(sysCustomer.getDeliveryCustomerPerson()); - sysShippingAddress.setPostalCode(sysCustomer.getDeliveryCustomerPostal()); - sysShippingAddress.setDeliveryAddress(sysCustomer.getDeliveryAddress()); - sysShippingAddress.setEnterpriseCode(sysCustomer.getEnterpriseCode()); - sysShippingAddress.setEnterpriseName(sysCustomer.getEnterpriseName()); - sysShippingAddressService.insertSysShippingAddress(sysShippingAddress); - sysCustomer.setDeliveryAddressId(sysShippingAddress.getDeliveryId()); - SysInvoice invoice = new SysInvoice(); - invoice.setEnterpriseCode(sysCustomer.getEnterpriseCode()); - invoice.setEnterpriseName(sysCustomer.getEnterpriseName()); - invoice.setInvoiceCompanyCode(sysCustomer.getInvoiceCode()); - invoice.setInvoiceCompanyName(sysCustomer.getInvoicingCompanyName()); - invoice.setDepositBank(sysCustomer.getDepositBank()); - invoice.setBankAccount(sysCustomer.getBankAccount()); - invoice.setCreateBy(loginName); - invoice.setCreateTime(DateUtils.getNowDate()); - sysInvoiceService.insertSysInvoice(invoice); +// SysShippingAddress sysShippingAddress = new SysShippingAddress(); +// sysShippingAddress.setCustomerName(sysCustomer.getCustomerContact()); +// sysShippingAddress.setCustomerPhone(sysCustomer.getDeliveryCustomerPhone()); +// sysShippingAddress.setCustomerName(sysCustomer.getDeliveryCustomerPerson()); +// sysShippingAddress.setPostalCode(sysCustomer.getDeliveryCustomerPostal()); +// sysShippingAddress.setDeliveryAddress(sysCustomer.getDeliveryAddress()); +// sysShippingAddress.setEnterpriseCode(sysCustomer.getEnterpriseCode()); +// sysShippingAddress.setEnterpriseName(sysCustomer.getEnterpriseName()); +// sysShippingAddressService.insertSysShippingAddress(sysShippingAddress); +// sysCustomer.setDeliveryAddressId(sysShippingAddress.getDeliveryId()); +// SysInvoice invoice = new SysInvoice(); +// invoice.setEnterpriseCode(sysCustomer.getEnterpriseCode()); +// invoice.setEnterpriseName(sysCustomer.getEnterpriseName()); +// invoice.setInvoiceCompanyCode(sysCustomer.getInvoiceCode()); +// invoice.setInvoiceCompanyName(sysCustomer.getInvoicingCompanyName()); +// invoice.setDepositBank(sysCustomer.getDepositBank()); +// invoice.setBankAccount(sysCustomer.getBankAccount()); +// invoice.setCreateBy(loginName); +// invoice.setCreateTime(DateUtils.getNowDate()); +// sysInvoiceService.insertSysInvoice(invoice); int result = sysCustomerMapper.insertSysCustomer(sysCustomer); sysCustomer.getCustomerId(); return result; diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html index f0e748b1..f3576170 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html @@ -234,7 +234,6 @@ pageSize: 10, sortable: true, // 是否启用排序 sortStable: true, // 设置为 true 将获得稳定的排序 - detailView: true, fixedColumns: true, // 启用冻结列 rightFixedColumns:1, fixedRightNumber: 1, // 冻结右列个数 @@ -323,9 +322,7 @@ {title: '更新人',field:'updateBy'}, {title: '更新时间',field:'updateTime'}, {title: '备注',field:'remark'}, - {title: '操作', - align: 'center', - formatter: function (value, row, index) { + {title: '操作',align: 'center',formatter: function (value, row, index) { var actions = []; if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId) { // 作废