From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/resources/mapper/LocDetlMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 4b0009d..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">
@@ -123,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">
@@ -336,8 +361,8 @@
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
+ <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}
@@ -402,4 +427,22 @@
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