From 364b9ccc44bc6863280c5cc00aa8512cfff548d4 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 25 四月 2025 15:27:18 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index c236c59..d4a434b 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -13,7 +16,9 @@
WrkMast selectByLocNo(@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")
+ 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();
List<WrkMast> selectToBeHistoryData();
@@ -21,37 +26,37 @@
// wcs ---------------------------------------------
// 鍏ュ簱绗竴姝ワ紝鎵爜浠幏鍙栨潯鐮佷俊鎭椂鏌ヨ
// @Select("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")
- WrkMast selectPakInStep1(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
+ WrkMast selectPakInStep1(@Param("sourceStaNo") Integer sourceStaNo, @Param("barcode") String barcode);
- WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
+ 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 selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo);
+ WrkMast selectPakInStep2(@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 selectPakInStep3(@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("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 selectPakOutStep1(@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 selectPakOutStep2(@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 selectLocMove(@Param("crnNo") Integer crnNo);
- WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
+ WrkMast selectLocMoving(@Param("crnNo") Integer crnNo);
- WrkMast selectWorking(@Param("crnNo")Integer crnNo);
+ WrkMast selectWorking(@Param("crnNo") Integer crnNo);
// work log -------------------------------------------------------
@Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
@@ -70,4 +75,39 @@
@Update("update cust_wait_pakin set io_status='F' where zpallet = #{barcode}")
int updateWaitPakInStep2(String barcode);
+// WrkMast selectWorkingPakin();
+//
+// WrkMast selectWorkingPakout();
+
+ /**
+ * 鍫嗗灈鏈烘槸鍚﹀瓨鍦ㄥ嚭搴撲换鍔�
+ *
+ * @param crnNo
+ * @return
+ */
+ WrkMast selectCrnWorking(@Param("crnNo") Integer crnNo);
+
+ /**
+ * 杈撻�佺嚎鏄惁瀛樺湪鍏ュ簱浠诲姟
+ *
+ * @param crnNo
+ * @return
+ */
+ WrkMast selectDevWorking(@Param("crnNo") Integer crnNo);
+
+
+ List<WrkMast> selectPick();
+
+ /**
+ * 鏌ユ壘鍫嗗灈鏈哄彿瀵瑰簲鎵�鏈夊緟鍑哄簱宸ヤ綔妗�
+ *
+ * @param crnNO
+ * @param sourceStaNo
+ * @return
+ */
+ List<WrkMast> selectPakOutStep11(@Param("crnNo") Integer crnNO, @Param("sourceStaNo") Integer sourceStaNo);
+
+ WrkMast selectWorkingPakin(@Param("sourceStaNo") Integer sourceStaNo);
+
+ WrkMast selectWorkingPakout(@Param("staNo") Integer staNo);
}
--
Gitblit v1.9.1