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