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-26 18:38:43 +08:00
parent 20c56ff89a
commit fad794163b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1160,14 +1160,18 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 寄件网点财务中心 // 寄件网点财务中心
EmisSite sendSite = getSiteByCode(emisWaybillSave.getSendSiteCode()); if(isNew) {
if(sendSite!=null) { EmisSite sendSite = getSiteByCode(emisWaybillSave.getSendSiteCode());
emisWaybillSave.setSendCenterCode(sendSite.getParentSiteCode()); if (sendSite != null) {
emisWaybillSave.setSendCenterCode(sendSite.getParentSiteCode());
}
} }
// 订单运单初始状态 订单为已接单，运单未初始，待揽收 // 订单运单初始状态 订单为已接单，运单未初始，待揽收
emisWaybillSave.setOrderStatus("1"); if(isNew) {
emisWaybillSave.setWaybillStatus("0"); emisWaybillSave.setOrderStatus("1");
emisWaybillSave.setWaybillStatus("0");
}
// 计算三段码 目的网点2字码+目的地名称 // 计算三段码 目的网点2字码+目的地名称
String destSite3Code = ""; String destSite3Code = "";
@ -1181,7 +1185,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 初始 派件网点=目的网点 // 初始 派件网点=目的网点
emisWaybillSave.setDispatchSiteCode(emisWaybillSave.getDispatchUnderlingSiteName()); emisWaybillSave.setDispatchSiteCode(emisWaybillSave.getDispatchUnderlingSiteName());
// 目的地名称 // 目的地名称
EmisDestination destination=getDestinationByCode(emisWaybillSave.getDestinationCode()); EmisDestination destination=getDestinationByCode(emisWaybillSave.getDestinationCode());
String destName=""; String destName="";
@ -1306,7 +1309,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybillSave.getProductType()); EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybillSave.getProductType());
emisWaybillSave.setTimeType(emisTransProduct.getAgingDesc()); emisWaybillSave.setTimeType(emisTransProduct.getAgingDesc());
if(emisWaybillSave.getSendDate()==null){ if(isNew && emisWaybillSave.getSendDate()==null){
emisWaybillSave.setSendDate(new Date()); emisWaybillSave.setSendDate(new Date());
} }