fix :修改

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

@@ -26,6 +26,7 @@ import org.nl.acs.device.enums.DeviceType;
 import org.nl.acs.device.service.mapper.DeviceExtraMapper;
 import org.nl.acs.device.domain.DeviceRunpoint;
 import org.nl.acs.device.service.mapper.DeviceRunpointMapper;
+import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver;
 import org.nl.acs.device_driver.one_conveyor.scanner_weight_conveyor.ConveyorWithScannerWeightDeviceDriver;
 import org.nl.acs.device_driver.one_manipulator.volume_two_manipulator.VolumeTwoManipulatorManipulatorDeviceDriver;
 import org.nl.acs.device_driver.stacker.standard_stacker.StandardStackerDeviceDriver;
@@ -1025,6 +1026,9 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
         }else if (device.getDeviceDriver() instanceof ConveyorWithScannerWeightDeviceDriver) {
             ConveyorWithScannerWeightDeviceDriver conveyorWithScannerWeightDeviceDriver = (ConveyorWithScannerWeightDeviceDriver) device.getDeviceDriver();
             conveyorWithScannerWeightDeviceDriver.setDeviceStatus(form);
+        }else if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
+            BeltConveyorDeviceDriver beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver();
+            beltConveyorDeviceDriver.setDeviceStatus(form);
         }
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java

@@ -235,14 +235,9 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
 
 
             if (mode != last_mode) {
-                JSONObject param = new JSONObject();
-                param.put("device_code", this.device_code);
-                param.put("mode", Math.min(mode, 3));
-                param.put("device_name", this.getDevice().getDevice_name());
-                param.put("device_type", CommonFinalParam.ONE);
+
                 requireSucess = false;
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess);
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
+
             }
 
 
@@ -680,7 +675,10 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();
         String mode = "";
-
+        String requireSucess = "0";
+        if (this.requireSucess) {
+            requireSucess = "1";
+        }
         if (this.getMode() == 0) {
             mode = LangProcess.msg("universal_off-line");
         } else if (this.getMode() == 1) {
@@ -695,13 +693,12 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
 
         jo.put("device_name", this.getDevice().getDevice_name());
         jo.put("mode", mode);
-        //jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError())));
-        jo.put("inventory_qty", inventory_qty);
-        jo.put("out_finish", out_finish);
-        jo.put("material", material);
+        jo.put("message", this.getMessage());
+        jo.put("error", this.getError());
+        jo.put("move", move);
         jo.put("is_click", true);
         jo.put("isOnline", this.getIsonline());
-
+        jo.put("requireSucess", requireSucess);
         return jo;
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandarStirageErroEnum.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.stacker.standard_stacker;
+package org.nl.acs.device_driver.stacker.standard_stacker;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -319,6 +319,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
             storage_cache = this.itemProtocol.getItem_storage_cache();
 
 
+
             // 更新指令状态
             if (mode == 3 && task > 0) {
                 Date date = new Date();
@@ -348,7 +349,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
 
 
         if (mode != 3 || requireSucess) {
-//            message = LangProcess.msg("one_message7");
+            message = LangProcess.msg("one_message7");
 
         } else if (error != 0) {
             message =  LangProcess.msg("universal_message3");
@@ -371,7 +372,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                     applyUpdatePointCode(StandarStirageErroEnum.BLOCK_IN.getType());
                 }
 
-
             }
         } else {
 

acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue

@@ -1,5 +1,5 @@
 <template>
-  <!--标准版-输送机-控制点-->
+  <!--标准版-输送机-->
   <div>
     <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">