From 4009ad4b7d8cb6f956a03403cdc989e6ab39e667 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 26 Jul 2024 18:55:38 +0800 Subject: [PATCH] md --- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 5206cc3ba..bddaf0d8b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1195,10 +1195,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybillSave.setThirdCode(thirdCode); // 下单时间 - emisWaybillSave.setOrderDate(emisWaybillSave.getSendDate()); + if(isNew) { + emisWaybillSave.setOrderDate(emisWaybillSave.getSendDate()); + } // 订单类型为正式单 - emisWaybillSave.setOrderType("1"); + if(isNew) { + emisWaybillSave.setOrderType("1"); + } // 发件地址 EmisCustomerAddress sendAddress = new EmisCustomerAddress(); @@ -1274,8 +1278,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb customerName = newUser.getCustomerName(); } - emisWaybillSave.setCustomerCode(customerCode); - emisWaybillSave.setCustomerName(customerName); + // 月结客户直接根据月结编号获取客户编码和名称 if("2".equals(emisWaybillSave.getPaymentType())