root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 拔前行架字段添加

Browse Source
This commit is contained in:
LENOVO
2024-04-11 10:18:48 +08:00
parent 0bcffd1d63
commit 45ace13886
1 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java
View File

@@ -357,19 +357,29 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
String nextAddr = nextDevice.getExtraValue().get("address").toString(); String nextAddr = nextDevice.getExtraValue().get("address").toString();
String interaction_json = taskDto.getInteraction_json(); String interaction_json = taskDto.getInteraction_json();
JSONObject jsonObject = JSONObject.parseObject(interaction_json); JSONObject jsonObject = JSONObject.parseObject(interaction_json);
// Object isBushing = jsonObject.get("is_bushing"); //所需纸管信息（左边）
// Object isPulling = jsonObject.get("is_pulling"); Object left = jsonObject.get("left");
// Object qzzNo = jsonObject.get("qzz_no"); //所需纸管信息（右边）
// Object qzzSize = jsonObject.get("qzz_size"); Object right = jsonObject.get("right");
//当前纸管信息（左边）
Object currentLeft = jsonObject.get("currentLeft");
//当前纸管信息（右边）
Object currentRight = jsonObject.get("currentRight");
//套管数量
Object casingCount = jsonObject.get("casingCount");
//拔管数量
Object pullCount = jsonObject.get("pullCount");
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command", CommonFinalParam.ONE); map.put("to_command", CommonFinalParam.ONE);
map.put("to_onset", startAddr); map.put("to_onset", startAddr);
map.put("to_target", nextAddr);
map.put("to_task", instruction.getInstruction_code()); map.put("to_task", instruction.getInstruction_code());
// map.put("to_pull", isPulling); map.put("to_target", nextAddr);
// map.put("to_bushing", isBushing); map.put("left", left);
// map.put("to_size", qzzSize); map.put("right", right);
// map.put("to_barcode", qzzNo); map.put("currentLeft", currentLeft);
map.put("currentRight", currentRight);
map.put("casingCount", casingCount);
map.put("pullCount", pullCount);
this.writing(map); this.writing(map);
this.setRequireSucess(true); this.setRequireSucess(true);
return true; return true;
@@ -443,21 +453,31 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
} }
String startAddr = startDevice.getExtraValue().get("address").toString(); String startAddr = startDevice.getExtraValue().get("address").toString();
String nextAddr = nextDevice.getExtraValue().get("address").toString(); String nextAddr = nextDevice.getExtraValue().get("address").toString();
// String interactionJson = task.getInteraction_json(); String interactionJson = task.getInteraction_json();
// JSONObject jsonObject = JSONObject.parseObject(interactionJson); JSONObject jsonObject = JSONObject.parseObject(interactionJson);
// Object isBushing = jsonObject.get("is_bushing"); //所需纸管信息（左边）
// Object isPulling = jsonObject.get("is_pulling"); Object left = jsonObject.get("left");
// Object qzzNo = jsonObject.get("qzz_no"); //所需纸管信息（右边）
// Object qzzSize = jsonObject.get("qzz_size"); Object right = jsonObject.get("right");
//当前纸管信息（左边）
Object currentLeft = jsonObject.get("currentLeft");
//当前纸管信息（右边）
Object currentRight = jsonObject.get("currentRight");
//套管数量
Object casingCount = jsonObject.get("casingCount");
//拔管数量
Object pullCount = jsonObject.get("pullCount");
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command", CommonFinalParam.ONE); map.put("to_command", CommonFinalParam.ONE);
map.put("to_onset", startAddr); map.put("to_onset", startAddr);
map.put("to_task", instdto.getInstruction_code()); map.put("to_task", instdto.getInstruction_code());
map.put("to_target", nextAddr); map.put("to_target", nextAddr);
// map.put("to_pull", isPulling); map.put("left", left);
// map.put("to_bushing", isBushing); map.put("right", right);
// map.put("to_size", qzzSize); map.put("currentLeft", currentLeft);
// map.put("to_barcode", qzzNo); map.put("currentRight", currentRight);
map.put("casingCount", casingCount);
map.put("pullCount", pullCount);
this.writing(map); this.writing(map);
this.setRequireSucess(true); this.setRequireSucess(true);
notCreateInstMessage = ""; notCreateInstMessage = "";