From 13fbd2d9fdc7146cc5709b30b3f04e81c829f86f Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 24 三月 2026 16:53:21 +0800
Subject: [PATCH] 大屏接口
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 783bca5..3055324 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -316,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("");
@@ -561,24 +562,25 @@
if (waitPakinNotIn > 0) {
return;
}
- // 瀛樺湪杩涜涓�/鍦ㄩ�斾换鍔�(2,3,12,13,14)鍒欎笉涓嬪彂鍑哄簱锛岄伩鍏嶅啿绐�
- // 2 寰呮墽琛岋紙鍏ュ簱锛�
- //3 璁惧鎵ц涓紙鍏ュ簱锛�
- //12 璁惧鎵ц涓紙鍑哄簱锛�
- //13 鍑哄簱鍒扮珯鐐逛笂
- //14 鍑哄簱绛夊緟纭
- int activeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
- .in("wrk_sts", 2, 3, 12, 13, 14));
- if (activeCount > 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 璁惧鎵ц涓紙鍏ュ簱锛�
+ // 12 璁惧鎵ц涓紙鍑哄簱锛�
+ // 13 鍑哄簱鍒扮珯鐐逛笂
+ // 14 鍑哄簱绛夊緟纭
+ int activeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+ .in("wrk_sts", 2, 3, 12, 13, 14)
+ .ne("wrk_no", wrkMast.getWrkNo()));
+ if (activeCount > 0) {
+ return;
+ }
+
Integer sourceStaNo = Utils.getStaNoByLocNo(wrkMast.getSourceLocNo());
LiftCommand command = new LiftCommand();
--
Gitblit v1.9.1