From 6fb055d07a4b1e3e4daa53db29addf015fb8e669 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 23 四月 2025 13:46:11 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dfff812..e96e5c2 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -46,6 +46,15 @@
         <result column="memo" property="memo" />
     </resultMap>
 
+    <resultMap id="CheckResultMap" type="com.zy.asrs.entity.CheckDetl">
+        <result column="anfme" property="anfme" />
+        <result column="matnr" property="matnr" />
+        <result column="maktx" property="maktx" />
+        <result column="specs" property="specs" />
+        <result column="batch" property="batch" />
+        <result column="create_time" property="createTime"/>
+    </resultMap>
+
     <sql id="batchSeq">
         <choose>
             <when test="batch != null and batch != ''">
@@ -100,6 +109,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,13 +150,57 @@
             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>
+
+    <select id="getAnfmeByMatnr" resultType="com.zy.asrs.entity.LocDetl">
+        select
+        sum(a.anfme) as anfme
+        from asr_loc_detl a
+        <where>
+            a.matnr = #{matnr}
+            <if test="batch != null and batch != ''">
+                and a.batch = #{batch}
+            </if>
+            <if test="specs != null and specs != ''">
+                and a.specs = #{specs}
+            </if>
+        </where>
+    </select>
+
+    <select id="getStockCheck" resultMap="CheckResultMap">
+        select * from (
+        select
+        ROW_NUMBER() over (order by a.create_time desc) as row,
+        a.anfme,
+        a.matnr,
+        a.maktx,
+        a.specs,
+        a.batch,
+        a.create_time
+        from asr_check_detl a
+        where 1=1
+        <include refid="stockOutCondition" />
+        ) t
+        where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+    </select>
+
+
+    <select id="getStockCheckCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(1)
+        from asr_check_detl a
+        where 1=1
+        <include refid="stockOutCondition" />
+    </select>
+
+
+
 
     <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
      select count(1) as count from
@@ -211,7 +273,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 +372,86 @@
             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>
+
+    <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