From 6901090298278b5cbf2ca775fedf71d7a4103f19 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 4 Jan 2023 13:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/callEmpty/GjxCallEmpVehicleTask.java   |  6 +++---
 .../tasks/sendMaterial/GjxSendMaterialTask.java  | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
index 4ba7dc3..e11d4ab 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
@@ -93,7 +93,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
             taskTab.delete("task_id = '" + task_id + "'");
         }
 
-        if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
+        if (StrUtil.equals(status, "1")) {
             // 更新任务状态为执行中
             jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
             jsonTask.put("update_time", DateUtil.now());
@@ -101,7 +101,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
             taskTab.update(jsonTask);
         }
 
-        if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
+        if (StrUtil.equals(status, "2")) {
             /*
              * 更改任务状态为完成
              * 1.终点为叠盘架更新叠盘架数量、起点点位状态、等待位状态，更新任务组状态
@@ -189,7 +189,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
             PointUpdateUtil.updatePoint(array);
 
             // 找叠盘架是否与对应的载具类型
-            JSONObject jsonDpjStart = pointTab.query("region_id = '" + RegionTypeEnum.DPJQB.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty <> '0'").uniqueResult(0);
+            JSONObject jsonDpjStart = pointTab.query("region_code = '" + RegionTypeEnum.DPJQB.getCode() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty <> '0'").uniqueResult(0);
 
             if (ObjectUtil.isNotEmpty(jsonDpjStart)) {
                 // 判断叠盘架是否有任务 有就下一个任务
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
index f9dc00a..65aed4d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
@@ -74,13 +74,13 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
         if (StrUtil.equals(status, "2")) {
 
             //判断状态,
-            if (StrUtil.equals("2", taskObj.getString("task_status"))) {
-                // 更改任务状态为完成
-                taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
-                taskObj.put("update_time", DateUtil.now());
-                taskTab.update(taskObj);
-                return;
-            }
+//            if (StrUtil.equals("2", taskObj.getString("task_status"))) {
+//                // 更改任务状态为完成
+//                taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
+//                taskObj.put("update_time", DateUtil.now());
+//                taskTab.update(taskObj);
+//                return;
+//            }
             // 更改任务状态为完成
             taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
             taskObj.put("update_time", DateUtil.now());
@@ -171,7 +171,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
                 JSONObject taskIng = taskIngs.getJSONObject(0);
                 if (ObjectUtil.isNotEmpty(taskIng) && ObjectUtil.isNotEmpty(json1)) {
                     JSONObject point2 = pointTab.query("point_code = '" + taskIng.getString("point_code2") + "'").uniqueResult(0);
-                    if (StrUtil.equals(point2.getString("block_num"), json1.getString("block_num"))
+                    if (StrUtil.equals(point2.getString("block_num"), json1.getString(  "block_num"))
                             && StrUtil.equals(point2.getString("row_num"), json1.getString("row_num"))) {
                         taskObj.put("remark", "相应列有AGV在工作,等待执行!");
                         taskObj.put("update_time", DateUtil.now());