diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 02db2e8c9..0458792a2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -2851,7 +2851,7 @@ public class EmisBaseService { .filter(s -> s != null && s.length() >= 6) .map(s -> s.substring(s.length() - 6)) .collect(Collectors.joining(",")); - remark = remark + " " + "该运单为主单,对应虚拟单为" + shortCodes; + remark = remark + " " + "该运单为主单,对应虚拟单为" + shortCodes + ","; } // if (StringUtil.isNotBlank(waybill.getMasterBillCode())) { // remark = remark + " " + "该运单为虚拟单,对应主单为" + waybill.getMasterBillCode(); 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 7f0c62c98..0121603d7 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 @@ -2286,6 +2286,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybillSave.setOrderSn(orderSn); } + if(StringUtil.isBlank(emisWaybillSave.getStartSiteCode())){ + emisWaybillSave.setStartSiteCode(emisWaybillSave.getSendSiteCode()); + } + if( StringUtils.isAnyEmpty( emisWaybillSave.getTransLineType(),