From 1bbb1906216955c7cfe28f400877108ad5f4e57a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 08 十二月 2023 15:25:34 +0800
Subject: [PATCH] #出300站，检测300站任务数量
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 +++++++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 ++
src/main/resources/mapper/WrkMastMapper.xml | 6 ++++++
3 files changed, 17 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 ae8d873..01a3e47 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -80,4 +80,6 @@
WrkMast selectByBarcode(String barcode);
List<WrkMast> selectInWrkMastByLiftNo(Integer liftNo);//鎼滅储鎸囧畾鎻愬崌鏈虹殑鍏ュ簱浠诲姟
+
+ List<WrkMast> select300Wrk();//鎼滅储300绔欎换鍔�
}
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 9a525b5..613c020 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1303,6 +1303,15 @@
return false;//绔欑偣蹇呴』鑷姩銆佺┖闂层�佹病鏈夋墭鐩�
}
+ if (wrkMast.getStaNo() == 300) {
+ //鍑�300绔欙紝妫�娴�300绔欎换鍔℃暟閲�
+ List<WrkMast> wrkMasts = wrkMastMapper.select300Wrk();
+ if (wrkMasts.size() >= 4) {
+ News.info("{}浠诲姟锛岃緭閫佺嚎浠诲姟杩囪浇{}", wrkMast.getWrkNo(), wrkMasts.size());
+ return false;
+ }
+ }
+
if (wrkMast.getShuttleNo() == null) {//娌℃湁缁戝畾灏忚溅锛岃繘琛岃皟搴�
//寮哄埗棰勭暀涓�鍙板皬杞︾粰鍏ュ簱浠诲姟
int lev = Utils.getLev(wrkMast.getSourceLocNo());
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 8bb543e..bc0cccd 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -241,4 +241,10 @@
and wrk_sts in (1,2,3,4,5)
order by io_pri desc,io_time,wrk_no asc
</select>
+
+ <select id="select300Wrk" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where (source_sta_no in (300) and io_type > 100)
+ or (source_sta_no in (341) and wrk_sts = 2)
+ </select>
</mapper>
--
Gitblit v1.9.1