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 d99439c56..26aad2504 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 @@ -2844,8 +2844,7 @@ public class EmisBaseService { } } - if (("078".equals(waybill.getTransLineType()) || "002".equals(waybill.getTransLineType())) && StringUtil.isNotBlank(waybill.getVirtualRemark())) { - Date sendDate = waybill.getSendDate(); + if ("002".equals(waybill.getTransLineType()) && StringUtil.isNotBlank(waybill.getVirtualRemark())) { Date sendDate = waybill.getSendDate(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date limitDate = null; try { @@ -4865,6 +4864,9 @@ public class EmisBaseService { } public void scanProblemInfo(EmisWaybill emisWaybillSave, EmisWaybill emisWaybillOld) { + if ("078".equals(emisWaybillSave.getTransLineType())) { + return; + } String dispatchOrSendManCode = ""; if ("1".equals(emisWaybillSave.getPickupMethod())) { dispatchOrSendManCode = emisWaybillSave.getOperateEmployeeCode(); @@ -4878,7 +4880,7 @@ public class EmisBaseService { Map scanDatePromItem = new HashMap<>(); scanDatePromItem.put("billCode", emisWaybillSave.getBillCode()); - if ("078".equals(emisWaybillSave.getTransLineType()) || "002".equals(emisWaybillSave.getTransLineType())) { + if ("002".equals(emisWaybillSave.getTransLineType())) { scanDatePromItem.put("problemType", "173"); scanDatePromItem.put("remark", "出口虚拟面单"); } else { @@ -4983,7 +4985,9 @@ public class EmisBaseService { String virtualRemark = String.join(",", filterVirtualRemark); masterWaybill.setVirtualRemark(virtualRemark); emisWaybillMapper.updateEmisWaybill(masterWaybill); - emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByBillCode(emisWaybillSave.getBillCode()); + if (!"078".equals(emisWaybillSave.getTransLineType())) { + emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByBillCode(emisWaybillSave.getBillCode()); + } // 重新计算提成 emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode()); }