diff --git a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java index 2c46aa4d..6a90c93a 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java +++ b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java @@ -103,5 +103,7 @@ public class EcssCoDelNotifyHeader extends QueryPage { * 总体积 */ private java.math.BigDecimal totalVolume; + + private String templateNo; } diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java index d689519d..f1ba6dda 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java @@ -257,6 +257,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService { headerList.setShippingMode(list.get(0).getShippingMode()); // 如果有按发票号分别设置的客户信息,则使用该信息;否则使用全局信息 + String templateNoKey = "templateNo_" + cmcInvoice; String customerNameKey = "customerName_" + cmcInvoice; String localShipAddressKey = "localShipAddress_" + cmcInvoice; String overseasShipperKey = "overseasShipper_" + cmcInvoice; @@ -265,6 +266,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService { String salesAreaKey = "salesArea_" + cmcInvoice; // 从请求参数中获取按发票号设置的客户信息,并进行 HTML 反转义处理 + String templateNo = unescapeHtml(request.getParameter(templateNoKey)); String customerName = unescapeHtml(request.getParameter(customerNameKey)); String localShipAddress = unescapeHtml(request.getParameter(localShipAddressKey)); String overseasShipper = unescapeHtml(request.getParameter(overseasShipperKey)); @@ -273,6 +275,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService { String salesArea = unescapeHtml(request.getParameter(salesAreaKey)); // 如果按发票号的信息不存在,则使用全局信息 + headerList.setTemplateNo(templateNo); headerList.setCustomerName(customerName != null ? customerName : unescapeHtml(inData.getCustomerName())); headerList.setLocalShipAddress(localShipAddress != null ? localShipAddress : unescapeHtml(inData.getLocalShipAddress())); headerList.setOverseasShipper(overseasShipper != null ? overseasShipper : unescapeHtml(inData.getOverseasShipper())); diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 41bc2fe2..6ba7d4e8 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java @@ -98,6 +98,18 @@ public class CoDelServiceImpl implements CoDelService { @Override public void updateCustomerInfo(EcssCoDelNotifyHeaderData data) { coDelMapper.updateCustomerInfo(data); + if (data.getTemplateNo() != null && !data.getTemplateNo().trim().isEmpty()) { + Map params = new HashMap<>(); + params.put("ccusname", data.getCustomerName()); + params.put("localShipAddress", data.getLocalShipAddress()); + params.put("overseasShipper", data.getOverseasShipper()); + params.put("overseasAddress", data.getOverseasAddress()); + params.put("cnative", data.getCnative()); + params.put("salesArea", data.getSalesArea()); + params.put("templateNo", data.getTemplateNo()); + coDelMapper.updateCustomerTemplate(params); + + } } @Override @@ -2590,7 +2602,7 @@ public class CoDelServiceImpl implements CoDelService { // 判断是否为纯新增场景 boolean isNewTemplate = originalTemplate == null; - + // 判断模板名称是否发生变化 boolean nameChanged = !templateName.equals(originalTemplateName); diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index 6f6d5b47..10a7664b 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -4,7 +4,8 @@ insert into ecss_CoDelNotifyHeader(site,bu_no,delNo,ready_date,customer_name,Destination,shipping_mode,erp_flag,notify_status, - remark,createDate,createBy,cmc_invoice,overseasShipper,overseasAddress,cnative,localShipAddress,salesArea) + remark,createDate,createBy,cmc_invoice,overseasShipper,overseasAddress,cnative,localShipAddress,salesArea,templateNo) values(#{site},#{buNo},#{delNo},#{readyDate},#{customerName,jdbcType=NVARCHAR},#{destination,jdbcType=NVARCHAR},#{shippingMode},'N',#{notifyStatus},#{remark,jdbcType=NVARCHAR},GetDate(), - #{createBy},#{cmcInvoice},#{overseasShipper,jdbcType=NVARCHAR},#{overseasAddress,jdbcType=NVARCHAR},#{cnative,jdbcType=NVARCHAR},#{localShipAddress,jdbcType=NVARCHAR}, #{salesArea,jdbcType=NVARCHAR}) + #{createBy},#{cmcInvoice},#{overseasShipper,jdbcType=NVARCHAR},#{overseasAddress,jdbcType=NVARCHAR},#{cnative,jdbcType=NVARCHAR}, + #{localShipAddress,jdbcType=NVARCHAR}, #{salesArea,jdbcType=NVARCHAR},#{templateNo,jdbcType=NVARCHAR}) insert into ecss_CoDelNotifyDetail (site,bu_no,delNo,item_no,salesOrder,salesOrder_item_no,customerPO,line,version, @@ -1433,7 +1435,7 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no update ecss_Customer_template - set ccusname = #{ccusname},template_name = #{templateName}, + set ccusname = #{ccusname}, localShipAddress = #{localShipAddress}, overseasShipper = #{overseasShipper}, overseasAddress = #{overseasAddress},