From 242fd02ef7b86cfe6ae352b1721c50205cc7bafe Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 28 四月 2024 08:55:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 127 ++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 66 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 a0e6a2e..738fa7b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -148,43 +148,43 @@
// }
// }
//瓒呭瓒呴珮娌℃壂鍒版潯鐮佹姤璀�
- boolean fig=false;
- for(int i=0;i<8;i++){
- switch (i){
- case 0: if(devpThread.startSignal[i]){
- log.error("鍓嶈秴鎶ヨ");
- fig=true;
- };
- case 1: if(devpThread.startSignal[i]){
- log.error("鍚庤秴鎶ヨ");
- fig=true;
- };
- case 2: if(devpThread.startSignal[i]){
- log.error("楂樿秴鎶ヨ");
- fig=true;
- };
- case 3: if(devpThread.startSignal[i]){
- log.error("宸﹁秴鎶ヨ");
- fig=true;
- };
- case 4: if(devpThread.startSignal[i]){
- log.error("鍙宠秴鎶ヨ");
- fig=true;
- };
- case 5: if(devpThread.startSignal[i]){
- log.error("瓒呴噸鎶ヨ");
- fig=true;
- };
- case 6: if(devpThread.startSignal[i]){
- log.error("鏈壂鍒扮爜鎶ヨ");
- fig=true;
- };
-
- }
- }
+// boolean fig=false;
+// for(int i=0;i<8;i++){
+// switch (i){
+// case 0: if(devpThread.startSignal[i]){
+// log.error("鍓嶈秴鎶ヨ");
+// fig=true;
+// };
+// case 1: if(devpThread.startSignal[i]){
+// log.error("鍚庤秴鎶ヨ");
+// fig=true;
+// };
+// case 2: if(devpThread.startSignal[i]){
+// log.error("楂樿秴鎶ヨ");
+// fig=true;
+// };
+// case 3: if(devpThread.startSignal[i]){
+// log.error("宸﹁秴鎶ヨ");
+// fig=true;
+// };
+// case 4: if(devpThread.startSignal[i]){
+// log.error("鍙宠秴鎶ヨ");
+// fig=true;
+// };
+// case 5: if(devpThread.startSignal[i]){
+// log.error("瓒呴噸鎶ヨ");
+// fig=true;
+// };
+// case 6: if(devpThread.startSignal[i]){
+// log.error("鏈壂鍒扮爜鎶ヨ");
+// fig=true;
+// };
+//
+// }
+// }
if (staProtocol.isAutoing() && staProtocol.isInEnable()
&& !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
- && staProtocol.isPakMk() && !fig) { //&& staProtocol.getStamp()>=2) {// && !Cools.isEmpty(barcode)) {
+ && staProtocol.isPakMk()) { //&& staProtocol.getStamp()>=2) {// && !Cools.isEmpty(barcode)) {
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛�");
// try {
// Thread.sleep(300);
@@ -193,9 +193,7 @@
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
News.info(""+mark+" - 1"+" - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
- if(staProtocol.getStamp()<2){
- continue;
- }
+
if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
staProtocol.setWorkNo((short) 9999);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -211,9 +209,6 @@
continue;
}
} else {
- if(staProtocol.getStamp()<2){
- continue;
- }
staProtocol.setWorkNo((short) 9999);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -492,7 +487,7 @@
wrkMast.setIoTime(now);
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+ wrkMast.setSourceStaNo(100); // 婧愮珯
wrkMast.setStaNo(staNo); // 鐩爣绔�
wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
@@ -1674,33 +1669,33 @@
continue;
}
// 鍛戒护涓嬪彂 -------------------------------------------------------------------------------
-// if (!commands.isEmpty()) {
-// if (led.getId() < 7) {
-// if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
-// News.error(""+mark+" - 2"+" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
-// continue;
-// } else {
-// ledThread.setLedMk(false);
-// }
-// } else {
-// if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
-// News.error(""+mark+" - 3"+" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
-// continue;
-// } else {
-// ledThread.setLedMk(false);
-// }
-// }
-//
-// }
- // 鍛戒护涓嬪彂 -------------------------------------------------------------------------------
if (!commands.isEmpty()) {
- if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
- News.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
- continue;
- }else {
- ledThread.setLedMk(false);
+ if (led.getId() == 2) {
+ if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
+ News.error(""+mark+" - 2"+" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+ continue;
+ } else {
+ ledThread.setLedMk(false);
+ }
+ } else {
+ if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
+ News.error(""+mark+" - 3"+" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+ continue;
+ } else {
+ ledThread.setLedMk(false);
+ }
}
+
}
+// // 鍛戒护涓嬪彂 -------------------------------------------------------------------------------
+// if (!commands.isEmpty()) {
+// if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
+// News.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+// continue;
+// }else {
+// ledThread.setLedMk(false);
+// }
+// }
try {
// 淇敼涓绘。led鏍囪
--
Gitblit v1.9.1