From 0b6c8b7687ff593d254cfcacacf72a75bfdf11ca Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 24 六月 2025 08:20:36 +0800
Subject: [PATCH] #限制线体上托盘数量
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 ++
src/main/resources/mapper/WrkMastMapper.xml | 8 ++++++++
3 files changed, 15 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 3c2a10e..ffdec99 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -123,6 +123,8 @@
*/
List<WrkMast> selectPakOutStep12(@Param("crnNo")Integer crnNO);
+ Integer countPakOut();
+
WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectWorkingPakout(@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 7cc5f1e..c83491f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1577,7 +1577,12 @@
*/
public synchronized void locToCrnStn1(CrnSlave slave, CrnProtocol crnProtocol) {
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
+ Integer count = wrkMastMapper.countPakOut();
+
for (WrkMast wrkMast : wrkMasts) {
+ if(count > 30){ //璁惧涓婅蛋鎵樼洏涓嶈秴杩�30涓�
+ continue;
+ }
// 鍒ゆ柇鍫嗗灈鏈虹珯鐐规槸鍚﹀彲鐢�
if (!crnEnabled(wrkMast)){
continue;
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index c68151e..93d66e3 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -187,6 +187,14 @@
select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and (io_type>100 or io_type = 12) order by io_pri desc,io_time,wrk_no asc
</select>
+ <select id="countPakOut" resultType="Integer">
+ select count(*)
+ from dbo.asr_wrk_mast
+ where io_type = 101
+ and wrk_sts = 2
+ </select>
+
+
<!-- 鍏ュ嚭搴撴ā寮忕浉鍏� -->
<select id="selectWorkingPakin" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no
--
Gitblit v1.9.1