From 08192aa7aebc8ca582b61fe2803dcd877329eca3 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 03 十二月 2022 16:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xjhswcs' into xjhswcs
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index ac14bfa..c860c1f 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -31,6 +31,13 @@
// @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, @Param("staNo")Integer staNo);
+ /**
+ * 鏌ヨ鍚屼竴鍙板爢鍨涙満涓嬫墍鏈夊嚭搴撲换鍔�
+ * @param crnNo
+ * @return
+ */
+ List<WrkMast> selectPakInStep12(@Param("crnNo")Integer crnNo);
+
// 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
// @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
WrkMast selectPakInStep3(@Param("workNo")Integer workNo);
@@ -101,6 +108,13 @@
*/
List<WrkMast> selectPakOutStep11(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+ /**
+ * 鏌ヨ鍚屼竴鍙板爢鍨涙満涓嬫墍鏈夊嚭搴撲换鍔�
+ * @param crnNO
+ * @return
+ */
+ List<WrkMast> selectPakOutStep12(@Param("crnNo")Integer crnNO);
+
WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
--
Gitblit v1.9.1