From 57849668b70b247a99a3d6afdb573ee8d728baae Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 23 Jun 2025 09:43:57 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E5=87=BA=E5=BA=93=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=88=86=E9=85=8D(wql=E6=94=B9mp)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StIvtIostorinvOutServiceImpl.java    | 27 +++++++++----------
 .../outbill/rest/CheckOutBillController.java  | 13 +++++++++
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index 7a81fbc..eacc9a1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -1,5 +1,6 @@
 package org.nl.b_lms.storage_manage.ios.service.iostorInv.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -8,10 +9,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.SneakyThrows;
 import org.nl.b_lms.pdm_manage.enums.SUBEnum;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.sch.tasks.TwoExcepionalMoveTask;
 import org.nl.b_lms.sch.tasks.TwoOutExceptionalTask;
 import org.nl.b_lms.sch.tasks.TwoOutTask;
@@ -141,6 +145,8 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     private RedissonClient redissonClient;
     @Autowired
     private StIvtStructivtService structivtService;
+    @Autowired
+    private IschBaseTaskService ischBaseTaskService;
 
     @Override
     @Transactional
@@ -428,9 +434,6 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     @Transactional(rollbackFor = Exception.class)
     @SneakyThrows
     public void cancelDiv(JSONObject whereJson) {
-        // 任务表
-        WQLObject taskService = WQLObject.getWQLObject("sch_base_task");
-
         StIvtIostorinv mstDao = this.getById(whereJson.getLongValue("iostorinv_id"));
 
         /*
@@ -558,21 +561,17 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                 this.updateMstStatus(mstDao.getIostorinv_id());
 
                 /*删除出库任务*/
-                String task_id_in =  disList.stream()
+                List<String> taskIds =  disList.stream()
                         .map(row -> row.getString("task_id"))
                         .distinct()
-                        .collect(Collectors.joining("','"));
-
-
-                if (task_id_in.equals("null")) {
-                    task_id_in = "";
+                        .collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(taskIds)) {
+                    LambdaUpdateWrapper<SchBaseTask> lam = new LambdaUpdateWrapper<>();
+                    lam.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"))
+                            .in(SchBaseTask::getTask_id, taskIds);
+                    ischBaseTaskService.update(lam);
                 }
 
-                JSONObject taskParam = new JSONObject();
-                taskParam.put("is_delete", IOSEnum.IS_NOTANDYES.code("是"));
-
-                taskService.update(taskParam,"task_id IN ('"+task_id_in+"')");
-
                 /*
                  * 删除移库单、移库任务
                  */
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
index 906376b..75cbf7a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
@@ -90,4 +90,17 @@ public class CheckOutBillController {
     public ResponseEntity<Object> getOutBillTask(@RequestParam Map whereJson) {
         return new ResponseEntity<>(checkOutBillService.getOutBillTask(whereJson), HttpStatus.OK);
     }
+    @PostMapping("/allDivOne")
+    @Log("出库单自动分配")
+    public ResponseEntity<Object> allDivOne(@RequestBody JSONObject whereJson) {
+        iStIvtIostorinvOutService.allDiv(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+    @PostMapping("/allCancel")
+    @Log("出库单全部取消")
+    public ResponseEntity<Object> allCancel(@RequestBody JSONObject whereJson) {
+        iStIvtIostorinvOutService.cancelDiv(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
 }