From c48d0150aa9f6b297671f28adb6b9dc95b529cfc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:59:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 8e26d07..5502798 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -11,6 +11,10 @@
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
+ WrkMast selectByLocNo(@Param("sourceLocNo") String sourceLocNo);
+ WrkMast selectByOnlyWrkNo(@Param("wrkNo") Integer wrkNo);
+ WrkMast selectByLocNo1(@Param("sourceLocNo") String sourceLocNo);
+
// @Select("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")
List<WrkMast> selectToBeCompleteData();
@@ -25,27 +29,41 @@
// 鍏ュ簱绗簩姝ワ紝褰撴墭鐩樼墿鏂欏湪鍫嗗灈鏈哄叆搴撶珯鏃舵椂鏌ヨ
// @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 selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo);
+ 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 selectPakInStep3(@Param("workNo")Integer workNo);
+ WrkMast selectCrnWaiting(@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("workNo")Integer workNo);
+ 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 selectPakOutStep1(@Param("crnNo")Integer crnNO);
+ WrkMast selectPakOutStep111215(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
// 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
// @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 selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
+ 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 selectLocMove111(@Param("crnNo")Integer crnNo);
+
+ WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
+
+ WrkMast selectWorking(@Param("crnNo")Integer crnNo);
+
+ WrkMast selectWorking1(@Param("crnNo")Integer crnNo, @Param("wrkNo")Integer wrkNo);
// work log -------------------------------------------------------
@Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
@@ -64,4 +82,52 @@
@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);
+
+ /**
+ * 鏌ヨ宸ヤ綔妗ｆ槸鏄惁瀛樺湪鏈畬鎴愮殑绉诲簱浠诲姟锛岀姸鎬�17琛ㄧず绉诲簱宸茬粡瀹屾垚锛岀瓑寰呭洖鍘熷簱浣�
+ * @param crnNo
+ * @return
+ */
+ WrkMast selectLocMoveWorking(@Param("crnNo")Integer crnNo);
+
+ /**
+ * 鏌ユ壘宸ヤ綔鐘舵�佷负17鐨勭Щ搴撳畬鎴愪换鍔★紝寰呭鐞嗗洖鍒板師搴撲綅锛屽苟椤哄簭寰�閲岀Щ鍔�
+ * @param crnNo
+ * @return
+ */
+ WrkMast selectLocMove17(@Param("crnNo")Integer crnNo);
+
+ List<WrkMast> selectPick17(@Param("staNo") Integer staNo, @Param("wrkNo") Integer wrkNo);
+
+ /**
+ * 鏌ヨ宸ヤ綔妗ｆ槸鍚﹀瓨鍦ㄧЩ搴撲换鍔�
+ * @param crnNo
+ * @return
+ */
+ WrkMast selectLocMoveData(@Param("crnNo")Integer crnNo);
+
+ /**
+ * 鏌ユ壘宸ヤ綔妗ｆ槸鍚﹀凡瀛樺湪缁戝畾灏忚溅鍙风殑浠诲姟锛岀姸鎬�17鐨勯櫎澶�
+ * @param steNo
+ * @return
+ */
+ WrkMast selectSteNoData(@Param("steNo")Integer steNo);
+
+ List<WrkMast> selectWrkStsAndIoType(@Param("sour")Integer sour);
+ List<WrkMast> selectWrkStsAndIoType0(@Param("sour")Integer sour);
+ List<WrkMast> selectWrkStsAndIoType1(@Param("sour")Integer sour);
+ Integer selectWrkStsAndIoType107Count(@Param("sour")Integer sour,@Param("workNo")Integer workNo);
+
+ WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectWorkingPakoutTwoF(@Param("staNo")Integer staNo);
+
+
+ WrkMast selectShallowLoc(@Param("row")Integer row,@Param("bay")Integer bay,@Param("lev")Integer lev);
}
--
Gitblit v1.9.1