From 57a3f0f8dba388abb420df1f7afe4b1e2ed1cbdd Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 21 Apr 2023 10:27:34 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ndardCoveyorControlWithScannerDeviceDriver.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
index dc9f965..88a2064 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
@@ -179,7 +179,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
             error = this.itemProtocol.getItem_error();
             task = this.itemProtocol.getItem_task();
             action = this.itemProtocol.getItem_action();
-
+            //container = this.barcode();
             if (mode != last_mode) {
                 this.setRequireSucess(false);
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
@@ -199,6 +199,9 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
             if (action != last_action) {
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action);
             }
+//            if (!StrUtil.equals(container, last_container)) {
+//                logServer.deviceExecuteLog(this.device_code, "", "", "信号container：" + last_container + "->" + container);
+//            }
 
             if (mode == 2 && move != 0 && task > 0) {
                 logServer.deviceExecuteLog(this.device_code, "", "", "开始反馈任务状态.......指令号:" + task);
@@ -215,15 +218,14 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
                         inst.setInstruction_status("1");
                         instructionService.update(inst);
                     }
-                } else {
+                } /*else {
                     logServer.deviceExecuteLog(this.device_code, "", "", "开始反馈任务中状态.......根据指令号查询到指令为空,指令号:" + task);
-                }
+                }*/
             }
 
         } catch (Exception var17) {
             logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:" + var17.getMessage());
             logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:栈信息" + var17.getStackTrace());
-            return;
         }
         if (!this.itemProtocol.getIsonline()) {
             this.setIsonline(false);
@@ -251,6 +253,9 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
                     log.debug("设备运转模式:等待工作");
                     break;
                 case 2:
+                    if (!requireSucess){
+                        logServer.deviceExecuteLog(this.device_code, "", "", "扫码器扫到的条码为:" + barcode());
+                    }
                     //申请任务
                     if (!StrUtil.isEmpty(barcode()) && !requireSucess) {
                         instruction_require(barcode());
@@ -276,6 +281,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
         last_move = move;
         last_task = task;
         last_action = action;
+        //last_container = container;
     }
 
     public boolean exe_error() {