From e9d04cf9f3c8c1a2978148636ecd5b43048aecb1 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Fri, 8 Sep 2023 10:38:59 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E5=8F=8D=E9=A6=88=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SiemensConveyorLabelingDeviceDriver.java  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
index 53c675933..29f39e14c 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
@@ -199,7 +199,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
                         "信号carrier_direction：" + last_carrier_direction + "->" + carrier_direction);
             }
             if (error != last_error) {
-                if(error != 0 && error != 110 && error != 70 ){
+                if(error != 0){
                     DeviceErrorLogDto dto = new DeviceErrorLogDto();
                     dto.setDevice_code(device_code);
                     dto.setError_code(String.valueOf(error));
@@ -208,14 +208,16 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
                     deviceErrorLogService.create(dto);
                 }
 
-                JSONObject param = new JSONObject();
-                param.put("device_code", this.device_code);
-                param.put("error", error);
-                param.put("error_msg", error == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error)));
-                param.put("device_name", this.getDevice().getDevice_name());
-                param.put("device_type", "1");
-                param.put("product_area", paramService.findByCode("productArea").getValue());
-                acsToWmsService.sendDeviceStatus(param);
+                if(error != 0 && error != 110 && error != 70 ) {
+                    JSONObject param = new JSONObject();
+                    param.put("device_code", this.device_code);
+                    param.put("error", error);
+                    param.put("error_msg", error == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error)));
+                    param.put("device_name", this.getDevice().getDevice_name());
+                    param.put("device_type", "1");
+                    param.put("product_area", paramService.findByCode("productArea").getValue());
+                    acsToWmsService.sendDeviceStatus(param);
+                }
 
                 logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
                 logServer.deviceExecuteLog(