From c902e238626f737a224325ac503706c45f2f247f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 16 九月 2025 13:02:20 +0800
Subject: [PATCH] 站点转移任务完成延迟10秒转历史
---
src/main/resources/mapper/WrkDetlLogMapper.xml | 142 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 103 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index a4a997e..4699a11 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -4,47 +4,111 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetlLog">
- <result column="wrk_no" property="wrkNo" />
- <result column="io_time" property="ioTime" />
- <result column="anfme" property="anfme" />
- <result column="zpallet" property="zpallet" />
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
- <result column="batch" property="batch" />
- <result column="order_no" property="orderNo" />
+ <result column="wrk_no" property="wrkNo"/>
+ <result column="io_time" property="ioTime"/>
+ <result column="anfme" property="anfme"/>
+ <result column="zpallet" property="zpallet"/>
+ <result column="matnr" property="matnr"/>
+ <result column="maktx" property="maktx"/>
+ <result column="batch" property="batch"/>
+ <result column="order_no" property="orderNo"/>
- <result column="specs" property="specs" />
- <result column="model" property="model" />
- <result column="color" property="color" />
- <result column="brand" property="brand" />
- <result column="unit" property="unit" />
- <result column="price" property="price" />
- <result column="sku" property="sku" />
- <result column="units" property="units" />
- <result column="barcode" property="barcode" />
- <result column="origin" property="origin" />
- <result column="manu" property="manu" />
- <result column="manu_date" property="manuDate" />
- <result column="item_num" property="itemNum" />
- <result column="safe_qty" property="safeQty" />
- <result column="weight" property="weight" />
- <result column="length" property="length" />
- <result column="volume" property="volume" />
- <result column="three_code" property="threeCode" />
- <result column="supp" property="supp" />
- <result column="supp_code" property="suppCode" />
- <result column="be_batch" property="beBatch" />
- <result column="dead_time" property="deadTime" />
- <result column="dead_warn" property="deadWarn" />
- <result column="source" property="source" />
- <result column="inspect" property="inspect" />
- <result column="danger" property="danger" />
+ <result column="specs" property="specs"/>
+ <result column="model" property="model"/>
+ <result column="color" property="color"/>
+ <result column="brand" property="brand"/>
+ <result column="unit" property="unit"/>
+ <result column="price" property="price"/>
+ <result column="sku" property="sku"/>
+ <result column="units" property="units"/>
+ <result column="barcode" property="barcode"/>
+ <result column="origin" property="origin"/>
+ <result column="manu" property="manu"/>
+ <result column="manu_date" property="manuDate"/>
+ <result column="item_num" property="itemNum"/>
+ <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"/>
+ <result column="supp_code" property="suppCode"/>
+ <result column="be_batch" property="beBatch"/>
+ <result column="dead_time" property="deadTime"/>
+ <result column="dead_warn" property="deadWarn"/>
+ <result column="source" property="source"/>
+ <result column="inspect" property="inspect"/>
+ <result column="danger" property="danger"/>
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="memo" property="memo" />
+ <result column="modi_user" property="modiUser"/>
+ <result column="modi_time" property="modiTime"/>
+ <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">
+ <if test="wrkNo != null and wrkNo != ''">
+ and a.wrk_no = #{wrkNo}
+ </if>
+ <if test="modiTimeStart != null ">
+ <if test="modiTimeEnd != null ">
+ and a.modi_time between #{modiTimeStart} and #{modiTimeEnd}
+ </if>
+ </if>
+ <if test="orderNo != null and 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>
+
+ <select id="selectWrkDetlLogs" resultMap="BaseResultMap">
+ select d.* from (
+ select
+ ROW_NUMBER() over (order by c.modi_time desc) as row,
+ c.* from (
+ select a.* 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
+ and (b.manu_type is NULL or b.manu_type='鎵嬪姩瀹屾垚')
+ <include refid="batchSeq"></include>
+ ) as c
+ ) as d
+ where d.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) order by d.modi_time desc
+ </select>
+
+ <select id="selectWrkDetlLogsTotal" resultType="Long">
+ 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
+ and (b.manu_type is NULL or b.manu_type='鎵嬪姩瀹屾垚')
+ <include refid="batchSeq"></include>
+ </select>
+
</mapper>
--
Gitblit v1.9.1