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

rev agv接口

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-07-31 09:59:36 +08:00
parent ea6eca99ed
commit ceda5f0033
2 changed files with 1 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -731,91 +731,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
log.info("请求ZDwcs成功，申请取货 请求结果{}",responseCode);
}
}
// TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
// JSONObject feed_jo = new JSONObject();
// feed_jo.put("task_id", entity.getExt_task_id());
// feed_jo.put("task_code", dto.getTask_code());
// feed_jo.put("task_status", dto.getTask_status());
// JSONArray ja = new JSONArray();
// ja.add(feed_jo);
// String message = null;
// HttpResponse body = null;
// boolean flag = false;
// try {
// body = acstowmsService.feedbackTaskStatusToWms(ja);
// } catch (Exception e) {
// flag = true;
// message = e.getMessage();
// e.printStackTrace();
// } finally {
//
// }
// if (flag) {
// if (ObjectUtil.isEmpty(feefbackdto)) {
// feefbackdto = new TaskFeedbackDto();
// feefbackdto.setTask_id(entity.getTask_id());
// feefbackdto.setTask_code(entity.getTask_code());
// feefbackdto.setTask_status(entity.getTask_status());
// feefbackdto.setVehicle_type(entity.getVehicle_type());
// feefbackdto.setVehicle_code(entity.getVehicle_code());
// feefbackdto.setStart_device_code(entity.getStart_device_code());
// feefbackdto.setStart_point_code(entity.getStart_point_code());
// feefbackdto.setNext_device_code(entity.getNext_device_code());
// feefbackdto.setNext_point_code(entity.getNext_point_code());
// feefbackdto.setError_code("400");
// feefbackdto.setIs_finished("0");
// feefbackdto.setRemark(message);
// taskFeedbackService.create(feefbackdto);
// } else {
// feefbackdto.setTask_status(entity.getTask_status());
// feefbackdto.setStart_device_code(entity.getStart_device_code());
// feefbackdto.setStart_point_code(entity.getStart_point_code());
// feefbackdto.setNext_device_code(entity.getNext_device_code());
// feefbackdto.setNext_point_code(entity.getNext_point_code());
// feefbackdto.setError_code("400");
// feefbackdto.setRemark(message);
// taskFeedbackService.update(feefbackdto);
// }
// } else {
// int status = body.getStatus();
// JSONObject jo = JSONObject.parseObject(body.body());
// if (ObjectUtil.isEmpty(feefbackdto)) {
// feefbackdto = new TaskFeedbackDto();
// feefbackdto.setTask_id(entity.getTask_id());
// feefbackdto.setTask_code(entity.getTask_code());
// feefbackdto.setTask_status(entity.getTask_status());
// feefbackdto.setVehicle_type(entity.getVehicle_type());
// feefbackdto.setVehicle_code(entity.getVehicle_code());
// feefbackdto.setError_code(String.valueOf(body.getStatus()));
// feefbackdto.setStart_device_code(entity.getStart_device_code());
// feefbackdto.setStart_point_code(entity.getNext_point_code());
// feefbackdto.setNext_device_code(entity.getNext_device_code());
// feefbackdto.setNext_point_code(entity.getNext_point_code());
// if (status == 200) {
// if (StrUtil.equals(entity.getTask_status(), "2")) {
// feefbackdto.setIs_finished("1");
// } else {
// feefbackdto.setIs_finished("0");
// }
// } else {
// feefbackdto.setIs_finished("0");
// feefbackdto.setRemark(jo.getString("message"));
// }
// taskFeedbackService.create(feefbackdto);
// } else {
// feefbackdto.setTask_status(entity.getTask_status());
// if (status == 200) {
// } else {
// if (StrUtil.equals(entity.getTask_status(), "2")) {
// feefbackdto.setIs_finished("1");
// } else {
// feefbackdto.setIs_finished("0");
// }
// }
// taskFeedbackService.update(feefbackdto);
// }
// }
// }
}

2
acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java
View File

@@ -55,7 +55,7 @@ public class QueryZDAgvTaskStatus {
// UNROUTABLE：无法规划该业务订单的执行路线
//执行中
if ("BEING_PROCESSED".equals(state)) {
if ("BEING_PROCESSED".equals(state) || "ACTIVE".equals(state)) {
if (inst != null) {
inst.setInstruction_status("1");
instructionService.update(inst);