From 02e5449fc0e582a1d3bbd160f6557218eca013b0 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 02 七月 2024 12:44:12 +0800
Subject: [PATCH] 修改led显示
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 39261ef..976588f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -212,8 +212,10 @@
if (wrkMast != null) {
News.warn(""+mark+" - 4"+" - 婊℃墭鐩樺叆搴撳伐浣滄。涓凡瀛樺湪璇ョ珯鐘舵�佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
if (devp.getId() == 2) {
- staProtocol.setWorkNo((short)9999);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
+// staProtocol.setWorkNo((short)9999);
+// staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
@@ -224,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;
}
@@ -275,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);
@@ -536,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);
@@ -1602,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));
}
--
Gitblit v1.9.1