diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index 091c0b6..14fbed0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -537,11 +537,13 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements String interactionJson = handCodeTaskDto.getInteraction_json(); InteractionJsonDTO interactionJsonDTO = JSON.parseObject(interactionJson, InteractionJsonDTO.class); String containerType = "0"; + String type = "0"; if (ObjectUtil.isNotEmpty(interactionJsonDTO)) { containerType = interactionJsonDTO.getContainerType(); + type = interactionJsonDTO.getType(); } - List keys = new ArrayList<>(Arrays.asList(ItemProtocol.TO_TARGET.getKey(), ItemProtocol.TO_TASK.getKey(), ItemProtocol.TO_CONTAINER_TYPE.getKey(), ItemProtocol.TO_COMMAND.getKey())); - List values = new ArrayList<>(Arrays.asList(getTargetAddress(nextDevice), Integer.parseInt(instDto.getInstruction_code()), Integer.parseInt(containerType), ToCommandEnum.COMMAND_ONE.getSignalNum())); + List keys = new ArrayList<>(Arrays.asList(ItemProtocol.TO_BACK_UP_1.getKey(),ItemProtocol.TO_TARGET.getKey(), ItemProtocol.TO_TASK.getKey(), ItemProtocol.TO_CONTAINER_TYPE.getKey(), ItemProtocol.TO_COMMAND.getKey())); + List values = new ArrayList<>(Arrays.asList(type,getTargetAddress(nextDevice), Integer.parseInt(instDto.getInstruction_code()), Integer.parseInt(containerType), ToCommandEnum.COMMAND_ONE.getSignalNum())); this.writing(keys, values); this.requireSuccess = true; return; @@ -591,11 +593,13 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements String interactionJson = taskDto.getInteraction_json(); InteractionJsonDTO interactionJsonDTO = JSON.parseObject(interactionJson, InteractionJsonDTO.class); String containerType = "0"; + String type = "0"; if (ObjectUtil.isNotEmpty(interactionJsonDTO)) { containerType = interactionJsonDTO.getContainerType(); + type = interactionJsonDTO.getType(); } - List keys = new ArrayList<>(Arrays.asList(ItemProtocol.TO_TARGET.getKey(), ItemProtocol.TO_TASK.getKey(), ItemProtocol.TO_CONTAINER_TYPE.getKey(), ItemProtocol.TO_COMMAND.getKey())); - List values = new ArrayList<>(Arrays.asList(getTargetAddress(nextDevice), Integer.parseInt(instDto.getInstruction_code()), Integer.parseInt(containerType), ToCommandEnum.COMMAND_ONE.getSignalNum())); + List keys = new ArrayList<>(Arrays.asList(ItemProtocol.TO_BACK_UP_1.getKey(),ItemProtocol.TO_TARGET.getKey(), ItemProtocol.TO_TASK.getKey(), ItemProtocol.TO_CONTAINER_TYPE.getKey(), ItemProtocol.TO_COMMAND.getKey())); + List values = new ArrayList<>(Arrays.asList(type,getTargetAddress(nextDevice), Integer.parseInt(instDto.getInstruction_code()), Integer.parseInt(containerType), ToCommandEnum.COMMAND_ONE.getSignalNum())); this.writing(keys, values); this.requireSuccess = true; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/InteractionJsonDTO.java index 3822916..c9ba832 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/InteractionJsonDTO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/InteractionJsonDTO.java @@ -41,4 +41,6 @@ public class InteractionJsonDTO { * 高度等级 */ private String heightLevel; + + private String type; }