From b4bf96cd10ee01e7d2d6139b05c4ed5b1790f7e8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 21 七月 2023 12:53:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 53 -------------
src/main/resources/mapper/WrkMastMapper.xml | 131 --------------------------------
2 files changed, 0 insertions(+), 184 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index fa3fc7d..65615a0 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -26,40 +26,9 @@
WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
- // 鍏ュ簱绗簩姝ワ紝褰撴墭鐩樼墿鏂欏湪鍫嗗灈鏈哄叆搴撶珯鏃舵椂鏌ヨ
-// @Select("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")
- WrkMast selectPakInStep23456(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);
-
- // 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
-// @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
- WrkMast selectCrnWaiting(@Param("workNo")Integer workNo);
- WrkMast selectCrnWaiting2(@Param("workNo")Integer workNo);
-
- WrkMast selectPakInStep45(@Param("workNo")Integer workNo);
-
- WrkMast selectCarWaiting(@Param("workNo")Integer workNo);
-
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
// @Select("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)")
WrkMast selectPickStep(@Param("wrkNo")Short wrkNo);
-
- WrkMast selectPickStepByBarcode(@Param("barcode")String barcode);
-
- // 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
-// @Select("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")
- WrkMast selectPakOutStep111215(@Param("crnNo")Integer crnNo, @Param("sourceStaNo")Integer sourceStaNo);
-
- List<WrkMast> selectWorkingOfPakOutBySource(@Param("locNos") List<String> locNos);
-
- // 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
-// @Select("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")
- WrkMast selectPakOutStep16(@Param("sourceStaNo")Integer sourceStaNo);
-
- // 搴撲綅绉昏浆宸ヤ綔妗ｏ紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
-// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
- WrkMast selectLocMove(@Param("crnNo")Integer crnNo);
-
- WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
WrkMast selectWorking(@Param("crnNo")Integer crnNo);
@@ -70,32 +39,10 @@
@Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
int saveWrkDetlLog(Integer workNo);
- // 閫氱煡妗� ----------------------------------------------------------------------
-
- // update 鍏ュ簱閫氱煡妗� -- Y
- @Update("update cust_wait_pakin set io_status='Y' where zpallet = #{barcode}")
- int updateWaitPakInStep1(String barcode);
-
- // update 鍏ュ簱閫氱煡妗� -- F
- @Update("update cust_wait_pakin set io_status='F' where zpallet = #{barcode}")
- int updateWaitPakInStep2(String barcode);
-
@Update("update asr_wrk_mast set ste_no = null where wrk_no = #{wrkNo}")
int setSteEmpty(Integer wrkNo);
- WrkMast selectPakin(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo);
-
- WrkMast selectPakout(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo);
-
- WrkMast selectWorkingByCrn(@Param("crnNo")Integer crnNo);
-
- WrkMast selectPakinWorkingByGroupLoc(@Param("locNos")List<String> locNos);
-
- WrkMast selectPakoutWorkingByGroupLoc(@Param("locNos")List<String> locNos);
-
List<WrkMast> selectAll(@Param("staNo")Integer staNo);
-
- WrkMast selectAllC();
WrkMast selectRackInStep48(Short workNo,Integer staNo);
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d9e619d..a9e1f65 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -91,150 +91,19 @@
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>
- <select id="selectPakInStep23456" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4,5,6,7,8) 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="selectPakInStep45" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (4,5)
- </select>
-
- <select id="selectCrnWaiting" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (4,5,7,13, 16)
- </select>
-
- <select id="selectCrnWaiting2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts = 18
- </select>
-
- <select id="selectCarWaiting" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (2,8,11,14)
- </select>
-
<select id="selectPickStep" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=17 and (io_type=103 or io_type=107 or io_type=104)
- </select>
-
- <select id="selectPickStepByBarcode" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=17 and (io_type=103 or io_type=107 or io_type=104)
- </select>
-
- <select id="selectPakOutStep111215" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no = #{sourceStaNo} and wrk_sts in (11,12,13,14,15,16) and io_type>100 order by io_pri desc,io_time,wrk_no asc
- </select>
-
- <select id="selectWorkingOfPakOutBySource" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast
- where 1=1
- and source_loc_no in
- <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- and wrk_sts in (11,12,13,14,15,16) and io_type>100 order by io_pri desc,io_time,wrk_no asc
- </select>
-
- <select id="selectPakOutStep16" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=16 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 in (3,6,11,12,15) and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
- </select>
-
- <select id="selectLocMoving" resultMap="BaseResultMap">
- select top 1 * from dbo.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 dbo.asr_wrk_mast where 1=1 and (wrk_sts=7 or wrk_sts=16) and crn_no=#{crnNo} order by io_time,wrk_no
</select>
- <select id="selectPakin" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast
- where 1=1
- and wrk_sts in (3,4,5,6,7,8,9)
- and crn_no=#{crnNo}
- <if test="steNo != null">
- and ste_no = #{steNo}
- </if>
- </select>
-
- <select id="selectPakout" resultMap="BaseResultMap">
- select top 1 *
- from dbo.asr_wrk_mast
- where 1=1
- and
- (
- (wrk_sts in (12,13,14,15,16,17) and io_type in (101, 110))
- or
- (wrk_sts in (12,13,14,15,16) and io_type in (103, 104, 107))
- )
- and crn_no=#{crnNo}
- <if test="steNo != null">
- and ste_no = #{steNo}
- </if>
- </select>
-
- <select id="selectWorkingByCrn" resultMap="BaseResultMap">
- select top 1 *
- from dbo.asr_wrk_mast
- where 1=1
- and
- (
- (wrk_sts = 2 and crn_no != 2)
- or
- (wrk_sts in (3,4,5,6,7))
- or
- (wrk_sts in (11,12,13,14,15,16))
- )
- <if test="crnNo != null">
- and crn_no = #{crnNo}
- </if>
- </select>
<select id="selectAll" resultMap="BaseResultMap">
select * from dbo.asr_wrk_mast where 1=1
and wrk_sts!=1 and wrk_sts!=11
and wrk_sts!=18 and wrk_sts!=9 and wrk_sts < 20 and io_type!=11
and source_sta_no=#{staNo}
- </select>
-
- <select id="selectAllC" resultMap="BaseResultMap">
- select top 1 *
- from dbo.asr_wrk_mast where 1=1
- and wrk_sts!=1 and wrk_sts!=11
- and wrk_sts!=18 and wrk_sts!=9 and wrk_sts < 20 and io_type!=11
- </select>
-
- <select id="selectPakinWorkingByGroupLoc" resultMap="BaseResultMap">
- select top 1 *
- from dbo.asr_wrk_mast
- where 1=1
- and
- (
- (wrk_sts = 2 and ste_no != null)
- or
- (wrk_sts in (3,4,5,6,7,8))
- )
- and loc_no in
- <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </select>
-
- <select id="selectPakoutWorkingByGroupLoc" resultMap="BaseResultMap">
- select top 1 *
- from dbo.asr_wrk_mast
- where 1=1
- and
- (
- (wrk_sts = 11 and ste_no != null)
- or
- (wrk_sts in (12,13,14,15,16,17))
- )
- and source_loc_no in
- <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
</select>
<select id="selectRackInStep48" resultMap="BaseResultMap">
--
Gitblit v1.9.1