From e655ed6627cb0d26d68aa89cf903fe91d7252212 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 10 Jul 2024 19:10:41 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index e3885661e..55f426fa6 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -1028,7 +1028,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 //            packNo=emisTmsPackDtl.getPackNo();
 
             // 所有运单做拆包操作
-            List<EmisTmsPackDtl> packDtlList=emisTmsPackDtlMapper.selectPackDtlListByPackNo(packNo);
+            List<EmisTmsPackDtl> packDtlList=emisTmsPackDtlMapper.selectPackDtlListByPackNo(scanBillCode);
              if(!CollectionUtil.isEmpty(packDtlList)){
 
                  for (EmisTmsPackDtl emisTmsPackDtl:packDtlList) {
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
index 9cd14234b..ee77ad05d 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
@@ -123,6 +123,10 @@
                 and bl_center_confirmed='2'
             </if>
 
+            <if test="params.processStatus != null  and params.processStatus == 6">
+                and bl_center_confirmed='0'
+            </if>
+
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
                     apply_site_code in (