From 76fe27b7b098cda720198aaa157edee4482351b8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 12 十一月 2025 13:08:16 +0800
Subject: [PATCH] 成品判料改待判

---
 src/main/resources/mapper/LocDetlMapper.xml |   78 +++++++++++++++++++++++++++++++++++----
 1 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index fd62acb..bcb05be 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -59,7 +59,7 @@
     </sql>
     <insert id="batchDetls">
         INSERT INTO
-        asr_loc_detl(loc_no,zpallet,barcode,anfme,matnr,maktx,unit,specs,model,color,manu,sku,brand
+        asr_loc_detl(loc_no,zpallet,barcode,batch,anfme,matnr,maktx,unit,specs,model,color,manu,sku,brand
         ,origin,item_num,manu_date,weight,volume,length,modi_time,modi_user,appe_time,appe_user)
         VALUES
         <foreach collection="locDetls" item="item" index="index" separator=",">
@@ -67,6 +67,7 @@
             #{item.locNo},
             #{item.zpallet},
             #{item.barcode},
+            #{item.batch},
             #{item.anfme},
             #{item.matnr},
             #{item.maktx},
@@ -136,28 +137,37 @@
 
     <sql id="stockOutCondition">
         <if test="loc_no!=null and loc_no!='' ">
-            and a.loc_no like '%' + #{loc_no} + '%'
+            and a.loc_no like concat('%' , #{loc_no} , '%')
         </if>
         <if test="matnr!=null and matnr!='' ">
-            and a.matnr like '%' + #{matnr} + '%'
+            and a.matnr like concat('%' , #{matnr} , '%')
         </if>
         <if test="maktx!=null and maktx!='' ">
-            and a.maktx like '%' + #{maktx} + '%'
+            and a.maktx like concat('%' , #{maktx} , '%')
         </if>
         <if test="anfme!=null and anfme!='' ">
-            and a.anfme like '%' + #{anfme} + '%'
+            and a.anfme like concat('%' , #{anfme} , '%')
         </if>
-        <if test="startTime!=null and endTime!=null">
+        <if test="startTime!=null and endTime!=null and endTime!=''">
             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} + '%'
+            and a.batch like concat('%' , #{batch} , '%')
         </if>
         <if test="specs!=null and specs!='' ">
-            and a.specs like '%' + #{specs} + '%'
+            and a.specs like concat('%' , #{specs} , '%')
+        </if>
+        <if test="brand!=null and brand!='' ">
+            and a.brand like concat('%' , #{brand} , '%')
+        </if>
+        <if test="model!=null and model!='' ">
+            and a.model like concat('%' , #{model} , '%')
+        </if>
+        <if test="unit!=null and unit!='' ">
+            and a.unit like concat('%' , #{unit} , '%')
         </if>
     </sql>
 
@@ -374,6 +384,52 @@
         from asr_loc_detl
         where loc_no=#{locNo}
     </select>
+    <select id="queryInLocTime" resultType="com.zy.asrs.entity.InLocTimeDto">
+        select
+            brand packageGroupNo,
+            DATEDIFF(day, appe_time , getdate()) diffDay
+        from
+            asr_loc_detl
+        where brand in
+        <foreach collection="param" index="index" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        group by
+            brand,
+            appe_time
+    </select>
+    <select id="selectLocNoByGroupNo" resultType="com.zy.asrs.entity.LocDetl">
+        select distinct ald.loc_no as locNo,ald.brand from asr_loc_detl ald where ald.brand in
+        <foreach collection="packageGroupNos" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+    <select id="selectTallyGoosList" resultMap="BaseResultMap">
+        select
+            a.*
+        from
+            asr_loc_detl a
+        where
+                a.loc_no in(
+                select
+                    DISTINCT ald.loc_no
+                from
+                    asr_loc_mast alm
+                        inner join asr_loc_detl ald on
+                        alm.loc_no = ald.loc_no
+                where
+                    alm.loc_sts = 'F'
+                  and alm.bay1 > #{columnNum}
+                  and ald.dead_warn = 0
+                group by
+                    ald.loc_no ,
+                    ald.brand
+                HAVING
+                    count(ald.model) = 1
+            )
+        order by
+            a.manu_date asc
+    </select>
 
     <update id="updateMatTurn">
         UPDATE a
@@ -384,6 +440,12 @@
         FROM asr_loc_detl a
         INNER JOIN man_mat b ON a.matnr=#{matnrOld} AND b.matnr=#{matnr};
     </update>
+    <update id="updateLhStsByLocNo">
+        update asr_loc_detl set dead_warn = #{status},modi_time = getdate() where loc_no = #{locNo}
+    </update>
+    <update id="updateQualifiedByRollNo">
+        update asr_loc_detl set three_code = #{qualified} where model = #{rollNo}
+    </update>
 
 
 </mapper>

--
Gitblit v1.9.1