fix: 26

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

@@ -263,9 +263,9 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
         if (mode == 8 && !requireSucess) {
             if (container_type == 0) {
                 message = "托盘类型为空";
-            }
+            }else {
             applyEmptyTask(StorageTypeEnum.DISKS_OUT.getType(), mode);
-
+}
 
         }
 
@@ -606,8 +606,8 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
 
                     if (nextdevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
                         beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextdevice.getDeviceDriver();
-                        Boolean ignorePickupCheck = (Boolean) beltConveyorDeviceDriver.getExtraValue().get("ignore_pickup_check");
-                        if (!ignorePickupCheck) {
+                        String ignorePickupCheck = (String) beltConveyorDeviceDriver.getExtraValue().get("ignore_pickup_check");
+                        if ("false".equals(ignorePickupCheck)) {
                             if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 1) {
                                 log.error("输送机,{}未联机或执行中", next_device_code);
                                 this.setNotCreateInstMessage("universal_notCreateInstMessage4");
@@ -755,7 +755,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
     public void writing(String key, String param) {
 
         String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
-                + "." + param;
+                + "." + key;
         //String opcservcerid = this.getDevice().getOpc_server_id();
         //Server server = ReadUtil.getServer(opcservcerid);
         Map<String, Object> itemMap = new HashMap<String, Object>();