From c48d0150aa9f6b297671f28adb6b9dc95b529cfc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:59:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 920801a..f9f9b19 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -261,7 +261,7 @@
String errorMsg = barcode + "鎵樼洏璇嗗埆寮傚父锛岃鍏堣繘琛岀粍鎵橈紒";
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
}
- } else if (redata.toString().contains("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�")) {
+ } else if (redata.toString().contains("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�")||redata.toString().contains("娣锋斁鐗╂枡绫诲瀷涓嶄竴鑷�")) {
staProtocol.setWorkNo((short) 9995);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -269,7 +269,18 @@
// led 寮傚父鏄剧ず
if (ledThread != null) {
- String errorMsg = barcode + "鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷达紒";
+ String errorMsg = barcode + redata.toString();
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ }
+ }else if (redata.toString().startsWith("800")){
+ staProtocol.setWorkNo((short) 9995);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg = barcode + "搴撲綅涓嶈冻";
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
}
} else if ((code == 500 || code == 1000)) {
@@ -294,7 +305,7 @@
}
} else {
if (inSta.getStaNo().equals(103)) {
- staProtocol.setWorkNo((short) 9996);
+ staProtocol.setWorkNo((short) 9998);
staProtocol.setStaNo((short) 203);
}
if (inSta.getStaNo().equals(203)) {
@@ -1229,7 +1240,8 @@
// 娌℃湁浣滀笟涓殑鍏ュ簱浠诲姟鏃讹紝鎵嶈兘鐢熸垚绉诲簱浠诲姟
WrkMast one2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("crn_no", slave.getId())
- .last(" and wrk_sts in (3,4,5,6,7,8)"));
+ .eq("source_loc_no", shallowLocNo));
+ //.last(" and wrk_sts in (3,4,5,6,7,8)"));
if (one2 == null) {
moveLocForDeepLoc(slave, shallowLoc);
// 缃《浠诲姟
--
Gitblit v1.9.1