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

opt：套件优化

Browse Source
This commit is contained in:
tuqiang
2026-02-27 12:53:18 +08:00
parent 19dc730e6c
commit 0a2dfed98c
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -249,6 +249,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
} else { } else {
//mes下发需要上报放货完成 //mes下发需要上报放货完成
if ("2".equals(task.getCreate_by())) { if ("2".equals(task.getCreate_by())) {
log.info("放货完成申请,指令号:"+instruction.getInstruction_code());
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("taskCode", task.getTask_code()); jo.put("taskCode", task.getTask_code());
jo.put("carId", instruction.getCarno()); jo.put("carId", instruction.getCarno());
@@ -263,6 +264,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
return; return;
} //wms下发需要上报放货完成 } //wms下发需要上报放货完成
} else if ("1".equals(task.getCreate_by())) { } else if ("1".equals(task.getCreate_by())) {
log.info("放货完成申请,指令号:"+instruction.getInstruction_code());
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("taskCode", task.getTask_code()); jo.put("taskCode", task.getTask_code());
jo.put("carId", instruction.getCarno()); jo.put("carId", instruction.getCarno());
@@ -277,6 +279,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
return; return;
} }
} }
log.info("放货完成申请成功,指令号:"+instruction.getInstruction_code());
HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10); HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
@@ -289,6 +292,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
log.info("设备执行失败"+e.getMessage());
} }
} }

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

@@ -62,14 +62,7 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
} }
instructionService.reload(); instructionService.reload();
} }
//taskPhase 任务完成
if (TaskStateEnum.COMPLETED.getValue().equals(taskState)){
instructionService.finish(instruction.getInstruction_id());
resp.put("code", "200");
resp.put("message", "完成任务成功");
log.info("---响应kit请求---"+resp.toString());
return resp;
}
//taskPhase 任务取消 //taskPhase 任务取消
if (TaskStateEnum.CANCELED.getValue().equals(taskState)){ if (TaskStateEnum.CANCELED.getValue().equals(taskState)){
instructionService.cancel(instruction.getInstruction_id()); instructionService.cancel(instruction.getInstruction_id());
@@ -122,6 +115,13 @@ public class NDCToAcsServiceImpl implements NDCToAcsService {
instruction.setExecute_status(taskPhase); instruction.setExecute_status(taskPhase);
instructionService.update(instruction); instructionService.update(instruction);
} }
//taskPhase 任务完成
if (TaskStateEnum.COMPLETED.getValue().equals(taskState)){
instructionService.finish(instruction.getInstruction_id());
resp.put("code", "200");
resp.put("message", "完成任务成功");
log.info("---响应kit请求---"+resp.toString());
}
break; break;
default: default:
resp.put("code", "400"); resp.put("code", "400");