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

更新

Browse Source
This commit is contained in:
gengby
2023-02-06 09:56:48 +08:00
parent b650280c14
commit 55fc37b3f3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java
View File

@@ -115,7 +115,7 @@ public class AMHandServiceImpl implements AMHandService {
allow_update = "1"; allow_update = "1";
} else if (device_driver.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { } else if (device_driver.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device_driver.getDeviceDriver(); standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device_driver.getDeviceDriver();
int move = standardInspectSiteDeviceDriver.getMove(); // int move = standardInspectSiteDeviceDriver.getMove();
TaskDto taskDto = taskService.findByStartAndNextCode(device_code); TaskDto taskDto = taskService.findByStartAndNextCode(device_code);
if (ObjectUtil.isNotEmpty(taskDto)) { if (ObjectUtil.isNotEmpty(taskDto)) {
status = "2"; status = "2";
@@ -594,6 +594,7 @@ public class AMHandServiceImpl implements AMHandService {
instdto.setStart_device_code(taskjo.getString("start_device_code")); instdto.setStart_device_code(taskjo.getString("start_device_code"));
instdto.setNext_device_code(taskjo.getString("next_device_code")); instdto.setNext_device_code(taskjo.getString("next_device_code"));
instdto.setInstruction_status("0"); instdto.setInstruction_status("0");
instdto.setAgv_inst_type("1");
InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
WQLObject instwo = WQLObject.getWQLObject("acs_instruction"); WQLObject instwo = WQLObject.getWQLObject("acs_instruction");
JSONObject instcheckjson = instwo.query(" instruction_status < 2 and next_point_code= '" + next_point_code + "'" + " and start_point_code = '" + start_point_code + "'" + " and task_id = '" + task_id + "'").uniqueResult(0); JSONObject instcheckjson = instwo.query(" instruction_status < 2 and next_point_code= '" + next_point_code + "'" + " and start_point_code = '" + start_point_code + "'" + " and task_id = '" + task_id + "'").uniqueResult(0);

2
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -1017,7 +1017,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
instdto.setAgv_inst_type("3"); instdto.setAgv_inst_type("3");
} }
} else { } else {
instdto.setAgv_inst_type("4"); instdto.setAgv_inst_type("1");
} }
instructionservice.create(instdto); instructionservice.create(instdto);