From 4768cb6ab3ab41b08cb55bed49fd7db80c544952 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 10 十二月 2025 16:56:03 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocDetlMapper.xml |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 958190a..1d3839e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -265,6 +265,12 @@
         <if test="payment != null">
             and t.payment = #{payment}
         </if>
+        <if test="sku != null">
+            and t.sku = #{sku}
+        </if>
+        <if test="supp != null">
+            and t.supp = #{supp}
+        </if>
 
     </sql>
 
@@ -342,6 +348,12 @@
         <if test="specs!=null and specs!='' ">
             and a.specs like '%' + #{specs} + '%'
         </if>
+        <if test="standby1!=null and standby1!='' ">
+            and a.standby1 like '%' + #{standby1} + '%'
+        </if>
+        <if test="standby2!=null and standby2!='' ">
+            and a.standby2 like '%' + #{standby2} + '%'
+        </if>
     </sql>
 
     <select id="getStockOutPage" resultMap="BaseResultMap">
@@ -375,11 +387,13 @@
             ROW_NUMBER() over (order by sum(a.anfme) desc) as row
             , a.matnr
             , a.batch
+            , a.standby1
+            , a.standby2
             , sum(a.anfme) as anfme
             from asr_loc_detl a
             where 1=1
             <include refid="stockOutCondition"></include>
-            group by a.matnr, a.batch
+            group by a.matnr, a.batch, a.standby1, a.standby2
          ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
@@ -400,9 +414,15 @@
         ROW_NUMBER() over (order by sum(a.anfme) desc) as row
         , a.matnr
         , sum(a.anfme) as anfme
+        , a.order_no as orderNo
+        , a.standby1
+        , a.standby2
+        , a.standby3
+        , a.box_type1 as boxType1
+        , a.box_type3 as boxType3
         from asr_loc_detl a
         where 1=1
-        group by a.matnr
+        group by a.matnr,a.order_no,a.box_type3,a.standby1,a.standby2,a.standby3,a.box_type1
     </select>
 
     <select id="selectPakoutByRule" resultMap="BaseResultMap">

--
Gitblit v1.9.1