From ddf4e077b77a990c6b7960eb77f2b95e2d475a0b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 26 四月 2024 15:39:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 73 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 37 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 525a375..5f4a2f2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -148,50 +148,49 @@
// }
// }
//瓒呭瓒呴珮娌℃壂鍒版潯鐮佹姤璀�
- 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);
// }catch (Exception e){}
- //String barcode = barcodeThread.getBarcode();
- String barcode = "20000005";
+ String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
News.info(""+mark+" - 1"+" - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
--
Gitblit v1.9.1