From edb540e6444a6e809c66393500bb175a8a4eef44 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 十一月 2025 11:51:48 +0800
Subject: [PATCH] *

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

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index ff0437d..655435c 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">
@@ -103,6 +104,18 @@
         <if test="crnNo!=null and crnNo!='' ">
             and b.crn_no=#{crnNo}
         </if>
+        <if test="batch!=null and batch!='' ">
+            and a.batch like '%' + #{batch} + '%'
+        </if>
+        <if test="specs!=null and specs!='' ">
+            and a.specs like '%' + #{specs} + '%'
+        </if>
+        <if test="model!=null and model!='' ">
+            and a.model like '%' + #{model} + '%'
+        </if>
+        <if test="danger!=null">
+            and a.danger = #{danger}
+        </if>
     </sql>
 
     <select id="getStockOutPage" resultMap="BaseResultMap">
@@ -135,12 +148,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>
 
@@ -320,5 +332,15 @@
         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>
+
 
 </mapper>

--
Gitblit v1.9.1