From 7eec47522fe50bbc00126bd77720b82a594dbdc5 Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Sat, 27 Jul 2024 08:19:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A0=86=E5=9E=9B=E6=9C=BA=E5=8F=96?= =?UTF-8?q?=E8=B4=A7=E5=AE=8C=E6=88=90=E7=BB=99=E4=BB=BB=E5=8A=A1=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E5=8F=89=E8=BD=A6=E5=8E=BB=E5=8A=A8=E4=BD=9C=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/agv/server/impl/XianGongAgvServiceImpl.java | 11 +---------- .../standard_stacker/StandardStackerDeviceDriver.java | 6 +++++- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index a1d6165b4..15fcf2da6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -1382,11 +1382,6 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { jo4.put("script_args", script_args1); ja.add(jo4); - JSONObject jo6 = new JSONObject(); - jo6.put("blockId", IdUtil.simpleUUID()); - jo6.put("location", inst.getStart_point_code()); - jo6.put("binTask", "Script"); - ja.add(jo6); JSONObject jo7 = new JSONObject(); jo7.put("blockId", IdUtil.simpleUUID()); @@ -1479,11 +1474,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { jo4.put("script_args", script_args1); ja.add(jo4); - JSONObject jo6 = new JSONObject(); - jo6.put("blockId", IdUtil.simpleUUID()); - jo6.put("location", inst.getStart_point_code()); - jo6.put("binTask", "Script"); - ja.add(jo6); + JSONObject jo7 = new JSONObject(); jo7.put("blockId", IdUtil.simpleUUID()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index e44c66c98..1b04826a9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -455,6 +455,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme map3.put("value", inst.getTo_y()); list.add(map3); } + Map map5 = new HashMap<>(); + map5.put("code", "to_task"); + map5.put("value", task); + list.add(map5); Map map4 = new HashMap<>(); map4.put("code", "to_command"); map4.put("value", 2); @@ -577,7 +581,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + var17.printStackTrace(); }