From b6626bdbbbdfb8841319a354a818b0ce19b17684 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 3 Apr 2023 19:47:50 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/sch/rest/TaskController.java   | 20 ++++++-------------
 .../java/org/nl/wms/sch/wql/QSCH_TASK_01.wql  |  2 +-
 mes/qd/src/views/wms/sch/task/index.vue       | 11 +++++-----
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java
index d096f4e3..141cea9a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java
@@ -4,11 +4,14 @@ package org.nl.wms.sch.rest;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.system.service.dict.ISysDictService;
+import org.nl.system.service.dict.dao.Dict;
 import org.nl.wms.sch.manage.FinishTypeEnum;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.service.TaskService;
@@ -34,6 +37,7 @@ import java.util.Map;
 public class TaskController {
 
     private final TaskService taskService;
+    private final ISysDictService dictService;
 
     @GetMapping
     @Log("查询任务")
@@ -74,20 +78,8 @@ public class TaskController {
     @Log("获取任务状态列表")
     @ApiOperation("获取任务状态列表")
     public ResponseEntity<Object> getTaskStatus() {
-        TaskStatusEnum[] values = TaskStatusEnum.values();
-        JSONArray arr = new JSONArray();
-        for (TaskStatusEnum value : values) {
-            JSONObject json = new JSONObject();
-            json.put("code", value.getCode());
-            json.put("name", value.getName());
-            arr.add(json);
-        }
-        //增加未完成状态
-        JSONObject unFinish = new JSONObject();
-        unFinish.put("code", "-1");
-        unFinish.put("name", "未完成");
-        arr.add(unFinish);
-        return new ResponseEntity<>(arr, HttpStatus.OK);
+        return new ResponseEntity<>(dictService.list(new LambdaQueryWrapper<Dict>()
+                .eq(Dict::getCode, "task_status")), HttpStatus.OK);
     }
 
     @GetMapping("/taskType")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
index 058835ed..2709a736 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
@@ -53,7 +53,7 @@
                 SELECT
                     task.*,
                     md.class_name task_type_name,
-                    dict.label task_status_name,
+                    DICT.label task_status_name,
                     reg1.region_name as point1_region_name,
                     reg2.region_name as point2_region_name,
                     reg3.region_name as point3_region_name,
diff --git a/mes/qd/src/views/wms/sch/task/index.vue b/mes/qd/src/views/wms/sch/task/index.vue
index 892e10ff..92393d79 100644
--- a/mes/qd/src/views/wms/sch/task/index.vue
+++ b/mes/qd/src/views/wms/sch/task/index.vue
@@ -109,8 +109,8 @@
               <el-option
                 v-for="item in taskStatusList"
                 :key="item.code"
-                :label="item.name"
-                :value="item.code"
+                :label="item.label"
+                :value="item.value"
               />
             </el-select>
           </el-form-item>
@@ -143,7 +143,7 @@
         <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="product_area" label="生产区域" />
-        <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
+        <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
         <el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
@@ -294,6 +294,7 @@ export default {
         parent_class_code: 'task_type'
       }
       crudClassstandard.getClassType(param).then(res => {
+        console.log(res)
         const data = res.content
         this.buildTree(data)
         this.classes1 = data
@@ -337,8 +338,8 @@ export default {
     },
     formatTaskStatusName(row, column) {
       for (const item of this.taskStatusList) {
-        if (item.code === row.task_status) {
-          return item.name
+        if (item.value === row.task_status) {
+          return item.label
         }
       }
       return ''