From efcab71349383ef2bb98ad3826a72518dde62d18 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 25 七月 2024 12:46:24 +0800
Subject: [PATCH] 空板入库回退
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 e5a7768..98168b2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -226,7 +226,7 @@
// led 寮傚父鏄剧ず
if (ledThread != null) {
String errorMsg = "宸ヤ綔妗ｅ凡瀛樺湪璇ユ潯鐮佸彿===>>" + barcode;
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
+// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
continue;
}
@@ -277,9 +277,9 @@
ledCommand.setBarcode(barcode);
commands.add(ledCommand);
if (devp.getId() == 1) {
- if (MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(1, commands))){
- ledThread.setLedMk(false);
- }
+// if (MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(1, commands))){
+// ledThread.setLedMk(false);
+// }
} else {
if (MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, commands))){
ledThread.setLedMk(false);
@@ -538,9 +538,9 @@
ledCommand.setMatDtos(matDtos);
commands.add(ledCommand);
if (devp.getId() == 1) {
- if (MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(1, commands))) {
- ledThread.setLedMk(false);
- }
+// if (MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(1, commands))) {
+// ledThread.setLedMk(false);
+// }
} else {
if (MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, commands))){
ledThread.setLedMk(false);
@@ -1604,7 +1604,7 @@
ledCommand.setMatDtos(matDtos);
commands.add(ledCommand);
if (devp.getId() == 1) {
- MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(1, commands));
+// MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(1, commands));
} else {
MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, commands));
}
@@ -1613,7 +1613,7 @@
Thread.sleep(500);
} else {
staProtocol.setWorkNo((short)9991);
- staProtocol.setStaNo((short)100);
+ staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
--
Gitblit v1.9.1