From ceda5f0033211ed3cd1e7e1a773e99ff36305423 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Mon, 31 Jul 2023 09:59:36 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=20agv=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/service/impl/TaskServiceImpl.java    | 85 -------------------
 .../quartz/task/QueryZDAgvTaskStatus.java     |  2 +-
 2 files changed, 1 insertion(+), 86 deletions(-)

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 1b3069a..637f8fa 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
@@ -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);
-//                }
-//            }
-//        }
 
     }
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java
index 867fff7..9bd0bd8 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java
@@ -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);