From a3a0f637a21471c5cb19bf6d4325dc806ce99199 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 4 Apr 2023 17:01:37 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java  | 3 ++-
 .../nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java   | 3 ++-
 .../org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java     | 4 ++--
 .../wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java   | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java
index c0c01fbb..981b90b7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java
@@ -139,7 +139,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask {
         try {
             pointConfirm(task);
             JSONArray data = new JSONArray();
-            data.add(task);
+            JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0);
+            data.add(result);
             // 下发
             wms.issueTaskToAcs(data);
         } catch (Exception ex) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java
index 669418ca..a4304681 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java
@@ -135,7 +135,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask {
         try {
             pointConfirm(task);
             JSONArray data = new JSONArray();
-            data.add(task);
+            JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0);
+            data.add(result);
             // 下发
             wms.issueTaskToAcs(data);
         } catch (Exception ex) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java
index 31d96a38..315f1f6d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java
@@ -62,7 +62,6 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
                 pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY_VEHICLE.getCode());
                 pointObj.put("update_time", DateUtil.now());
                 pointTab.update(pointObj);
-                // todo: 是否需要载具类型
             }
             // 2任务完成
             taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode());
@@ -136,7 +135,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
         try {
             pointConfirm(task);
             JSONArray data = new JSONArray();
-            data.add(task);
+            JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0);
+            data.add(result);
             // 下发
             wms.issueTaskToAcs(data);
         } catch (Exception ex) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java
index a302d1c8..2ad02ff9 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java
@@ -139,7 +139,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask {
         try {
             pointConfirm(task);
             JSONArray data = new JSONArray();
-            data.add(task);
+            JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0);
+            data.add(result);
             // 下发
             wms.issueTaskToAcs(data);
         } catch (Exception ex) {