diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index fb70900..256b0d1 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -660,7 +660,13 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { JSONObject block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); - block.put("location", inst.getStart_point_code()); + // 判断起点是否是钢平台对接点 + String start_point_code = inst.getStart_point_code(); + if (start_point_code.equals("GPTDJDIN")) { + start_point_code += "1"; + } + + block.put("location", start_point_code); block.put("binTask", "ForkLoad"); // block.put("operationArgs", new JSONObject() {{ // put("recognize", true); @@ -691,6 +697,13 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block.put("script_args", scriptArgs); blocks.add(block); } else { + if (inst.getStart_point_code().equals("GPTDJDIN") || inst.getStart_point_code().equals("GPTDJDOUT")) { + JSONObject block1 = new JSONObject(); + block1.put("blockId", IdUtil.simpleUUID()); + block1.put("binTask", "ForkHeight"); + block1.put("location", start_point_code + "OUTGET"); + blocks.add(block1); + } if (device1.getDeviceDriver() instanceof StandardStorageDeviceDriver) { block = new JSONObject(); block.put("binTask", "ForkHeight"); @@ -729,7 +742,12 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); - block.put("location", inst.getNext_point_code()); + // 判断终点是不是钢平台对接点 + String next_point_code = inst.getNext_point_code(); + if (next_point_code.equals("GPTDJDOUT")) { + next_point_code += "1"; + } + block.put("location", next_point_code); block.put("binTask", "ForkUnload"); blocks.add(block); @@ -757,6 +775,13 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block.put("script_args", scriptArgs); blocks.add(block); } else { + if (inst.getNext_point_code().equals("GPTDJDIN") || inst.getNext_point_code().equals("GPTDJDOUT")) { + JSONObject block1 = new JSONObject(); + block1.put("blockId", IdUtil.simpleUUID()); + block1.put("binTask", "ForkHeight"); + block1.put("location", next_point_code + "OUTPUT"); + blocks.add(block1); + } if (device2.getDeviceDriver() instanceof StandardStorageDeviceDriver) { block = new JSONObject(); block.put("binTask", "ForkHeight");