From 8ba4ddfed043b20b0a15316141a9be10162ba664 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 12 十二月 2022 12:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs_tqs' into bfwcs_tqs
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 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 a6a6c5e..0e815ed 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -39,7 +39,9 @@
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
// @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("barcode")String barcode);
+ 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")
@@ -77,4 +79,37 @@
@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);
}
--
Gitblit v1.9.1