From ecb93482982b82008b37de0ec67d2afa9cb60b13 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 26 六月 2024 16:58:41 +0800
Subject: [PATCH] 而且回退修改，led显示
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 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 51f2611..6b6667f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -162,19 +162,19 @@
back = true;
}
- if (!back && devp.getId() == 2) {
- if(staProtocol.getWorkNo() == 9907 && '5' != barcode.charAt(0)){
- errMsg = "鏉＄爜5鍙兘鍏�7鎺�";
- back = true;
- }
- if(staProtocol.getWorkNo() == 9906 && '5' == barcode.charAt(0)){
- errMsg = "鏉＄爜5涓嶈兘鍏�6鎺�";
- back = true;
- }
- }
+// if (!back && devp.getId() == 2) {
+// if(staProtocol.getWorkNo() == 9907 && '5' != barcode.charAt(0)){
+// errMsg = "鏉＄爜5鍙兘鍏�7鎺�";
+// back = true;
+// }
+// if(staProtocol.getWorkNo() == 9906 && '5' == barcode.charAt(0)){
+// errMsg = "鏉＄爜5涓嶈兘鍏�6鎺�";
+// back = true;
+// }
+// }
// 閫�鍥�
- if (back) {
+ if (back && devp.getId() == 2) {
// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
// if(!staProtocol.isOutEnable()){
// continue;
@@ -206,7 +206,7 @@
continue;
}
}
- if (wrkMast != null) {
+ if (wrkMast != null && devp.getId() == 2) {
News.warn(""+mark+" - 4"+" - 宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
staProtocol.setWorkNo((short)9999);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -262,18 +262,21 @@
ledCommand.setTitle("鍏ㄦ澘鍏ュ簱");
ledCommand.setLocNo(dto.getLocNo());
ledCommand.setStaNo(dto.getStaNo());
+ ledCommand.setBarcode(barcode);
commands.add(ledCommand);
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, commands));
// ledThread.errorReset();
}
} else {
News.error(""+mark+" - 5"+" - 璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
- staProtocol.setWorkNo((short)9999);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- if (!result) {
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ if(devp.getId() == 2) {
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
}
// led 寮傚父鏄剧ず
@@ -1647,6 +1650,7 @@
ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
ledCommand.setLocNo(wrkMast.getLocNo());
ledCommand.setStaNo(wrkMast.getStaNo());
+ ledCommand.setBarcode(wrkMast.getBarcode());
// ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
--
Gitblit v1.9.1