diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index 64ff57b82..813600758 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java @@ -308,17 +308,30 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl String number = data.get("number"); String leftSize = data.get("left_size"); String rightSize = data.get("right_size"); + //套管1物料 + String to_material1 = data.get("left"); + //套管2物料 + String to_material2 = data.get("right"); + //套管1规格 + String to_spec1 = data.get("leftSpec"); + //套管2规格 + String to_spec2 = data.get("rightSpec"); Map map = new LinkedHashMap<>(); //下发纸管信息 - //todo:纸管规格待定 - map.put("to_material1", material1); - map.put("to_material2", material2); + + map.put("to_material1", to_material1); + map.put("to_material2", to_material2); + if (StrUtil.isNotEmpty(leftSize)){ map.put("to_size1", leftSize); } if (StrUtil.isNotEmpty(rightSize)){ map.put("to_size2", rightSize); } + map.put("to_spec1", to_spec1); + if (ObjectUtil.isNotEmpty(to_spec2)) { + map.put("to_spec2", to_spec2); + } map.put("to_command", mode); map.put("to_qty1", number); this.writing(map); @@ -406,11 +419,33 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl applyPlugPullSitResponse = acsToWmsService.applyPlugPullSiteRequest(applyPlugPullSiteRequest); if (applyPlugPullSitResponse.getCode() == CommonFinalParam.STATUS_OPEN) { Map data = applyPlugPullSitResponse.getData(); - String leftSize = data.get("left_size"); - String rightSzie = data.get("right_szie"); + //拔管1物料 + Object to_material3 = data.get("currentLeft"); + //拔管2物料 + Object to_material4 = data.get("currentRight"); + //拔管1尺寸 + Object to_size3 = data.get("currentLeftSize"); + //拔管2尺寸 + Object to_size4 = data.get("currentRightSize"); + //拔管1规格 + Object to_spec3 = data.get("currentLeftSpec"); + //拔管2规格 + Object to_spec4 = data.get("currentRightSpec"); + Object to_qty2 = data.get("pullCount"); Map map = new LinkedHashMap<>(); - map.put("to_size3", leftSize); - map.put("to_size4", rightSzie); + map.put("to_material3", to_material3); + if (ObjectUtil.isNotEmpty(to_material4)) { + map.put("to_material4", to_material4); + } + map.put("to_size3", to_size3); + if (ObjectUtil.isNotEmpty(to_size4)) { + map.put("to_size4", to_size4); + } + map.put("to_spec3", to_spec3); + if (ObjectUtil.isNotEmpty(to_spec4)) { + map.put("to_spec4", to_spec4); + } + map.put("to_qty2", to_qty2); map.put("to_qzz_type", size); map.put("to_command", mode); this.writing(map); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index 28f5db845..09a3550ed 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java @@ -357,29 +357,66 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp String nextAddr = nextDevice.getExtraValue().get("address").toString(); String interaction_json = taskDto.getInteraction_json(); JSONObject jsonObject = JSONObject.parseObject(interaction_json); - //所需纸管信息（左边） - Object left = jsonObject.get("left"); - //所需纸管信息（右边） - Object right = jsonObject.get("right"); - //当前纸管信息（左边） - Object currentLeft = jsonObject.get("currentLeft"); - //当前纸管信息（右边） - Object currentRight = jsonObject.get("currentRight"); + //套管1物料 + Object to_material1 = jsonObject.get("left"); + //套管2物料 + Object to_material2 = jsonObject.get("right"); + //套管1规格 + Object to_spec1 = jsonObject.get("leftSpec"); + //套管2规格 + Object to_spec2 = jsonObject.get("rightSpec"); + //套管1尺寸 + Object to_size1 = jsonObject.get("leftSize"); + //套管2尺寸 + Object to_size2 = jsonObject.get("rightSize"); + //拔管1物料 + Object to_material3 = jsonObject.get("currentLeft"); + //拔管2物料 + Object to_material4 = jsonObject.get("currentRight"); + //拔管1尺寸 + Object to_size3 = jsonObject.get("currentLeftSize"); + //拔管2尺寸 + Object to_size4 = jsonObject.get("currentRightSize"); + //拔管1规格 + Object to_spec3 = jsonObject.get("currentLeftSpec"); + //拔管2规格 + Object to_spec4 = jsonObject.get("currentRightSpec"); + //套管数量 - Object casingCount = jsonObject.get("casingCount"); + Object to_qty1 = jsonObject.get("casingCount"); //拔管数量 - Object pullCount = jsonObject.get("pullCount"); + Object to_qty2 = jsonObject.get("pullCount"); Map map = new LinkedHashMap<>(); map.put("to_command", CommonFinalParam.ONE); map.put("to_onset", startAddr); map.put("to_task", instruction.getInstruction_code()); map.put("to_target", nextAddr); - map.put("left", left); - map.put("right", right); - map.put("currentLeft", currentLeft); - map.put("currentRight", currentRight); - map.put("casingCount", casingCount); - map.put("pullCount", pullCount); + map.put("to_material1", to_material1); + if (ObjectUtil.isNotEmpty(to_material2)) { + map.put("to_material2", to_material2); + } + map.put("to_spec1", to_spec1); + if (ObjectUtil.isNotEmpty(to_spec2)) { + map.put("to_spec2", to_spec2); + } + map.put("to_size1", to_size1); + if (ObjectUtil.isNotEmpty(to_size2)) { + map.put("to_size2", to_size2); + } + map.put("to_material3", to_material3); + if (ObjectUtil.isNotEmpty(to_material4)) { + map.put("to_material4", to_material4); + } + map.put("to_size3", to_size3); + if (ObjectUtil.isNotEmpty(to_size4)) { + map.put("to_size4", to_size4); + } + map.put("to_spec3", to_spec3); + if (ObjectUtil.isNotEmpty(to_spec4)) { + map.put("to_spec4", to_spec4); + } + map.put("to_qty1", to_qty1); + map.put("to_qty2", to_qty2); this.writing(map); this.setRequireSucess(true); return true;