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 2adc54b92..d85b2eba0 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 @@ -644,7 +644,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 寄件网点财务中心 EmisSite sendSite = getSiteByCode(emisWaybillSave.getSendSiteCode()); - emisWaybillSave.setSendCenterCode(sendSite.getParentSiteCode()); + if(sendSite!=null) { + emisWaybillSave.setSendCenterCode(sendSite.getParentSiteCode()); + } if(StringUtils.isEmpty(emisWaybillSave.getPackType())){ throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"包装类型必填"); @@ -665,9 +667,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb EmisSite destSite=getSiteByCode(emisWaybillSave.getDispatchUnderlingSiteCode()); if(destSite!=null){ destSite3Code=destSite.getSizeCode2(); + // 目的网点财务中心 + emisWaybillSave.setDestinationCenterCode(destSite.getParentSiteCode()); } - // 目的网点财务中心 - emisWaybillSave.setDestinationCenterCode(destSite.getParentSiteCode()); + // 目的地名称 EmisDestination destination=getDestinationByCode(emisWaybillSave.getDestinationCode());