diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java index 9d7c4f991..928fb6f26 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java @@ -256,7 +256,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple if (action != last_action) { this.setFeedbackSucess(false); logServer.deviceItemValue(this.device_code, "action", String.valueOf(action)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action); + logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action +"feedbackSucess:"+feedbackSucess); } if (error != last_error) { if (error != 0) { @@ -296,7 +296,9 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple if (task > 0 && !feedbackSucess) { update_instruction_status(); - } + }/*else { + logServer.deviceExecuteLog(this.device_code,"","","更新指令状态,条件不满足的原因,task:"+task+"feedbackSucess:"+feedbackSucess); + }*/ } catch (Exception var17) { @@ -435,6 +437,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple applyManipulatorActionRequest.setType("2"); applyManipulatorActionRequest.setTask_code1(task_code); applyManipulatorActionRequest.setSize(String.valueOf(inflatable_shaft_size)); + logServer.deviceExecuteLog(this.device_code,"","","开始反馈尺寸"); applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest); if (applyManipulatorActionResponse.getstatus() == 200) { feedbackSucess = true; @@ -455,6 +458,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple String task_code = inst1.getTask_code(); applyManipulatorActionRequest.setType("3"); applyManipulatorActionRequest.setTask_code1(task_code); + logServer.deviceExecuteLog(this.device_code,"","","开始申请放货点"); applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest); if (applyManipulatorActionResponse.getstatus() == 200) { logServer.deviceExecuteLog(this.device_code, "", "", "申请放货点请求成功,响应参数:" + JSON.toJSONString(applyManipulatorActionResponse)); @@ -481,6 +485,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple String task_code = inst1.getTask_code(); applyManipulatorActionRequest.setType("4"); applyManipulatorActionRequest.setTask_code1(task_code); + logServer.deviceExecuteLog(this.device_code,"","","开始申请取货点"); applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest); if (applyManipulatorActionResponse.getstatus() == 200) { String get_device_code = applyManipulatorActionResponse.getDevice_code(); @@ -507,6 +512,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple String task_code = inst1.getTask_code(); applyManipulatorActionRequest.setType("5"); applyManipulatorActionRequest.setTask_code1(task_code); + logServer.deviceExecuteLog(this.device_code,"","","申请二次放货点"); applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest); if (applyManipulatorActionResponse.getstatus() == 200) { String put_device_code2 = applyManipulatorActionResponse.getDevice_code(); @@ -533,6 +539,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple String task_code = inst1.getTask_code(); applyManipulatorActionRequest.setAction("1"); applyManipulatorActionRequest.setTask_code1(task_code); + logServer.deviceExecuteLog(this.device_code,"","","开始反馈缓存库取货完成"); ApplyManipulatorActionResponse applyManipulatorActionResponse1 = acsToWmsService.actionFinishRequest(applyManipulatorActionRequest); if (applyManipulatorActionResponse1.getstatus() == 200) { logServer.deviceExecuteLog(this.device_code, "", "", "缓存库取货请求成功,响应参数:" + JSON.toJSONString(applyManipulatorActionResponse1)); @@ -553,6 +560,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple String task_code = inst1.getTask_code(); applyManipulatorActionRequest.setAction("2"); applyManipulatorActionRequest.setTask_code1(task_code); + logServer.deviceExecuteLog(this.device_code,"","","开始反馈缓存库放货完成"); ApplyManipulatorActionResponse applyManipulatorActionResponse1 = acsToWmsService.actionFinishRequest(applyManipulatorActionRequest); if (applyManipulatorActionResponse1.getstatus() == 200) { logServer.deviceExecuteLog(this.device_code, "", "", "缓存库放货完成,响应参数:" + JSON.toJSONString(applyManipulatorActionResponse1)); @@ -575,6 +583,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple if (inst1 != null) { try { feedbackSucess = true; + logServer.deviceExecuteLog(this.device_code,"","","放货完成"); finish_instruction(inst1); Map map = new LinkedHashMap<>(); map.put("to_command", 8); @@ -810,13 +819,13 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple Map map = new LinkedHashMap<>(); map.put("to_command", 1); - map.put("inflatableShaftVersion", Integer.parseInt(version)); + map.put("inflatableShaftVersion", version); map.put("tube_num", bushing_num); map.put("is_wrapped", is_bushing); - map.put("to_task_type", Integer.parseInt(taskDto.getTruss_type())); - map.put("to_onset", Integer.parseInt(start_addr)); - map.put("to_task", Integer.parseInt(instruction.getInstruction_code())); - map.put("to_target", Integer.parseInt(next_addr)); + map.put("to_task_type", taskDto.getTruss_type()); + map.put("to_onset", start_addr); + map.put("to_task", instruction.getInstruction_code()); + map.put("to_target", next_addr); try { this.writing(map); } catch (Exception e) { @@ -866,6 +875,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple return false; } } + String taskid = task.getTask_id(); String taskcode = task.getTask_code(); String vehiclecode = task.getVehicle_code(); @@ -974,7 +984,6 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple } } else { logServer.deviceExecuteLog(device_code, "", "", "关联的站点不是rgv"); - } } else { logServer.deviceExecuteLog(device_code, "", "", "rgv没有关联站点"); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index e27f926d1..cfe8daab8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -697,7 +697,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme this.instruction_require_time = date; //判断是否存在起点相同 任务状态就绪的任务 TaskDto taskdto = taskserver.findByStartCodeAndReady(device_code); - if (!ObjectUtil.isEmpty(taskdto)) { + if (!ObjectUtil.isEmpty(taskdto) && "5".equals(taskdto.getTask_type())) { // if (!ObjectUtils.isEmpty(instructionService.findByBarcodeFromCache(container_code))) { // return false; // } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RoutePlanController.java b/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RoutePlanController.java index dd38e71a8..44fc0b67f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RoutePlanController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RoutePlanController.java @@ -2,8 +2,6 @@ package org.nl.acs.route.rest; - - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.route.service.RoutePlanService; @@ -34,7 +32,7 @@ public class RoutePlanController { @GetMapping @Log("查询路由方案") - + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(routePlanService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +40,7 @@ public class RoutePlanController { @PostMapping @Log("新增路由方案") - + //@PreAuthorize("@el.check('routePlan:add')") public ResponseEntity create(@Validated @RequestBody RoutePlanDto dto) { routePlanService.create(dto); @@ -51,7 +49,7 @@ public class RoutePlanController { @PutMapping @Log("修改路由方案") - + //@PreAuthorize("@el.check('routePlan:edit')") public ResponseEntity update(@Validated @RequestBody RoutePlanDto dto) { routePlanService.update(dto); @@ -59,7 +57,7 @@ public class RoutePlanController { } @Log("删除路由方案") - + //@PreAuthorize("@el.check('routePlan:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -68,7 +66,6 @@ public class RoutePlanController { } @Log("导出路由方案") - @GetMapping(value = "/download") //@PreAuthorize("@el.check('routePlan:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -77,7 +74,6 @@ public class RoutePlanController { @GetMapping("/selectList") @Log("下拉选路由方案") - //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectList() { return new ResponseEntity<>(routePlanService.selectList(), HttpStatus.OK);