From cbbeab9d4429f24932610eb64551c3d3b16c1707 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 25 Jun 2025 18:00:50 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=A0=91=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=87=8D=E6=9E=84=EF=BC=8C=E8=99=9A=E6=8B=9F=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=99=E6=B8=AF-=E7=BC=85=E7=94=B8?=
 =?UTF-8?q?=E5=BF=AB=E9=80=92=E9=80=BB=E8=BE=91=E3=80=82=20committer:=20he?=
 =?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xdadan/erp/emis/service/EmisBaseService.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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..047ecdb07 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 {
@@ -4860,6 +4859,9 @@ public class EmisBaseService {
          )) {
              return;
          }
+         if ("078".equals(emisWaybillSave.getTransLineType())) {
+             return;
+         }
          // 做问题件录入
          scanProblemInfo(emisWaybillSave,emisWaybillOld);
      }
@@ -4878,7 +4880,7 @@ public class EmisBaseService {
 
          Map<String, Object> 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());
             }