aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-27 07:32:13 +08:00
parent d6a4eb02e8
commit 1b0ce19cfb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1030,6 +1030,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// oms 客户必须存在 // oms 客户必须存在
String customerCode = emisWaybillSave.getCustomerCode(); String customerCode = emisWaybillSave.getCustomerCode();
String customerName = "";
// 计算三段码 目的网点2字码+目的地名称 // 计算三段码 目的网点2字码+目的地名称
String destSite3Code = ""; String destSite3Code = "";
@ -1106,9 +1107,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setSalesmen(emisCustomerUser.getSalesmen()); emisWaybillSave.setSalesmen(emisCustomerUser.getSalesmen());
emisWaybillSave.setPayee(emisCustomerUser.getPayee()); emisWaybillSave.setPayee(emisCustomerUser.getPayee());
customerName=emisCustomerUser.getCustomerName();
simpleName=emisCustomerUser.getSimpleName(); simpleName=emisCustomerUser.getSimpleName();
}else{ }else{
EmisCustomerUser emisCustomerUser=getCustomerUserByCode(customerCode); EmisCustomerUser emisCustomerUser=getCustomerUserByCode(customerCode);
customerName=emisCustomerUser.getCustomerName();
simpleName=emisCustomerUser.getPhone(); simpleName=emisCustomerUser.getPhone();
if(StringUtils.isEmpty(simpleName)){ if(StringUtils.isEmpty(simpleName)){
simpleName=emisWaybillSave.getSendMobile(); simpleName=emisWaybillSave.getSendMobile();
@ -1159,7 +1164,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWarehouseIn.setEntryDate(emisWaybillSave.getPickStartDate()); emisWarehouseIn.setEntryDate(emisWaybillSave.getPickStartDate());
emisWarehouseIn.setConfirmStatus("0"); emisWarehouseIn.setConfirmStatus("0");
emisWarehouseIn.setUsedStatus("0"); emisWarehouseIn.setUsedStatus("0");
emisWarehouseIn.setStatus(0); emisWarehouseIn.setStatus("0");
emisWarehouseIn.setBillCode(emisWaybillSave.getBillCode()); emisWarehouseIn.setBillCode(emisWaybillSave.getBillCode());
emisWarehouseIn.setSerialNo(WaybillHelper.genSeqNo()); emisWarehouseIn.setSerialNo(WaybillHelper.genSeqNo());