From 7bf8de3e8dea04232ee3f6734732c398cfd8cb19 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 04 九月 2025 08:15:41 +0800
Subject: [PATCH] 许可证有效期”改成“仓储系统许可有效期

---
 src/main/resources/mapper/LocDetlMapper.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 3f5a495..3298208 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -401,11 +401,15 @@
             , a.maktx
             , a.model
             , a.volume
+            ,manu_date manuDate
+            ,batch
             , sum(a.anfme) as anfme
+            ,sum(a.weight) weight
+            ,sum(a.man_length) manLength
             from asr_loc_detl a
             where 1=1
             <include refid="stockOutCondition"></include>
-            group by a.matnr,a.maktx,a.model,a.volume
+            group by a.matnr,a.maktx,a.model,a.volume,manu_date,batch
          ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
@@ -417,10 +421,12 @@
         , a.maktx
         , a.model
         , a.volume
+        ,manu_date manuDate
+        ,batch
         from asr_loc_detl a
         where 1=1
         <include refid="stockOutCondition"></include>
-        group by a.matnr, a.maktx, a.model,a.volume
+        group by a.matnr,a.maktx,a.model,a.volume,manu_date,batch
      ) b
     </select>
 
@@ -428,10 +434,17 @@
         select
         ROW_NUMBER() over (order by sum(a.anfme) desc) as row
         , a.matnr
+        , a.maktx
+        , a.model
+        , a.volume
+        ,manu_date manuDate
+        ,batch
         , sum(a.anfme) as anfme
+        ,sum(a.weight) weight
+        ,sum(a.man_length) manLength
         from asr_loc_detl a
         where 1=1
-        group by a.matnr
+        group by a.matnr,a.maktx,a.model,a.volume,manu_date,batch
     </select>
 
     <select id="selectPakoutByRule" resultMap="BaseResultMap">

--
Gitblit v1.9.1