From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/resources/mapper/LocDetlMapper.xml | 138 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 136 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dfff812..26603c0 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="mix_number" property="mixNumber"/>
</resultMap>
<sql id="batchSeq">
@@ -55,6 +56,14 @@
and (batch IS NULL OR batch = '')
</otherwise>
</choose>
+ <choose>
+ <when test="barcode != null and barcode != ''">
+ and barcode = #{barcode}
+ </when>
+ <otherwise>
+ and (barcode IS NULL OR barcode = '')
+ </otherwise>
+ </choose>
</sql>
<select id="selectItem" resultMap="BaseResultMap">
@@ -64,6 +73,21 @@
and loc_no = #{locNo}
and matnr = #{matnr}
<include refid="batchSeq"></include>
+ </select>
+
+ <select id="selectItemCarton" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ <include refid="batchSeq"></include>
+ </select>
+
+ <select id="selectItemByLocNo" resultMap="BaseResultMap">
+ select *
+ from asr_loc_detl
+ where loc_no = #{locNo}
</select>
<delete id="deleteItem">
@@ -100,6 +124,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">
@@ -114,6 +147,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">
@@ -132,11 +166,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 +246,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 +345,104 @@
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" resultMap="BaseResultMap">
+ SELECT * 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 <= #{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>
+
+ <select id="getSameDetlList" resultType="java.lang.String">
+ select ld.loc_no from asr_loc_detl as ld
+ left join asr_loc_mast as lm on ld.loc_no = lm.loc_no
+ where 1 = 1
+ and ld.matnr = #{matnr}
+ and lm.loc_sts = 'F'
+ order by ld.appe_time asc
+ </select>
+
+ <select id="getSameDetlList2" resultType="java.lang.String">
+ select ld.loc_no from asr_loc_detl as ld
+ left join asr_loc_mast as lm on ld.loc_no = lm.loc_no
+ where 1 = 1
+ and ld.order_no = #{orderNo}
+ and lm.loc_type2 = #{areaId}
+ and lm.loc_sts = 'F'
+ order by ld.appe_time asc
+ </select>
</mapper>
--
Gitblit v1.9.1