From 685df55fa55465a61b330cb54b87cbc41cf0f717 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 15 Oct 2025 09:54:16 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-15=20=E6=8B=A3=E8=B4=A7=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5=20=20=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=8F=91=E8=B4=A7=E8=A3=85=E7=AE=B1=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BoxForNotificationServiceImpl.java   |  4 ++
 .../boxManage/BoxForNotificationMapper.xml    | 40 +++++++++++--------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/boxManage/service/impl/BoxForNotificationServiceImpl.java b/src/main/java/com/gaotao/modules/boxManage/service/impl/BoxForNotificationServiceImpl.java
index a08594f..68b8c28 100644
--- a/src/main/java/com/gaotao/modules/boxManage/service/impl/BoxForNotificationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/boxManage/service/impl/BoxForNotificationServiceImpl.java
@@ -18,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+import static com.gaotao.modules.outboundNotification.service.impl.OutboundNotificationServiceImpl.convertToSQLString;
+
 @Service
 public  class BoxForNotificationServiceImpl implements BoxForNotificationService {
     @Autowired
@@ -342,6 +344,8 @@ public  class BoxForNotificationServiceImpl implements BoxForNotificationService
 
     @Override
     public List<OutboundNotificationHeadVo> searchOutboundNotificationWithDetail(OutboundNotificationHeadVo data) {
+        String[] arr = convertToSQLString(data.getOrderStatus()).replace("(", "").replace(")", "").replace("'", "").split(",");
+        data.setStatusArr(arr);
         return boxForNotificationMapper.searchOutboundNotificationWithDetail(data);
     }
 }
diff --git a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
index bb1f532..880fb81 100644
--- a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
+++ b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
@@ -23,15 +23,10 @@
         from so_receive_boxes s
         left join warehouse w on s.WareHouseID = w.WareHouseID and s.site = w.site and s.bu_no = w.bu_no
         <where>
-            <if test="site != null and site != ''">
-                and s.site = #{site}
-            </if>
+            s.site = #{site} and s.bu_no = #{buNo}
             <if test="orderNo != null and orderNo != ''">
                 and s.order_no = #{orderNo}
             </if>
-            <if test="buNo != null and buNo != ''">
-                and s.bu_no = #{buNo}
-            </if>
             <if test="boxType != null and boxType != ''">
                 and s.box_type = #{boxType}
             </if>
@@ -155,10 +150,23 @@
     </delete>
 
     <select id="searchRollForOrderNo" resultType="SoReceiveBoxRollsData">
-        select ROW_NUMBER() OVER (ORDER BY b.received_date) orderId, b.id,b.site,b.bu_no,
-        b.box_no,b.final_roll_no,b.roll_qty,b.received_by,b.received_date,b.WareHouseID,b.part_no,
-        c.warehouse_id,c.batch_no,c.location_id
-        from so_receive_boxes a left join so_receive_box_rolls b on a.site = b.site and a.box_no = b.box_no and a.bu_no = b.bu_no
+        select
+            ROW_NUMBER() OVER (ORDER BY b.received_date) orderId,
+            b.id,
+            b.site,
+            b.bu_no,
+            b.box_no,
+            b.final_roll_no,
+            b.roll_qty,
+            b.received_by,
+            b.received_date,
+            b.WareHouseID,
+            b.part_no,
+            c.warehouse_id,
+            c.batch_no,
+            c.location_id
+        from so_receive_boxes a
+        left join so_receive_box_rolls b on a.site = b.site and a.box_no = b.box_no and a.bu_no = b.bu_no
         left join inventory_stock c on b.site = c.site and b.final_roll_no = c.roll_no and b.bu_no = c.bu_no
         where a.site = #{site} and a.order_no = #{orderNo} and a.bu_no = #{buNo}
     </select>
@@ -180,12 +188,7 @@
             s.bu_no as buNo
         FROM so_receive_cases s
         <where>
-            <if test="site != null and site != ''">
-                AND s.site = #{site}
-            </if>
-            <if test="buNo != null and buNo != ''">
-                AND s.bu_no = #{buNo}
-            </if>
+            s.site = #{site} AND s.bu_no = #{buNo}
             <if test="notifyNo != null and notifyNo != ''">
                 AND s.NotifyNo = #{notifyNo}
             </if>
@@ -333,7 +336,10 @@
                 AND a.order_type = #{orderType}
             </if>
             <if test="orderStatus != null and orderStatus != ''">
-                AND a.order_status = #{orderStatus}
+                AND a.order_status in
+                <foreach collection="statusArr" close=")" open="(" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="customerId != null and customerId != ''">
                 AND a.customer_id LIKE '%' + #{customerId} + '%'