From f107eaf4d1857d2230a5bc6983e4beb7fb811aa1 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期六, 08 七月 2023 22:06:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs6' into bfwcs6
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 05d031a..3a8460f 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -12,6 +12,7 @@
public interface WrkMastMapper extends BaseMapper<WrkMast> {
WrkMast selectByLocNo(@Param("sourceLocNo") String sourceLocNo);
+ 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();
@@ -55,9 +56,13 @@
// @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}")
@@ -97,6 +102,29 @@
*/
WrkMast selectLocMove17(@Param("crnNo")Integer crnNo);
- WrkMast selectPick17(@Param("staNo") Integer staNo, @Param("wrkNo") Integer wrkNo);
+ 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);
+
+ WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
+
+
+ WrkMast selectShallowLoc(@Param("row")Integer row,@Param("bay")Integer bay,@Param("lev")Integer lev);
}
--
Gitblit v1.9.1