From b011b1368c2f8813ef2684a4a63914e6e59b5e15 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 05 六月 2025 17:06:51 +0800
Subject: [PATCH] DO单优化 出库单优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java |  239 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 164 insertions(+), 75 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 8fe1876..57813fb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -1,26 +1,30 @@
 package com.vincent.rsf.server.manager.schedules;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
+import com.vincent.rsf.server.api.utils.LocUtils;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
+import com.vincent.rsf.server.manager.enums.LocStsType;
+import com.vincent.rsf.server.manager.enums.TaskStsType;
 import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.TaskType;
 import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.enums.LocStsType;
-import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
+import com.vincent.rsf.server.system.constant.GlobalConfigCode;
+import com.vincent.rsf.server.system.entity.Config;
+import com.vincent.rsf.server.system.service.ConfigService;
+import com.vincent.rsf.server.system.utils.SystemAuthUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.Array;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -29,6 +33,8 @@
  */
 @Component
 public class TaskSchedules {
+
+    public static Logger logger = LoggerFactory.getLogger(TaskSchedules.class);
 
     @Autowired
     private TaskService taskService;
@@ -39,91 +45,174 @@
     @Autowired
     private TaskItemLogService taskItemLogService;
     @Autowired
-    private StockItemService stockItemService;
+    private ConfigService configService;
     @Autowired
-    private PurchaseService purchaseService;
+    private LocServiceImpl locService;
+
+    @Value("${wcs-slave.doubleLocs}")
+    private List<Integer> rows;
     @Autowired
-    private AsnOrderService asnOrderService;
-    @Autowired
-    private AsnOrderItemService asnOrderItemService;
-    @Autowired
-    private StockService stockService;
-    @Autowired
-    private LocService locService;
+    private LocItemService locItemService;
+
     /**
-    * @author Ryan
-    * @description 瀹屾垚鍏ュ簱锛屾洿鏂板簱瀛�
-    * @param
-    * @return
-    * @time 2025/4/2 12:37
-    */
-//    @Scheduled(cron = "0 0/05 * * * ?  ")
-    @Scheduled(cron = "0/15 * * * * ?")
-    @Transactional(rollbackFor = Exception.class)
+     * @param
+     * @return
+     * @author Ryan
+     * @description 瀹屾垚鍏ュ簱锛屾洿鏂板簱瀛�
+     * @time 2025/4/2 12:37
+     */
+    @Scheduled(cron = "0/3 * * * * ?")
     public void completeInStock() throws Exception {
-        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id));
+        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id).select(Task::getId));
         if (tasks.isEmpty()) {
             return;
         }
-        taskService.completeTask(tasks);
+        List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
+        List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
+        taskService.complateInTask(vaildTasks);
+    }
+
+    /**
+     * @author Ryan
+     * @date 2025/5/20
+     * @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板簱瀛�
+     * @version 1.0
+     */
+    @Scheduled(cron = "0/5 * * * * ?  ")
+    public void complateOutStock() throws Exception {
+        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+                .eq(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id)
+                .select(Task::getId));
+        if (tasks.isEmpty()) {
+            return;
+        }
+        List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
+        List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
+        taskService.completeTask(vaildTasks);
+    }
+
+    /**
+     * 浠诲姟鑷姩涓嬪彂
+     * @throws Exception
+     */
+    @Scheduled(cron = "0/5 * * * * ?  ")
+    @Transactional(rollbackFor = Exception.class)
+    public void taskToWCS() throws Exception {
+        Long loginUserId = SystemAuthUtils.getLoginUserId();
+        List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type);
+        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getTaskType, list).orderByDesc(Task::getSort));
+        for (Task task : tasks) {
+            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, task.getBarcode()));
+            if (Objects.isNull(loc)) {
+                continue;
+            }
+            //鍒ゆ柇鏄惁娣卞簱浣�
+            if (!LocUtils.isShallowLoc(loc.getCode())) {
+                //鑾峰彇娣卞簱浣嶅搴旂殑娴呭簱浣�
+                String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
+                if (StringUtils.isBlank(shallowLoc)) {
+                    continue;
+                }
+                Loc shalloc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
+                if (Objects.isNull(shalloc) || !shalloc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+                    //濡傛灉娴呭簱浣嶄笉鍦ㄥ簱璺冲嚭寰幆
+                    continue;
+                }
+                LocToTaskParams params = new LocToTaskParams();
+                params.setOrgLoc(shallowLoc).setType(TaskType.TASK_TYPE_LOC_MOVE.type + "");
+                //鐢熸垚绉诲簱浠诲姟
+                Task moveTask = locItemService.genMoveTask(params, loginUserId);
+                moveTask.setSort(task.getSort() + 1);
+                if (!taskService.updateById(moveTask)) {
+                    throw new Exception("浠诲姟浼樺厛绾ф洿鏂板け璐ワ紒锛�");
+                }
+            }
+            //TODO 璋冪敤涓嬪彂浠诲姟鎺ュ彛
+        }
+    }
+
+    /**
+     * 姣忎簲绉掓牎楠屾繁搴撲綅鏄惁涓虹┖锛屽鏋滄祬搴撲綅鏈夎揣锛屽皢娴呭簱浣嶇Щ鑷虫繁搴撲綅
+     */
+    @Scheduled(cron = "0/35 * * * * ?  ")
+    @Transactional(rollbackFor = Exception.class)
+    public void shallocToDeep() throws Exception {
+        List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>()
+                .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+                .in(Loc::getRow, rows));
+        if (locs.isEmpty()) {
+            return;
+        }
+        for (Loc loc : locs) {
+            String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
+            Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
+            if (Objects.isNull(one) || !one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+                continue;
+            }
+            taskService.moveToDeep(SystemAuthUtils.getLoginUserId(), shallowLoc);
+        }
     }
 
 
     /**
-    * @author Ryan
-    * @description 宸插畬鎴愪换鍔″姞鍏ュ巻鍙叉。
-    * @param
-    * @return
-    * @time 2025/4/3 12:54
-    */
-    @Scheduled(cron = "0 0/05 * * * ?  ")
+     * @param
+     * @return
+     * @author Ryan
+     * @description 宸插畬鎴愪换鍔″姞鍏ュ巻鍙叉。
+     * @time 2025/4/3 12:54
+     */
+    @Scheduled(cron = "0 0/01 * * * ?  ")
     @Transactional(rollbackFor = Exception.class)
     public void taskLogUpdate() {
-        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id));
+        LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<Task>();
+        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ORDER_INOF_REPORT_PLAT));
+        if (!Objects.isNull(config)) {
+            if (Boolean.parseBoolean(config.getVal())) {
+                queryWrapper.in(Task::getTaskStatus, TaskStsType.REPORT_IN.id);
+            } else {
+                queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
+            }
+        } else {
+            queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
+        }
+        List<Task> tasks = taskService.list(queryWrapper);
         if (tasks.isEmpty()) {
             return;
         }
-        List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
-        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, list));
-        if (taskItems.isEmpty()) {
-            return;
-        }
 
-        List<TaskLog> taskLogs = new ArrayList<>();
         tasks.forEach(task -> {
             TaskLog taskLog = new TaskLog();
             BeanUtils.copyProperties(task, taskLog);
-            taskLog.setTaskId(task.getId()).setId(null);
-            taskLogs.add(taskLog);
+            taskLog.setTaskId(task.getId())
+                    .setId(null);
+            if (!taskLogService.save(taskLog)) {
+                throw new CoolException("浠诲姟鍘嗗彶妗d繚瀛樺け璐ワ紒锛�");
+            }
+            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+            List<TaskItemLog> itemLogs = new ArrayList<>();
+            for (TaskItem item : taskItems) {
+                TaskItemLog itemLog = new TaskItemLog();
+                BeanUtils.copyProperties(item, itemLog);
+                itemLog.setId(null)
+                        .setTaskId(task.getId())
+                        .setLogId(taskLog.getId())
+                        .setTaskItemId(item.getId());
+                itemLogs.add(itemLog);
+            }
+
+            if (!taskService.removeById(task.getId())) {
+                throw new CoolException("鍘熷浠诲姟鍒犻櫎澶辫触锛侊紒");
+            }
+
+            if (!taskItems.isEmpty()) {
+                if (!taskItemLogService.saveBatch(itemLogs)) {
+                    throw new CoolException("浠诲姟鏄庣粏鍘嗗彶妗d繚瀛樺け璐ワ紒锛�");
+                }
+
+                if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()))) {
+                    throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+                }
+            }
         });
-        if (!taskLogService.saveBatch(taskLogs)) {
-            throw new CoolException("浠诲姟鍘嗗彶妗d繚瀛樺け璐ワ紒锛�");
-        }
-        List<TaskItemLog >itemLogs = new ArrayList<>();
-
-        taskItems.forEach(item -> {
-            TaskItemLog itemLog = new TaskItemLog();
-            BeanUtils.copyProperties(item, itemLog);
-            itemLog.setId(null).setTaskItemId(item.getId());
-            itemLogs.add(itemLog);
-        });
-
-        if (!taskItemLogService.saveBatch(itemLogs)) {
-            throw new CoolException("浠诲姟鏄庣粏鍘嗗彶妗d繚瀛樺け璐ワ紒锛�");
-        }
-
-        if (!taskService.removeByIds(list)) {
-            throw new CoolException("鍘熷浠诲姟鍒犻櫎澶辫触锛侊紒");
-        }
-        List<Long> itemIds = taskItems.stream().map(TaskItem::getId).collect(Collectors.toList());
-
-        if (!taskItemService.removeByIds(itemIds)) {
-            throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
-        }
-
     }
-
-
-
-
 }

--
Gitblit v1.9.1