From fbf52cd59180d55e672b7151de9d938bbf584ee3 Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Thu, 20 Oct 2022 10:04:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/sch/service/impl/RegionServiceImpl.java  |  2 +-
 .../nl/wms/sch/service/impl/TaskServiceImpl.java | 16 ++++++++++++++++
 lms/nladmin-ui/src/views/wms/sch/task/index.vue  |  6 ++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
index 9eb97f5..4faf50e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
@@ -70,7 +70,7 @@ public class RegionServiceImpl implements RegionService {
     @Override
     public RegionDto findByCode(String code) {
         WQLObject wo = WQLObject.getWQLObject("sch_base_region");
-        JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
+        JSONObject json = wo.query("region_code ='" + code + "'").uniqueResult(0);
         if (ObjectUtil.isNotEmpty(json)) {
             return json.toJavaObject(RegionDto.class);
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
index 77c15ee..5904665 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
@@ -16,7 +16,10 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.basedata.service.ClassstandardService;
 import org.nl.wms.basedata.service.dto.ClassstandardDto;
+import org.nl.wms.sch.service.PointService;
+import org.nl.wms.sch.service.RegionService;
 import org.nl.wms.sch.service.TaskService;
+import org.nl.wms.sch.service.dto.PointDto;
 import org.nl.wms.sch.service.dto.TaskDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -38,6 +41,8 @@ import java.util.Map;
 public class TaskServiceImpl implements TaskService {
 
     private final ClassstandardService classstandardService;
+    private final RegionService regionService;
+    private final PointService pointService;
 
     @Override
     public Map<String, Object> queryAll(Map form, Pageable page) {
@@ -86,6 +91,17 @@ public class TaskServiceImpl implements TaskService {
             map.put("end_time", whereJson.getString("end_time"));
         }
         JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc");
+        JSONArray content = json.getJSONArray("content");
+        JSONArray res = new JSONArray();
+        for ( int i = 0; i < content.size(); i++) {
+            JSONObject object = content.getJSONObject(i);
+            String point1_region_name = regionService.findByCode(pointService.findByCode(object.getString("point_code1")).getRegion_code()).getRegion_name();
+            String point2_region_name = regionService.findByCode(pointService.findByCode(object.getString("point_code2")).getRegion_code()).getRegion_name();
+            object.put("point1_region_name", point1_region_name);
+            object.put("point2_region_name", point2_region_name);
+            res.add(object);
+        }
+        json.put("content", res);
         return json;
     }
 
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 6b104f9..be02dd8 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -121,7 +121,9 @@
         <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
         <el-table-column prop="vehicle_code" label="载具编码" />
         <el-table-column prop="point_code1" label="点位1" width="85" />
+        <el-table-column prop="point1_region_name" label="区域1" width="85" />
         <el-table-column prop="point_code2" label="点位2" width="85" />
+        <el-table-column prop="point2_region_name" label="区域2" width="85" />
         <!--<el-table-column prop="point_code3" label="点位3" width="85" />
         <el-table-column prop="point_code4" label="点位4" width="85" />-->
         <el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
@@ -139,11 +141,11 @@
             <el-button
               type="text"
               icon="el-icon-upload"
-              @click="doOperate(scope.row, 'a')">下发</el-button>
+              @click="doOperate(scope.row, 'd')">下发</el-button>
             <el-button
               type="text"
               icon="el-icon-success"
-              @click="doOperate(scope.row, 'b')">完成</el-button>
+              @click="doOperate(scope.row, 'a')">完成</el-button>
           </template>
         </el-table-column>
       </el-table>