From 00860b3f449e5b3289f2809c199dd56ec75d46e3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:57:20 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/LocDetlMapper.xml |   38 +++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e88ab6f..dd66c92 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -138,29 +138,45 @@
     <select id="getStockStatis" resultType="com.zy.asrs.entity.LocDetl">
         select * from
         (
-            select
-            ROW_NUMBER() over (order by sum(a.anfme) desc) as row
-            , a.matnr
-            , sum(a.anfme) as anfme
-            from asr_loc_detl a
-            where 1=1
-            <include refid="stockOutCondition"></include>
-            group by a.matnr
-         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+        select
+        ROW_NUMBER() over (order by sum(a.anfme) desc) as row
+        , a.matnr
+        , sum(a.anfme) as anfme
+        from asr_loc_detl a
+        where 1=1
+        <!-- 鍔ㄦ�佹坊鍔犺鏍煎拰绫诲瀷鐨勬潯浠� -->
+        <if test="specs != null and specs != ''">
+            AND a.specs = #{specs}
+        </if>
+        <if test="brand != null and brand != ''">
+            AND a.brand = #{brand}
+        </if>
+        <include refid="stockOutCondition"></include>
+        group by a.matnr
+        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
+
     <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
-     select count(1) as count from
+        select count(1) as count from
         (
         select
         a.matnr
         from asr_loc_detl a
         where 1=1
+        <!-- 鍔ㄦ�佹坊鍔犺鏍煎拰绫诲瀷鐨勬潯浠� -->
+        <if test="specs != null and specs != ''">
+            AND a.specs = #{specs}
+        </if>
+        <if test="brand != null and brand != ''">
+            AND a.brand = #{brand}
+        </if>
         <include refid="stockOutCondition"></include>
         group by a.matnr
-     ) b
+        ) b
     </select>
 
+
     <select id="getStockStatisExcel" resultType="com.zy.asrs.entity.LocDetl">
         select
         ROW_NUMBER() over (order by sum(a.anfme) desc) as row

--
Gitblit v1.9.1