From 52b234ff9c0a79e1af1446b3a2a251780db814c0 Mon Sep 17 00:00:00 2001
From: pangshenghao <pangshenghao@erayt.com>
Date: Tue, 6 Jun 2023 10:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java  | 4 ++--
 acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue     | 2 ++
 acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index a8fc521eb..7aafdf6db 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -667,7 +667,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                     JSONObject json = new JSONObject();
                     json.put("task_code", task_code);
                     json.put("ext_task_id", ext_task_id);
-                    json.put("message", "不能存在相同的任务号:" + task_code);
+                    json.put("message", "已存在任务id为"+taskDto.getTask_id()+"相同的任务号:" + task_code);
                     errArr.add(json);
                     continue;
                 }
@@ -677,7 +677,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                         JSONObject json = new JSONObject();
                         json.put("task_code", task_code);
                         json.put("ext_task_id", ext_task_id);
-                        json.put("message", "不能存在相同的托盘号:" + vehicle_code);
+                        json.put("message", "已存在任务id为"+vehicle_dto.getTask_id()+"托盘号:" + vehicle_code);
                         errArr.add(json);
                         continue;
                     }
diff --git a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
index 8fe3b0a31..702d4d290 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
@@ -268,6 +268,8 @@
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_by" label="创建者" />
         <el-table-column prop="create_time" label="创建时间" width="135" />
+        <el-table-column prop="update_by" label="修改者" />
+        <el-table-column prop="update_time" label="结束时间" width="135" />
       </el-table>
       <!--分页组件-->
       <pagination />
diff --git a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
index 8c2e5cb24..5ca9ad20f 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
@@ -129,6 +129,8 @@
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_by" label="创建者" />
         <el-table-column prop="create_time" label="创建时间" width="135" />
+        <el-table-column prop="update_by" label="修改者" />
+        <el-table-column prop="update_time" label="结束时间" width="135" />
       </el-table>
       <!--分页组件-->
       <pagination />