From 455a51d3cb76bb1ae0d4bb6340eba7105487a3b1 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 10 Aug 2023 09:26:37 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=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

---
 .../task_manage/task/tasks/dtk/CTQKTask.java  |  2 +-
 .../task_manage/task/tasks/dtk/DTSKTask.java  |  2 +-
 .../task_manage/task/tasks/hn/HNMLTask.java   |  1 +
 .../src/views/wms/sch/task/index.vue          | 28 ++++++++++++++-----
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
index 0ca0c78..8ed00ac 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
@@ -149,7 +149,7 @@ public class CTQKTask extends AbstractTask {
             PointUtils.setUpdateByType(startPointObj, taskFinishedType);
             PointUtils.clearPoint(startPointObj);
             endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
-            endPointObj.setVehicle_type("2");
+            endPointObj.setVehicle_type(GeneralDefinition.STEEL_TRAY);
             endPointObj.setVehicle_qty(taskObj.getVehicle_qty());
             endPointObj.setUpdate_time(DateUtil.now());
             PointUtils.setUpdateByType(endPointObj, taskFinishedType);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
index 64c9e98..2208ed1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
@@ -166,7 +166,7 @@ public class DTSKTask extends AbstractTask {
         if (ObjectUtil.isNotEmpty(endPoint)) {
             endPointObj.setIng_task_code("");
             PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.update(endPointObj);
+            pointService.updateById(endPointObj);
         }
         taskObj.setTask_status(TaskStatus.CANCELED.getCode());
         taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
index 8e606c6..cb40f89 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
@@ -235,6 +235,7 @@ public class HNMLTask extends AbstractTask {
         }
         // 更新组盘数据
         groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
+        groupEntity.setTask_code(taskObj.getTask_code()); // 当前任务的编码
         TaskUtils.setGroupUpdateByType(groupEntity, taskFinishedType);
         vehiclematerialgroupService.updateById(groupEntity);
         // 起点清空 - 由ACS请求修改
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index cea89c6..7967879 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -161,9 +161,17 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
-        <el-table-column prop="vehicle_code" label="载具编码1" :min-width="flexWidth('vehicle_code',crud.data,'载具编码1')" />
-        <el-table-column prop="vehicle_code2" label="载具编码2" :min-width="flexWidth('vehicle_code2',crud.data,'载具编码2')" />
-        <el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />
+        <el-table-column prop="vehicle_code" label="载具编码1" :min-width="flexWidth('vehicle_code',crud.data,'载具编码1')">
+          <template slot-scope="scope">
+            {{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="vehicle_code2" label="载具编码2" :min-width="flexWidth('vehicle_code2',crud.data,'载具编码2')">
+          <template slot-scope="scope">
+            {{ scope.row.vehicle_code2 ? scope.row.vehicle_code2 : '-' }}
+          </template>
+        </el-table-column>
+<!--        <el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />-->
         <el-table-column prop="task_status" label="任务状态" :min-width="flexWidth('task_status',crud.data,'任务状态')">
           <template slot-scope="scope">
             {{ getStatusName(scope.row.task_status) }}
@@ -181,13 +189,17 @@
           </template>
         </el-table-column>
         <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
-        <el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
+        <el-table-column v-if="false" prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
         <el-table-column v-if="false" prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
-        <el-table-column prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />
+        <el-table-column v-if="false" prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />
         <el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
         <el-table-column prop="task_group_id" label="任务组标识" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')" />
         <el-table-column prop="task_group_seq" label="任务组顺序号" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')" />
-        <el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')" />
+        <el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')">
+          <template slot-scope="scope">
+            {{ dict.label.finished_type[scope.row.finished_type]?dict.label.finished_type[scope.row.finished_type]:'未完成' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')" >
           <template slot-scope="scope">
             {{ dict.label.create_mode[scope.row.create_mode] }}
@@ -213,11 +225,13 @@
               type="text"
               icon="el-icon-success"
               @click="doOperate(scope.row, 'a')"
+              :disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
             >完成</el-button>
             <el-button
               type="text"
               icon="el-icon-error"
               @click="doOperate(scope.row, 'b')"
+              :disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
             >取消</el-button>
           </template>
         </el-table-column>
@@ -268,7 +282,7 @@ const defaultForm = {
 }
 export default {
   name: 'Task',
-  dicts: ['vehicle_type', 'create_mode'],
+  dicts: ['vehicle_type', 'create_mode', 'finished_type'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {