From 775e3cb20adaa87d5e71f844b62f3e524f4deef9 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 13 十月 2025 17:51:07 +0800
Subject: [PATCH] 修复自动移库BUG

---
 src/main/resources/mapper/LocDetlMapper.xml |   85 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 84 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 0869303..84a38a0 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -103,6 +103,12 @@
         <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">
@@ -117,6 +123,7 @@
             and b.loc_sts = 'F'
             <include refid="stockOutCondition"></include>
         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+            order by appe_time
     </select>
 
     <select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
@@ -135,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>
 
@@ -319,5 +327,80 @@
         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="selectSameDetlTodayBatch" resultType="java.lang.String">
+        SELECT ld.loc_no FROM asr_loc_detl ld
+        LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no
+        WHERE 1 = 1
+        AND ld.matnr = #{matnr}
+        AND lm.row1 >= #{start}
+        AND lm.row1 &lt;= #{end}
+        AND lm.loc_sts = 'F'
+        AND DateDiff(dd, ld.appe_time, getdate()) = 0
+        <choose>
+            <when test="batch != null and batch != ''">
+                and ld.batch = #{batch}
+            </when>
+            <otherwise>
+                and (ld.batch IS NULL OR ld.batch = '')
+            </otherwise>
+        </choose>
+        ORDER BY ld.appe_time ASC
+    </select>
+
+    <select id="selectLocDetlUnilateralMoveShuttleMapY" resultType="java.util.Map">
+        select ld.matnr,ld.batch,ld.brand,count(*) count from asr_loc_mast lm
+        left join asr_loc_detl ld
+        on lm.loc_no = ld.loc_no
+        where lm.row1 in (1)
+        and loc_sts = 'F'
+        and loc_type3 = 0
+        group by ld.matnr,ld.batch,ld.brand
+    </select>
+
+    <select id="selectLocDetlUnilateralMoveShuttleMapN" resultType="java.util.Map">
+        select ld.matnr,ld.batch,ld.brand,count(*) count from asr_loc_mast lm
+        left join asr_loc_detl ld
+        on lm.loc_no = ld.loc_no
+        where lm.row1 in (31,32)
+        and loc_sts = 'F'
+        and loc_type3 = 0
+        group by ld.matnr,ld.batch,ld.brand
+    </select>
+
+    <select id="selectLocDetlUnilateralMoveShuttleY" resultMap="BaseResultMap">
+        select ld.* from asr_loc_mast lm
+        left join asr_loc_detl ld
+        on lm.loc_no = ld.loc_no
+        where loc_sts = 'F'
+        and ld.matnr = #{matnr}
+        and ld.batch = #{batch}
+        and ld.brand = #{grade}
+        and lm.loc_type3 = 0
+        and lm.row1 in (1)
+        order by row1
+    </select>
+
+    <select id="selectLocDetlUnilateralMoveShuttleN" resultMap="BaseResultMap">
+        select ld.* from asr_loc_mast lm
+        left join asr_loc_detl ld
+        on lm.loc_no = ld.loc_no
+        where loc_sts = 'F'
+        and ld.matnr = #{matnr}
+        and ld.batch = #{batch}
+        and ld.brand = #{grade}
+        and lm.loc_type3 = 0
+        and lm.row1 in (31,32)
+        order by row1
+    </select>
 
 </mapper>

--
Gitblit v1.9.1