From f25bd904560faada2a00e93fbd8abab6be238f9c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 15:44:31 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d2852af..83c4cce 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -56,14 +56,96 @@
<result column="log_err_time" property="logErrTime" />
<result column="log_err_memo" property="logErrMemo" />
<result column="barcode" property="barcode" />
- <result column="Pdc_type" property="PdcType" />
<result column="ctn_no" property="ctnNo" />
<result column="full_plt" property="fullPlt" />
-
+ <result column="pre_have" property="preHave" />
+ <result column="take_none" property="takeNone" />
</resultMap>
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
- select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
+ select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
+ </select>
+
+ <select id="selectToBeHistoryData" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where wrk_sts=5
+ or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,3,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+ order by io_time,wrk_no asc
+ </select>
+
+ <select id="selectWrkMastWrkDetl" resultMap="BaseResultMap">
+ select m.* from asr_wrk_mast m,asr_wrk_detl d
+ where 1=1
+ and m.wrk_no = d.wrk_no
+ and m.io_type = #{ioType}
+ and m.crn_no = #{crnNo}
+ and d.matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and d.batch = #{batch}
+ </when>
+ <otherwise>
+ and (d.batch IS NULL OR d.batch = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="brand != null and brand != ''">
+ and d.brand = #{brand}
+ </when>
+ <otherwise>
+ and (d.brand IS NULL OR d.brand = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby1 != null and standby1 != ''">
+ and d.standby1 = #{standby1}
+ </when>
+ <otherwise>
+ and (d.standby1 IS NULL OR d.standby1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby2 != null and standby2 != ''">
+ and d.standby2 = #{standby2}
+ </when>
+ <otherwise>
+ and (d.standby2 IS NULL OR d.standby2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby3 != null and standby3 != ''">
+ and d.standby3 = #{standby3}
+ </when>
+ <otherwise>
+ and (d.standby3 IS NULL OR d.standby3 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType1 != null and boxType1 != ''">
+ and d.box_type1 = #{boxType1}
+ </when>
+ <otherwise>
+ and (d.box_type1 IS NULL OR d.box_type1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType2 != null and boxType2 != ''">
+ and d.box_type2 = #{boxType2}
+ </when>
+ <otherwise>
+ and (d.box_type2 IS NULL OR d.box_type2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType3 != null and boxType3 != ''">
+ and d.box_type3 = #{boxType3}
+ </when>
+ <otherwise>
+ and (d.box_type3 IS NULL OR d.box_type3 = '')
+ </otherwise>
+ </choose>
</select>
</mapper>
--
Gitblit v1.9.1