From 3f04ee9fde0898d05e77c3a9404e0eeb14fcccc9 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 22 May 2025 10:32:34 +0800
Subject: [PATCH] =?UTF-8?q?opt:5.21=E5=8F=B7=E5=9B=9E=E6=B8=A9=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=90=8C=E4=BB=93=E4=BD=8D=E9=87=8D=E5=A4=8D=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E9=97=AE=E9=A2=98=E5=88=86=E6=9E=90=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=9B=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/service/impl/SchBaseTaskServiceImpl.java  | 14 +++++++-------
 .../service/impl/WorkorderServiceImpl.java         |  8 +++++++-
 lms/nladmin-ui/src/views/wms/sch/task/index.vue    |  9 +++------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
index 93c47f6..9b10148 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
@@ -70,24 +70,24 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         String point_code = ObjectUtil.isNotEmpty(whereJson.get("point_code")) ? whereJson.get("point_code").toString() : null;
         String begin_time = ObjectUtil.isNotEmpty(whereJson.get("begin_time")) ? whereJson.get("begin_time").toString() : null;
         String end_time = ObjectUtil.isNotEmpty(whereJson.get("end_time")) ? whereJson.get("end_time").toString() : null;
-        String more_task_status = ObjectUtil.isNotEmpty(whereJson.get("more_task_status")) ? whereJson.get("more_task_status").toString() : null;
-        List<String> collect = ObjectUtil.isNotEmpty(more_task_status) ? Arrays.stream(more_task_status.split(",")).collect(Collectors.toList()) : null;
+        String more_task_status = ObjectUtil.isNotEmpty(whereJson.get("task_status")) ? whereJson.get("task_status").toString() : null;
         String unFinished = null;
-        if (collect != null) {
-            if (collect.contains(TaskStatus.UNFINISHED.getCode())) {
-                collect = null;
+        if(ObjectUtil.isNotEmpty(more_task_status)){
+            if (more_task_status.contains(TaskStatus.UNFINISHED.getCode())) {
                 unFinished = TaskStatus.EXECUTING.getCode();
+                more_task_status = "";
             }
         }
+
         LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
         lam.eq(ObjectUtil.isNotEmpty(task_code), SchBaseTask::getTask_code, task_code)
                 .eq(ObjectUtil.isNotEmpty(vehicle_code), SchBaseTask::getVehicle_code, vehicle_code)
                 .eq(ObjectUtil.isNotEmpty(point_code), SchBaseTask::getPoint_code1, point_code)
                 .ge(ObjectUtil.isNotEmpty(begin_time), SchBaseTask::getCreate_time, begin_time)
                 .le(ObjectUtil.isNotEmpty(end_time), SchBaseTask::getCreate_time, end_time)
-                .in(ObjectUtil.isNotEmpty(collect), SchBaseTask::getTask_status, collect)
+                .eq(ObjectUtil.isNotEmpty(more_task_status), SchBaseTask::getTask_status, more_task_status)
                 .le(ObjectUtil.isNotEmpty(unFinished), SchBaseTask::getTask_status, unFinished)
-                .orderByDesc(SchBaseTask::getUpdate_time);
+                .orderByDesc(SchBaseTask::getCreate_time);
         IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
         schBaseTaskMapper.selectPage(pages, lam);
         return pages;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
index 33a41cc..7e2cb99 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
@@ -319,11 +319,11 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
     }
 
     @Override
-    //@Transactional(rollbackFor = Exception.class)
     public void batchCreateTask(){
         String config_code = "YCLCKTask";
         //查询可生成任务的工单
         List<YCLKCDto> list =  workorderMapper.getYlOutDetail();
+        log.info("batchCreateTask查询list数量:"+list.size());
         if(list.size()>0){
             // 查询任务配置信息
             SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
@@ -334,7 +334,13 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
             // 获取申请的任务
             List<SchBaseTask> unFinishTasksByTaskConfig = taskService.findTasksByTaskStatus(config_code, TaskStatus.APPLY);
             JSONObject param=new JSONObject();
+            Map<String,YCLKCDto> maps =  new HashMap<String,YCLKCDto>();
             for(YCLKCDto workorder : list){
+                maps.put(workorder.getPointCode(),workorder);
+            }
+            Collection<YCLKCDto> newlist = maps.values();
+            log.info("batchCreateTask查询newlist数量:"+newlist.size());
+            for(YCLKCDto workorder : newlist){
                 //子载具
                 String vehicle_code2 = workorder.getSubTray();
                 //母载具
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 7176d44..588166c 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -53,8 +53,6 @@
           <el-form-item label="任务状态">
             <el-select
               v-model="query.task_status"
-              multiple
-              style="width: 360px"
               placeholder="任务状态"
               class="filter-item"
               clearable
@@ -148,6 +146,9 @@ export default {
       url: 'api/schBaseTask',
       idField: 'task_id',
       sort: 'task_code,desc',
+      query: {
+         task_status: '7'
+      },
       optShow: {
         add: false,
         edit: false,
@@ -178,10 +179,6 @@ export default {
       return this.dict.label.create_mode[row.create_mode]
     },
     handTaskStatus(value) {
-      this.crud.query.more_task_status = null
-      if (value) {
-        this.crud.query.more_task_status = value.toString()
-      }
       this.crud.toQuery()
     },
     getTaskStatusList() {