From 320c070d43cd60ed952bb755d57ed19a5a9177ba Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 11:34:38 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dfff812..e1e20a8 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">
@@ -100,6 +101,15 @@
         <if test="startTime!=null and endTime!=null">
             and a.modi_time between #{startTime} and #{endTime}
         </if>
+        <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>
     </sql>
 
     <select id="getStockOutPage" resultMap="BaseResultMap">
@@ -132,11 +142,12 @@
             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
+            group by a.matnr, a.batch
          ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
@@ -211,7 +222,7 @@
             and a.batch = #{batch}
         </if>
         <if test="orderNo != null and orderNo != ''">
-            and a.orderNo = #{orderNo}
+            and a.order_no = #{orderNo}
         </if>
 
         <if test="locNos != null and locNos.size > 0">
@@ -310,5 +321,21 @@
             batch LIKE '%[a-z]%'
     </select>
 
+    <select id="selectLocDetlSumQty" resultType="double">
+        select SUM(anfme) anfme
+        from asr_loc_detl
+        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