From 74fd6eb7fb0322078f7946f51073f20e90231df1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 01 四月 2025 11:54:00 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 310366a..f3a5d79 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -44,6 +44,7 @@
         <result column="appe_user" property="appeUser" />
         <result column="appe_time" property="appeTime" />
         <result column="memo" property="memo" />
+        <result column="roll_up" property="rollUp" />
     </resultMap>
 
     <sql id="batchSeq">
@@ -106,6 +107,9 @@
         <if test="batch!=null and batch!='' ">
             and a.batch like '%' + #{batch} + '%'
         </if>
+        <if test="specs!=null and specs!='' ">
+            and a.specs like '%' + #{specs} + '%'
+        </if>
     </sql>
 
     <select id="getStockOutPage" resultMap="BaseResultMap">
@@ -138,12 +142,11 @@
             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
+            group by a.matnr
          ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
@@ -323,5 +326,18 @@
         where loc_no=#{locNo}
     </select>
 
+    <update id="updateMatTurn">
+        UPDATE a
+        SET a.matnr=b.matnr,
+            a.specs=b.specs,
+            a.maktx=b.maktx,
+            a.unit=b.unit
+        FROM asr_loc_detl a
+        INNER JOIN man_mat b ON a.matnr=#{matnrOld} AND b.matnr=#{matnr};
+    </update>
+
+    <select id="selectLocDetlMesAll" resultType="com.zy.asrs.entity.result.LocDetlMesVo">
+        select DISTINCT matnr,weight,batch, count(*) as batchNum from asr_loc_detl where 1=1 GROUP BY matnr,weight,batch
+    </select>
 
 </mapper>

--
Gitblit v1.9.1