From ebba0584c6a534ecc3deecfa79ce4f4957fa9408 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 4 Mar 2026 17:47:43 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20tms-=E8=BF=90=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E8=BD=AC=E4=BB=B6=E7=AE=A1=E7=90=86-=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/web/emis/EmisWaybillTransferController.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
index a7f494880..a8b5d7117 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
@@ -161,7 +161,7 @@ public class EmisWaybillTransferController extends EmisBaseController
             String billCode = emisWaybillTransfer.getBillCode();
             // 获取主单号
             String mainBillCode = emisBaseService.getMainBillCode(billCode);
-            
+
             // 检查主单号的问题件（问题件通常关联到主单号）
             EmisWaybillProblemInfo queryProblem = new EmisWaybillProblemInfo();
             queryProblem.setBillCode(mainBillCode);
@@ -169,7 +169,7 @@ public class EmisWaybillTransferController extends EmisBaseController
             if(!CollectionUtils.isEmpty(problemList)){
                 for(EmisWaybillProblemInfo problemInfo : problemList){
                     Integer problemType = problemInfo.getProblemType();
-                    if(problemType != null && (problemType == 151 || problemType == 170 || problemType == 173)){
+                    if (problemType != null && (problemType == 151 || problemType == 170 || problemType == 173) && mainBillCode.equals(problemInfo.getBillCode())) {
                         String problemTypeName = "";
                         if(problemType == 151){
                             problemTypeName = "面单删除";
@@ -182,7 +182,7 @@ public class EmisWaybillTransferController extends EmisBaseController
                     }
                 }
             }
-            
+
             // 如果传入的是子单号，也检查子单号的问题件
             if(!billCode.equals(mainBillCode)){
                 EmisWaybillProblemInfo querySubProblem = new EmisWaybillProblemInfo();
@@ -191,7 +191,7 @@ public class EmisWaybillTransferController extends EmisBaseController
                 if(!CollectionUtils.isEmpty(subProblemList)){
                     for(EmisWaybillProblemInfo problemInfo : subProblemList){
                         Integer problemType = problemInfo.getProblemType();
-                        if(problemType != null && (problemType == 151 || problemType == 170 || problemType == 173)){
+                        if (problemType != null && (problemType == 151 || problemType == 170 || problemType == 173) && billCode.equals(problemInfo.getBillCode())) {
                             String problemTypeName = "";
                             if(problemType == 151){
                                 problemTypeName = "面单删除";