From 9d27e686081cf981d0b230df3eb46ea0d3e3ffae Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 27 Nov 2024 15:17:03 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=B5=8B=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/impl/XianGongAgvServiceImpl.java | 48 +++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) 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 9ec4929..fb70900 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 @@ -638,7 +638,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { JSONObject block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code() + "INGET"); - block.put("operation", "ForkHeight"); + if ("CPJSSX,BZXXL".contains(inst.getStart_device_code())) { + block.put("operation", "script"); + } else { + block.put("operation", "ForkHeight"); + } block.put("id", inst.getStart_point_code() + "INGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -668,7 +672,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code() + "OUTGET"); - block.put("operation", "ForkHeight"); + if ("CPJSSX,BZXXL".contains(inst.getStart_device_code())) { + block.put("operation", "script"); + } else { + block.put("operation", "ForkHeight"); + } block.put("id", inst.getStart_point_code() + "OUTGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -699,7 +707,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code() + "INPUT"); - block.put("operation", "ForkHeight"); + if ("CPJSSX,BZXXL".contains(inst.getNext_device_code())) { + block.put("operation", "script"); + } else { + block.put("operation", "ForkHeight"); + } block.put("id", inst.getNext_point_code() + "INPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -726,7 +738,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code() + "OUTPUT"); - block.put("operation", "ForkHeight"); + if ("CPJSSX,BZXXL".contains(inst.getNext_device_code())) { + block.put("operation", "script"); + } else { + block.put("operation", "ForkHeight"); + } block.put("id", inst.getNext_point_code() + "OUTPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -758,7 +774,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code2() + "INGET"); - block.put("operation", "ForkHeight"); + if ("CPJSSX,BZXXL".contains(inst.getStart_device_code2())) { + block.put("operation", "script"); + } else { + block.put("operation", "ForkHeight"); + } block.put("id", inst.getStart_point_code2() + "INGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -788,7 +808,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code2() + "OUTGET"); - block.put("operation", "ForkHeight"); + if ("CPJSSX,BZXXL".contains(inst.getStart_device_code2())) { + block.put("operation", "script"); + } else { + block.put("operation", "ForkHeight"); + } block.put("id", inst.getStart_point_code2() + "OUTGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -821,7 +845,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code2() + "INPUT"); - block.put("operation", "ForkHeight"); + if ("CPJSSX,BZXXL".contains(inst.getNext_device_code2())) { + block.put("operation", "script"); + } else { + block.put("operation", "ForkHeight"); + } block.put("id", inst.getNext_point_code2() + "INPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -848,7 +876,11 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code2() + "OUTPUT"); - block.put("operation", "ForkHeight"); + if ("CPJSSX,BZXXL".contains(inst.getNext_device_code2())) { + block.put("operation", "script"); + } else { + block.put("operation", "ForkHeight"); + } block.put("id", inst.getNext_point_code2() + "OUTPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject();