From 92d5f4d657557feb32b7f35a51dd008407da8cbe Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 24 五月 2025 15:22:03 +0800
Subject: [PATCH] #wms网页显示字段修改

---
 src/main/resources/mapper/LocDetlMapper.xml |   72 +++++++++++++++++++++++++++++-------
 1 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index ef51f89..1f38471 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -158,6 +158,40 @@
         <include refid="batchSeq"></include>
     </update>
 
+    <sql id="stockOutConditionTwo">
+        <if test="loc_no!=null and loc_no!='' ">
+            AND a.loc_no LIKE '%' + #{loc_no} + '%'
+        </if>
+        <if test="matnr!=null and matnr!='' ">
+            AND a.matnr LIKE '%' + #{matnr} + '%'
+        </if>
+        <if test="model!=null and model!='' ">
+            AND a.model LIKE '%' + #{model} + '%'
+        </if>
+        <if test="specs!=null and specs!='' ">
+            AND a.specs LIKE '%' + #{specs} + '%'
+        </if>
+        <if test="batch!=null and batch!='' ">
+            AND a.batch LIKE '%' + #{batch} + '%'
+        </if>
+        <if test="supp!=null and supp!='' ">
+            AND a.supp LIKE '%' + #{supp} + '%'
+        </if>
+        <if test="outOrderNo!=null and outOrderNo!='' ">
+            AND a.out_order_no LIKE '%' + #{outOrderNo} + '%'
+        </if>
+        <if test="proType!=null and proType!='' ">
+            AND a.pro_type = #{proType}
+        </if>
+        <if test="temp1!=null and temp1!='' ">
+            AND a.temp1 LIKE '%' + #{temp1} + '%'
+        </if>
+        <!-- 浠ヤ笅瀛楁濡備笉鍦⊿ELECT鍜孏ROUP BY涓缓璁垹鍘绘垨鏀逛负HAVING -->
+        <!-- <if test="anfme!=null and anfme!='' ">
+            HAVING SUM(a.anfme) LIKE '%' + #{anfme} + '%'
+        </if> -->
+    </sql>
+
     <sql id="stockOutCondition">
         <if test="loc_no!=null and loc_no!='' ">
             and a.loc_no like '%' + #{loc_no} + '%'
@@ -223,29 +257,39 @@
     </select>
 
     <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
-            , a.batch
-            , sum(a.anfme) as anfme
-            from asr_loc_detl a
-            where 1=1
-            <include refid="stockOutCondition"></include>
-            group by a.matnr, a.batch
-         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+        SELECT * FROM (
+        SELECT
+        ROW_NUMBER() OVER (ORDER BY SUM(a.anfme) DESC) AS row,
+        -- 鍒嗙粍瀛楁
+        a.model,
+        a.pro_type AS proType,
+        a.out_order_no AS outOrderNo,
+        -- 闈炲垎缁勫瓧娈电敤鑱氬悎鍑芥暟鑾峰彇涓�涓唬琛ㄥ�硷紙渚嬪MAX鎴朚IN锛�
+        MAX(a.matnr) AS matnr,
+        MAX(a.specs) AS specs,
+        MAX(a.temp1) AS temp1,
+        -- 鑱氬悎鏁伴噺
+        SUM(a.anfme) AS anfme
+        FROM asr_loc_detl a
+        WHERE 1=1
+        <include refid="stockOutConditionTwo"/>
+        GROUP BY a.model, a.pro_type, a.out_order_no
+        ) 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
-        a.matnr
+        a.model
         from asr_loc_detl a
         where 1=1
         <include refid="stockOutCondition"></include>
-        group by a.matnr
+        group by a.model
      ) b
     </select>
 

--
Gitblit v1.9.1