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

Update WmsToAcsServiceImpl.java

Browse Source
This commit is contained in:
张江玮
2023-08-04 09:01:29 +08:00
parent d2f3951477
commit d93e2bdc27
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -88,11 +88,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
// if (StrUtil.equals(cancelTaskCheck, "1")) { // if (StrUtil.equals(cancelTaskCheck, "1")) {
// taskService.cancelNoSendWms(taskDto.getTask_id()); // taskService.cancelNoSendWms(taskDto.getTask_id());
// } else if (StrUtil.equals(cancelTaskCheck, "0")) { // } else if (StrUtil.equals(cancelTaskCheck, "0")) {
Instruction inst = instructionService.findByTaskcode(task_code); Instruction inst = instructionService.findByTaskcode(task_code);
if (inst != null) { if (inst != null) {
instructionService.cancel(inst.getInstruction_id()); instructionService.cancel(inst.getInstruction_id());
} }
taskService.cancelNoSendWms(taskDto.getTask_id()); taskService.cancelNoSendWms(taskDto.getTask_id());
// } else { // } else {
// throw new RuntimeException("指令正在执行中,操作失败!"); // throw new RuntimeException("指令正在执行中,操作失败!");
// } // }
@@ -644,7 +644,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
(byte) 0X00, (byte) 0X01 (byte) 0X00, (byte) 0X01
}; };
OneNDCSocketConnectionAutoRun.write(bytes1); OneNDCSocketConnectionAutoRun.write(bytes1);
System.out.println("下发agv指令数据:" + NDCAgvServiceImpl.Bytes2HexString(bytes1));
break; break;
case "2": case "2":
// 恢复急停AGV车辆 // 恢复急停AGV车辆
@@ -661,7 +660,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
(byte) 0X00, (byte) 0X00 (byte) 0X00, (byte) 0X00
}; };
OneNDCSocketConnectionAutoRun.write(bytes2); OneNDCSocketConnectionAutoRun.write(bytes2);
System.out.println("下发agv指令数据:" + NDCAgvServiceImpl.Bytes2HexString(bytes2));
break; break;
case "3": case "3":
ParamDto sysParam3 = paramService.findByCode(AcsConfig.SEND_INST); ParamDto sysParam3 = paramService.findByCode(AcsConfig.SEND_INST);
@@ -681,6 +679,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
resultJSON.put("status", HttpStatus.OK.value()); resultJSON.put("status", HttpStatus.OK.value());
resultJSON.put("message", "操作成功"); resultJSON.put("message", "操作成功");
log.info("deviceOption-----输出参数{}", resultJSON);
return resultJSON; return resultJSON;
} finally { } finally {
MDC.remove(log_file_type); MDC.remove(log_file_type);