From 55fc37b3f3521dbac30f99d1cd2e783a3515f26b Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Mon, 6 Feb 2023 09:56:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java | 3 ++- .../java/org/nl/acs/task/service/impl/TaskServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java index ee8ea77..4fa69c5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java @@ -115,7 +115,7 @@ public class AMHandServiceImpl implements AMHandService { allow_update = "1"; } else if (device_driver.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device_driver.getDeviceDriver(); - int move = standardInspectSiteDeviceDriver.getMove(); + // int move = standardInspectSiteDeviceDriver.getMove(); TaskDto taskDto = taskService.findByStartAndNextCode(device_code); if (ObjectUtil.isNotEmpty(taskDto)) { status = "2"; @@ -594,6 +594,7 @@ public class AMHandServiceImpl implements AMHandService { instdto.setStart_device_code(taskjo.getString("start_device_code")); instdto.setNext_device_code(taskjo.getString("next_device_code")); instdto.setInstruction_status("0"); + instdto.setAgv_inst_type("1"); InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); 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); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 412b703..89ba280 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -1017,7 +1017,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { instdto.setAgv_inst_type("3"); } } else { - instdto.setAgv_inst_type("4"); + instdto.setAgv_inst_type("1"); } instructionservice.create(instdto);