From ea5663c37742844e6fe32c7e521a9ca9b5e711f9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 09 九月 2025 16:21:32 +0800
Subject: [PATCH] 站位转移任务数据 不记录日志

---
 src/main/resources/mapper/WrkDetlLogMapper.xml |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index eea3275..4699a11 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -29,6 +29,7 @@
         <result column="safe_qty" property="safeQty"/>
         <result column="weight" property="weight"/>
         <result column="length" property="length"/>
+        <result column="man_length" property="manLength"/>
         <result column="volume" property="volume"/>
         <result column="three_code" property="threeCode"/>
         <result column="supp" property="supp"/>
@@ -45,6 +46,12 @@
         <result column="appe_user" property="appeUser"/>
         <result column="appe_time" property="appeTime"/>
         <result column="memo" property="memo"/>
+        <result column="standby1" property="standby1" />
+        <result column="standby2" property="standby2" />
+        <result column="standby3" property="standby3" />
+        <result column="box_type1" property="boxType1" />
+        <result column="box_type2" property="boxType2" />
+        <result column="box_type3" property="boxType3" />
     </resultMap>
 
     <sql id="batchSeq">
@@ -57,11 +64,25 @@
             </if>
         </if>
         <if test="orderNo != null and orderNo != ''">
-            and ( a.order_no like concat('%',#{orderNo},'%')
-            or a.batch like concat('%',#{orderNo},'%')
-            or a.matnr like concat('%',#{orderNo},'%')
-            or a.zpallet like concat('%',#{orderNo},'%')
-            )
+            and a.order_no like concat('%',#{orderNo},'%')
+        </if>
+        <if test="maktx != null and maktx != ''">
+            and a.maktx like concat('%',#{maktx},'%')
+        </if>
+        <if test="model != null and model != ''">
+            and a.model = #{model}
+        </if>
+        <if test="volume != null and volume != ''">
+            and a.volume = #{volume}
+        </if>
+        <if test="zpallet != null and zpallet != ''">
+            and a.zpallet like concat('%',#{zpallet},'%')
+        </if>
+        <if test="ioType != null">
+            and b.io_type = #{ioType}
+        </if>
+        <if test="wrkSts != null">
+            and b.wrk_sts = #{wrkSts}
         </if>
     </sql>
 
@@ -82,7 +103,7 @@
     </select>
 
     <select id="selectWrkDetlLogsTotal" resultType="Long">
-        select count(*) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
+        select count(1) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
         where 1=1
         and a.io_time=b.io_time
         and a.wrk_no=b.wrk_no

--
Gitblit v1.9.1