diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
index 58e380272..eb870857d 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
@@ -447,7 +447,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                 JSONObject param = new JSONObject();
                 param.put("device_code", this.device_code);
                 param.put("error", error);
-                param.put("error_msg", this.getError_message());
+                param.put("error_msg", error == 0 ? "" : this.getError_message());
                 param.put("device_name", this.getDevice().getDevice_name());
                 param.put("device_type", "4");
                 param.put("product_area", paramService.findByCode("productArea").getValue());
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
index 97ad49791..d3eb9de41 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
@@ -690,7 +690,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                 JSONObject param = new JSONObject();
                 param.put("device_code", this.device_code);
                 param.put("error", error);
-                param.put("error_msg", this.getError_message());
+                param.put("error_msg", error == 0 ? "" : this.getError_message());
                 param.put("device_name", this.getDevice().getDevice_name());
                 param.put("device_type", "4");
                 param.put("product_area", ParamService.findByCode("productArea").getValue());
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java
index 0ac1ab09d..b7570bde9 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java
@@ -118,11 +118,11 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
     }
     public void setIserror(Boolean iserror) {
         this.iserror = iserror;
-        if (this.iserror != this.last_iserror && this.iserror && device_id.startsWith("RGV")) {
+        if (this.iserror != this.last_iserror && device_id.startsWith("RGV")) {
             JSONObject param = new JSONObject();
             param.put("device_code", this.device_id);
             param.put("error", alarm);
-            param.put("error_msg", ErrorUtil.getDictDetail("ssx_error_type", alarm));
+            param.put("error_msg", iserror ? ErrorUtil.getDictDetail("ssx_error_type", alarm) : "");
             param.put("device_name", this.getDevice().getDevice_name());
             param.put("device_type", "3");
             param.put("product_area", paramService.findByCode("productArea").getValue());
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
index d3b00b6a9..26c9c2ca4 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
@@ -222,16 +222,17 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     String errorInfo = ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(error));
                     dto.setError_info(errorInfo);
                     deviceErrorLogService.create(dto);
-
-                    JSONObject param = new JSONObject();
-                    param.put("device_code", this.device_code);
-                    param.put("error", error);
-                    param.put("error_msg", errorInfo);
-                    param.put("device_name", this.getDevice().getDevice_name());
-                    param.put("device_type", "2");
-                    param.put("product_area", paramService.findByCode("productArea").getValue());
-                    acsToWmsService.sendDeviceStatus(param);
                 }
+
+                JSONObject param = new JSONObject();
+                param.put("device_code", this.device_code);
+                param.put("error", error);
+                param.put("error_msg", error == 0 ? "" : ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(error)));
+                param.put("device_name", this.getDevice().getDevice_name());
+                param.put("device_type", "2");
+                param.put("product_area", paramService.findByCode("productArea").getValue());
+                acsToWmsService.sendDeviceStatus(param);
+
                 logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
index f5fcc25a9..45a6748fb 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
@@ -272,18 +272,19 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                     String errorInfo = ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error));
                     dto.setError_info(errorInfo);
                     deviceErrorLogService.create(dto);
-
-                    if ("true".equals(this.device.getExtraValue().get("sendDeviceStatus"))) {
-                        JSONObject param = new JSONObject();
-                        param.put("device_code", this.device_code);
-                        param.put("error", error);
-                        param.put("error_msg", errorInfo);
-                        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 ("true".equals(this.device.getExtraValue().get("sendDeviceStatus"))) {
+                    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(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java
index f755222ed..95e7e8ffa 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java
@@ -228,16 +228,17 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
                     String errorInfo = ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error));
                     dto.setError_info(errorInfo);
                     deviceErrorLogService.create(dto);
-
-                    JSONObject param = new JSONObject();
-                    param.put("device_code", this.device_code);
-                    param.put("error", error);
-                    param.put("error_msg", errorInfo);
-                    param.put("device_name", this.getDevice().getDevice_name());
-                    param.put("device_type", "1");
-                    param.put("product_area", paramService.findByCode("productArea").getValue());
-                    acsToWmsService.sendDeviceStatus(param);
                 }
+
+                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(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
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 f2c42a173..73413e17a 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
@@ -206,16 +206,17 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
                     String errorInfo = ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error));
                     dto.setError_info(errorInfo);
                     deviceErrorLogService.create(dto);
-
-                    JSONObject param = new JSONObject();
-                    param.put("device_code", this.device_code);
-                    param.put("error", error);
-                    param.put("error_msg", errorInfo);
-                    param.put("device_name", this.getDevice().getDevice_name());
-                    param.put("device_type", "1");
-                    param.put("product_area", paramService.findByCode("productArea").getValue());
-                    acsToWmsService.sendDeviceStatus(param);
                 }
+
+                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(
                         this.device_code, "", "", "信号error：" + last_error + "->" + error);
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java
index c568401c3..bd9716546 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java
@@ -187,16 +187,16 @@ public class SiemensOneFloorAGVConveyorDeviceDriver extends AbstractOpcDeviceDri
                     String errorInfo = ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error));
                     dto.setError_info(errorInfo);
                     deviceErrorLogService.create(dto);
-
-                    JSONObject param = new JSONObject();
-                    param.put("device_code", this.device_code);
-                    param.put("error", error);
-                    param.put("error_msg", errorInfo);
-                    param.put("device_name", this.getDevice().getDevice_name());
-                    param.put("device_type", "1");
-                    param.put("product_area", paramService.findByCode("productArea").getValue());
-                    acsToWmsService.sendDeviceStatus(param);
                 }
+
+                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);
             }
         } catch (Exception var17) {
             var17.printStackTrace();
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
index a82db0757..bf98d8a25 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
@@ -266,16 +266,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                     String errorInfo = ErrorUtil.getDictDetail("fqhj_error_type", String.valueOf(error));
                     dto.setError_info(errorInfo);
                     deviceErrorLogService.create(dto);
-
-                    JSONObject param = new JSONObject();
-                    param.put("device_code", this.device_code);
-                    param.put("error", error);
-                    param.put("error_msg", errorInfo);
-                    param.put("device_name", this.getDevice().getDevice_name());
-                    param.put("device_type", "2");
-                    param.put("product_area", paramService.findByCode("productArea").getValue());
-                    acsToWmsService.sendDeviceStatus(param);
                 }
+
+                JSONObject param = new JSONObject();
+                param.put("device_code", this.device_code);
+                param.put("error", error);
+                param.put("error_msg", error == 0 ? "" : ErrorUtil.getDictDetail("fqhj_error_type", String.valueOf(error)));
+                param.put("device_name", this.getDevice().getDevice_name());
+                param.put("device_type", "2");
+                param.put("product_area", paramService.findByCode("productArea").getValue());
+                acsToWmsService.sendDeviceStatus(param);
+
                 logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }