From 19b6a20abbe677e7e09ce0dffe7b6fa7a10afc70 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 26 三月 2026 19:54:40 +0800
Subject: [PATCH] #等入库完成5秒
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
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 32a66da..622dcb7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
@@ -84,6 +85,8 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WaitPakinMapper waitPakinMapper;
@Autowired
private ConfigService configService;
@Autowired
@@ -313,7 +316,8 @@
// 鏈粍鎵樻墭鐩橀��鍥� 鐢佃鏈烘樉绀鸿鍏堢粍鎵�
Integer back = 999;
if (ledThread != null) {
- String errorMsg = jsonObject.getString("msg");
+// String errorMsg = jsonObject.getString("msg");
+ String errorMsg = "璇峰厛缁勬墭";
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
barcodeThread.setBarcode("");
@@ -552,19 +556,41 @@
// if (!staProtocol.isOutEnable()) {
// return;
// }
-
- //妫�鏌ユ槸鍚︽湁姝ｅ湪鎵ц鐨勪换鍔�
- List<WrkMast> workingWrkMast = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", 3, 12));
- if (!workingWrkMast.isEmpty()) {
+ // 缁勬墭妗ｅ瓨鍦ㄥ凡缁勬墭鏈叆搴撳垯绛夊緟锛屼笉涓嬪彂鍑哄簱
+ int waitPakinNotIn = waitPakinMapper.selectCount(new EntityWrapper<WaitPakin>()
+ .eq("status", "Y"));
+ if (waitPakinNotIn > 0) {
return;
}
-
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11).orderBy("create_time"));
if (wrkMasts.isEmpty()) {
return;
}
WrkMast wrkMast = wrkMasts.get(0);
+ // 瀛樺湪杩涜涓�/鍦ㄩ�斾换鍔�(2,3,12,13,14)鍒欎笉涓嬪彂鍑哄簱锛岄伩鍏嶅啿绐侊紙鎺掗櫎褰撳墠浠诲姟锛�
+ // 2 寰呮墽琛岋紙鍏ュ簱锛�
+ // 3 璁惧鎵ц涓紙鍏ュ簱锛�
+ // 4 鍏ュ簱瀹屾垚
+ // 12 璁惧鎵ц涓紙鍑哄簱锛�
+ // 13 鍑哄簱鍒扮珯鐐逛笂
+ // 14 鍑哄簱绛夊緟纭
+ int activeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+ .in("wrk_sts", 2, 3,4, 12, 13, 14)
+ .ne("wrk_no", wrkMast.getWrkNo()));
+ if (activeCount > 0) {
+ return;
+ }
+ // 瀛樺湪5绉掑唴鐨� 5鐘舵�侊紝涓嶄笅鍙戞柊鐨勫嚭搴撲换鍔�
+ Date modiTimeThreshold = new Date(System.currentTimeMillis() - 5000L);
+ int recentStatus15Count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+ .in("wrk_sts", 5)
+ .gt("modi_time", modiTimeThreshold)
+ .ne("wrk_no", wrkMast.getWrkNo()));
+ if (recentStatus15Count > 0) {
+ return;
+ }
+
Integer sourceStaNo = Utils.getStaNoByLocNo(wrkMast.getSourceLocNo());
LiftCommand command = new LiftCommand();
--
Gitblit v1.9.1