From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 109 +++++++++++++++++++-----------------------------------
1 files changed, 39 insertions(+), 70 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 5106f54..f834c18 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -5,79 +5,29 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<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" />
- <result column="whs_type" property="whsType" />
<result column="wrk_sts" property="wrkSts" />
<result column="io_type" property="ioType" />
- <result column="crn_no" property="crnNo" />
- <result column="ste_no" property="steNo" />
- <result column="out_most" property="outMost" />
- <result column="sheet_no" property="sheetNo" />
<result column="io_pri" property="ioPri" />
- <result column="wrk_date" property="wrkDate" />
<result column="loc_no" property="locNo" />
<result column="sta_no" property="staNo" />
<result column="source_sta_no" property="sourceStaNo" />
<result column="source_loc_no" property="sourceLocNo" />
- <result column="loc_sts" property="locSts" />
- <result column="picking" property="picking" />
- <result column="link_mis" property="linkMis" />
- <result column="online_yn" property="onlineYn" />
- <result column="upd_mk" property="updMk" />
- <result column="exit_mk" property="exitMk" />
- <result column="plt_type" property="pltType" />
- <result column="empty_mk" property="emptyMk" />
<result column="io_time" property="ioTime" />
- <result column="ctn_type" property="ctnType" />
- <result column="packed" property="packed" />
- <result column="ove_mk" property="oveMk" />
- <result column="mtn_type" property="mtnType" />
- <result column="user_no" property="userNo" />
- <result column="crn_str_time" property="crnStrTime" />
- <result column="crn_end_time" property="crnEndTime" />
- <result column="plc_str_time" property="plcStrTime" />
- <result column="crn_pos_time" property="crnPosTime" />
- <result column="load_time" property="loadTime" />
- <result column="exp_time" property="expTime" />
- <result column="ref_wrkno" property="refWrkno" />
- <result column="ref_iotime" property="refIotime" />
<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="pause_mk" property="pauseMk" />
<result column="error_time" property="errorTime" />
<result column="error_memo" property="errorMemo" />
- <result column="ctn_kind" property="ctnKind" />
- <result column="manu_type" property="manuType" />
<result column="memo" property="memo" />
- <result column="sc_weight" property="scWeight" />
- <result column="log_mk" property="logMk" />
- <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="shuttle_no" property="shuttleNo" />
<result column="lift_no" property="liftNo" />
+ <result column="wms_wrk_no" property="wmsWrkNo" />
+ <result column="system_msg" property="systemMsg" />
</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>
-
- <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>
<select id="selectPakInStep1" resultMap="BaseResultMap">
select * 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 limit 0,1
@@ -97,7 +47,7 @@
</select>
<select id="selectByWorkNo" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast
+ select * from asr_wrk_mast
where wrk_no=#{workNo}
limit 0,1
</select>
@@ -105,20 +55,20 @@
<select id="selectLiftStep223103" resultMap="BaseResultMap">
select * from asr_wrk_mast
where 1=1
- and wrk_sts in (2,23,103)
+ and wrk_sts in (2,103,303)
order by io_pri desc,wrk_sts desc
</select>
<select id="selectByWorkNo324104" resultMap="BaseResultMap">
select * from asr_wrk_mast
where wrk_no=#{workNo}
- and wrk_sts in (3,24,103,106)
+ and wrk_sts in (3,104,303,306)
limit 0,1
</select>
<select id="selectBy2125" resultMap="BaseResultMap">
select * from asr_wrk_mast
- where wrk_sts in (21,25)
+ where wrk_sts in (101,105)
and io_type in (101,103,107,110)
order by io_pri desc,wrk_sts desc
</select>
@@ -126,7 +76,7 @@
<select id="selectNoShuttleWrkByLev" resultMap="BaseResultMap">
select * from asr_wrk_mast
where shuttle_no is null
- and ((wrk_sts = 2 and loc_no like #{lev}) or (wrk_sts = 21 and source_loc_no like #{lev}))
+ and ((wrk_sts = 2 and loc_no like #{lev}) or (wrk_sts = 101 and source_loc_no like #{lev}))
order by io_pri desc,wrk_sts desc
</select>
@@ -140,62 +90,67 @@
<select id="selectShuttleOutWrkByLev" resultMap="BaseResultMap">
select * from asr_wrk_mast
where shuttle_no is not null
- and (wrk_sts not in (29,30) and source_loc_no like #{lev})
+ and (wrk_sts not in (109,110) and source_loc_no like #{lev})
order by io_pri desc,wrk_sts desc
</select>
<select id="selectLiftWrkMast" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast
+ select * from asr_wrk_mast
where lift_no = #{liftNo}
- and wrk_sts in (3,4,24,25,102,103,104,105,106,107,108,109)
+ and wrk_sts in (3,4,104,105,302,303,304,305,306,307,308,309)
+ limit 0,1
</select>
<select id="selectLocToLocWrkMast" resultMap="BaseResultMap">
select * from asr_wrk_mast
where io_type in (11)
- and wrk_sts not in (9,10,29,30)
+ and wrk_sts not in (9,10,109,110)
order by io_pri desc,wrk_sts desc
</select>
<select id="selectPickStepByBarcode" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast
+ select * from asr_wrk_mast
where io_type in (53,103,107)
- and wrk_sts in (2,3,34,29)
+ and wrk_sts in (2,3,104,109)
and barcode = #{barcode}
order by io_pri desc,wrk_sts desc
+ limit 0,1
</select>
<select id="selectShuttleHasMoveWorking" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast
+ select * from asr_wrk_mast
where 1=1
and shuttle_no = #{shuttleNo}
- and wrk_sts not in (111)
+ and wrk_sts not in (311)
and io_type = 200
order by io_pri desc,io_time,wrk_no asc
+ limit 0,1
</select>
<select id="selectShuttleMoveWrk" resultMap="BaseResultMap">
select * from asr_wrk_mast
where 1=1
- and wrk_sts in (101,103,105,107,109,111)
+ and wrk_sts in (301,302,303,304,305,306,307,308,309,310,311)
and io_type = 200
order by io_pri desc,io_time,wrk_no asc
</select>
<select id="selectShuttleWorking" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast
+ select * from asr_wrk_mast
where 1=1
and shuttle_no = #{shuttleNo}
- and wrk_sts not in (9,10,23,29,30)
- and io_type not in (200)
+ and wrk_sts not in (9,10,109,110,210)
+ and io_type not in (200,300)
order by io_pri desc,io_time,wrk_no asc
+ limit 0,1
</select>
<select id="selectByBarcode" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast
+ select * from asr_wrk_mast
where 1=1
and barcode = #{barcode}
order by io_pri desc,io_time,wrk_no asc
+ limit 0,1
</select>
<select id="selectInWrkMastByLiftNo" resultMap="BaseResultMap">
@@ -207,4 +162,18 @@
order by io_pri desc,io_time,wrk_no asc
</select>
+ <select id="selectChargeWorking" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where io_type in (300)
+ and shuttle_no = #{shuttleNo}
+ order by io_pri desc,io_time,wrk_no asc
+ </select>
+
+ <select id="selectChargeWorkingByChargeSta" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where wrk_sts in (201,202,203,204,205,210)
+ and mk = #{chargeSta}
+ order by io_pri desc,io_time,wrk_no asc
+ </select>
+
</mapper>
--
Gitblit v1.9.1