From fe87eb25a80054e54d3a58307a135edaa8289e8d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 10 八月 2023 13:19:11 +0800
Subject: [PATCH] 每次盘点只出一托
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 8 ++++++++
src/main/resources/mapper/WrkMastMapper.xml | 6 ++++++
3 files changed, 19 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 8f0fa36..ecb68a6 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -106,4 +106,12 @@
WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
+
+ /**
+ * 鏌ユ壘鍫嗗灈鏈哄彿瀵瑰簲鎵�鏈夊凡鍑哄簱宸ヤ綔妗�
+ * @param crnNO
+ * @param sourceStaNo
+ * @return
+ */
+ WrkMast selectPakOutStep14(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2ed7118..244f684 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -777,6 +777,11 @@
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
// WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
+ // 鑾峰彇宸ヤ綔鐘舵�佷负14鐨勫伐浣滄。 涓� 鍑哄簱浠诲姟涓虹洏鐐�/鎷ｆ枡鍑哄簱鐨勪换鍔�
+ WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
+ if ( wrkMast1 !=null) {
+ continue;
+ }
for (WrkMast wrkMast : wrkMasts){
if (wrkMast == null) {
continue;
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index bdab988..bbdf64a 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -187,4 +187,10 @@
<select id="selectPakInStepBarcode" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where barcode = #{barcode}
</select>
+ <select id="selectPakOutStep14" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast
+ where crn_no=#{crnNo}
+ and ((wrk_sts=14 and io_type in (103,107) and source_sta_no=#{sourceStaNo}) or (wrk_sts in (2,3) and io_type in (53,57) and sta_no=#{sourceStaNo}))
+ order by io_pri desc,io_time,wrk_no asc
+ </select>
</mapper>
--
Gitblit v1.9.1