From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 二月 2025 09:40:03 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlLogMapper.xml | 126 +++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 8736b93..4ba2dbd 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -4,26 +4,114 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetlLog">
- <result column="wrk_no" property="wrkNo" />
- <result column="io_time" property="ioTime" />
- <result column="matnr" property="matnr" />
- <result column="lgnum" property="lgnum" />
- <result column="tbnum" property="tbnum" />
- <result column="tbpos" property="tbpos" />
- <result column="zmatid" property="zmatid" />
- <result column="maktx" property="maktx" />
- <result column="werks" property="werks" />
- <result column="anfme" property="anfme" />
- <result column="altme" property="altme" />
- <result column="zpallet" property="zpallet" />
- <result column="bname" property="bname" />
- <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="nista" property="nista" />
+ <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="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="roll_up" property="rollUp" />
</resultMap>
+ <sql id="batchSeq">
+ <if test="wrkNo != null and wrkNo != ''">
+ and a.wrk_no = #{wrkNo}
+ </if>
+ <if test="anfme != null and anfme != ''">
+ and a.anfme = #{anfme}
+ </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="batch != null and batch != ''">
+ and a.batch like concat('%',#{batch},'%')
+ </if>
+ <if test="model != null and model != ''">
+ and a.model like concat('%',#{model},'%')
+ </if>
+ <if test="matnr != null and matnr != ''">
+ and a.matnr like concat('%',#{matnr},'%')
+ </if>
+ <if test="zpallet != null and zpallet != ''">
+ and a.zpallet like concat('%',#{zpallet},'%')
+ </if>
+ <if test="specs != null and specs != ''">
+ and a.specs like concat('%',#{specs},'%')
+ </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>
+
+ <select id="selectWrkDetlLogByOrderNoNotNull" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_detl_log
+ where batch = #{batch}
+ and order_no is not null
+ and order_no != ''
+ order by io_time desc
+ </select>
+
</mapper>
--
Gitblit v1.9.1