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 |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 3df9079..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,9 +56,26 @@
                 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">
+        select top 1 *
+        from asr_loc_detl
+        where 1=1
+        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
@@ -417,4 +435,14 @@
         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