From 013c2ef0869f8599ac71444d256a70271bc5171d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 十一月 2025 18:34:58 +0800
Subject: [PATCH] *
---
src/main/resources/mapper/WrkMastMapper.xml | 113 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 542323e..2e1b459 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -4,10 +4,10 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMast">
- <id column="wrk_no" property="wrkNo" />
- <result column="inv_wh" property="invWh" />
- <result column="ymd" property="ymd" />
- <result column="mk" property="mk" />
+ <id column="WRK_NO" property="wrkNo" />
+ <result column="INV_MH" property="invWh" />
+ <result column="YMD" property="ymd" />
+ <result column="MK" property="mk" />
<result column="whs_type" property="whsType" />
<result column="wrk_sts" property="wrkSts" />
<result column="io_type" property="ioType" />
@@ -56,59 +56,128 @@
<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="Pdc_type" property="PdcType" />-->
<result column="ctn_no" property="ctnNo" />
<result column="full_plt" property="fullPlt" />
+ <result column="wms_wrk_no" property="wmsWrkNo" />
</resultMap>
- <select id="selectByLocNo">
- select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo}
+ <select id="selectByLocNo" resultMap="BaseResultMap">
+ select top 1 * from "SOURCE"."asr_wrk_mast" where "source_loc_no" = #{sourceLocNo} and ("ctn_no" is null or "ctn_no" != 'Y')
+ </select>
+
+ <select id="selectByLocNo1" resultMap="BaseResultMap">
+ select top 1 * from "SOURCE"."asr_wrk_mast" where "source_loc_no" = #{sourceLocNo} or "loc_no" = #{sourceLocNo}
</select>
<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 "SOURCE"."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>
<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,15,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 * from "SOURCE"."asr_wrk_mast"
+ where "wrk_sts"=5
+ or ("wrk_sts"=15 and "ove_mk"='Y' and "wrk_no" not in (select "wrk_no" from "SOURCE"."asr_bas_devp"))
+ or ("wrk_sts"=15 and dateadd(mi,15,"crn_end_time") <= getdate() and "wrk_no" not in (select "wrk_no" from "SOURCE"."asr_bas_devp"))
+ or ("wrk_sts"=15 and "crn_end_time" is null and "wrk_no" not in (select "wrk_no" from "SOURCE"."asr_bas_devp"))
+ order by "io_time","wrk_no" asc
</select>
<select id="selectPakInStep1" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from "SOURCE"."asr_wrk_mast" where "source_sta_no"=#{sourceStaNo} and "wrk_sts"=2 and "barcode"=#{barcode} and ("io_type"=1 or "io_type"=10) order by "io_pri" desc,"io_time","wrk_no" ASC
</select>
<select id="selectPakInStep11" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from "SOURCE"."asr_wrk_mast" where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from "SOURCE"."asr_wrk_mast" where "wrk_sts"=2 and "crn_no"=#{crnNo} and "wrk_no"=#{workNo} and "sta_no"=#{staNo} and ("io_type"=1 or "io_type"=10 or "io_type"=53 or "io_type"=54 or "io_type"=57) order by "io_pri" desc,"io_time","wrk_no" ASC
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
+ select top 1 * from "SOURCE"."asr_wrk_mast" where "wrk_no"=#{workNo}
</select>
<select id="selectPickStep" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
+ select top 1 * from "SOURCE"."asr_wrk_mast" where "barcode"=#{barcode} and "wrk_sts"=14 and ("io_type"=103 or "io_type"=107 or "io_type"=104)
</select>
<select id="selectPakOutStep1" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select top 1 * from "SOURCE"."asr_wrk_mast" where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
<select id="selectPakOutStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ select top 1 * from "SOURCE"."asr_wrk_mast" where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from "SOURCE"."asr_wrk_mast" where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
+ <select id="selectLocMoving" resultMap="BaseResultMap">
+ select top 1 * from "SOURCE"."asr_wrk_mast" where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ </select>
+
+ <select id="selectWorking" resultMap="BaseResultMap">
+ select top 1 * from "SOURCE"."asr_wrk_mast" where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
+ </select>
+
+<!-- <!– 鍏ュ簱浠诲姟 –>-->
+<!-- <select id="selectWorkingPakin" resultMap="BaseResultMap">-->
+<!-- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
+<!-- </select>-->
+
+<!-- <!– 鍑哄簱浠诲姟 –>-->
+<!-- <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
+<!-- select top 1 *-->
+<!-- from dbo.asr_wrk_mast-->
+<!-- where (wrk_sts in (11,12)-->
+<!-- or (wrk_sts in (14,15) and wrk_no in-->
+<!-- (-->
+<!-- select wrk_no-->
+<!-- from asr_bas_devp-->
+<!-- where wrk_no > 0)-->
+<!-- ))-->
+<!-- and io_type != 11-->
+<!-- and source_sta_no = 180-->
+<!-- order by io_time,wrk_no-->
+<!-- </select>-->
+
+ <select id="selectCrnWorking" resultMap="BaseResultMap">
+ select top 1 * from "SOURCE"."asr_wrk_mast" where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no
+ </select>
+
+ <select id="selectDevWorking" resultMap="BaseResultMap">
+ select top 1 * from "SOURCE"."asr_wrk_mast" where 1=1 and wrk_sts=2 and crn_no=#{crnNo} order by io_time,wrk_no
+ </select>
+
+ <select id="selectPick" resultMap="BaseResultMap">
+ select * from "SOURCE"."asr_wrk_mast" where 1=1 and wrk_sts = 14 and io_type in (103,104,107)
+ </select>
+
+ <select id="selectPakOutStep11" resultMap="BaseResultMap">
+ select * from "SOURCE"."asr_wrk_mast" where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ </select>
+
+ <!-- 鍏ュ嚭搴撴ā寮忕浉鍏� -->
+ <select id="selectWorkingPakin" resultMap="BaseResultMap">
+ select top 1 * from "SOURCE"."asr_wrk_mast" where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no
+ </select>
+
+ <select id="selectWorkingPakout" resultMap="BaseResultMap">
+ select top 1 *
+ from "SOURCE"."asr_wrk_mast"
+ where (wrk_sts in (11,12)
+ or (wrk_sts in (14,15) and wrk_no in
+ (
+ select wrk_no
+ from "SOURCE"."asr_bas_devp"
+ where wrk_no > 0)
+ ))
+ and io_type != 11
+ and source_sta_no = #{sourceStaNo}
+ order by io_time,wrk_no
+ </select>
</mapper>
--
Gitblit v1.9.1