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

fix: 堆垛机取货完成给任务号、叉车去动作块

Browse Source
This commit is contained in:
lishuai
2024-07-27 08:19:16 +08:00
parent 2b1ae71936
commit 7eec47522f
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@@ -1382,11 +1382,6 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
jo4.put("script_args", script_args1); jo4.put("script_args", script_args1);
ja.add(jo4); 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(); JSONObject jo7 = new JSONObject();
jo7.put("blockId", IdUtil.simpleUUID()); jo7.put("blockId", IdUtil.simpleUUID());
@@ -1479,11 +1474,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
jo4.put("script_args", script_args1); jo4.put("script_args", script_args1);
ja.add(jo4); 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(); JSONObject jo7 = new JSONObject();
jo7.put("blockId", IdUtil.simpleUUID()); jo7.put("blockId", IdUtil.simpleUUID());

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
View File

@@ -455,6 +455,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
map3.put("value", inst.getTo_y()); map3.put("value", inst.getTo_y());
list.add(map3); list.add(map3);
} }
Map<String, Object> map5 = new HashMap<>();
map5.put("code", "to_task");
map5.put("value", task);
list.add(map5);
Map<String, Object> map4 = new HashMap<>(); Map<String, Object> map4 = new HashMap<>();
map4.put("code", "to_command"); map4.put("code", "to_command");
map4.put("value", 2); map4.put("value", 2);
@@ -577,7 +581,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
var17.printStackTrace(); var17.printStackTrace();
} }