出库优先先进先出

skyouc

2025-07-03 9219e85f544780fa955945fc6c0c63e08d862ce3

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java

@@ -1,6 +1,7 @@
package com.zy.asrs.wms.asrs.timer;



import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;

import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;

import com.zy.asrs.framework.common.DateUtils;

@@ -17,8 +18,11 @@
import org.springframework.transaction.annotation.Transactional;

import org.springframework.transaction.interceptor.TransactionAspectSupport;



import java.util.Collections;

import java.util.Date;

import java.util.List;

import java.util.Map;

import java.util.stream.Collectors;



@Component

public class TaskLogTimer {

@@ -44,8 +48,15 @@
    @Autowired

    private WaveService waveService;



//    @Scheduled(cron = "0/3 * * * * ? ")

    @Transactional



    /**

     * @author Ryan

     * @date 2025/6/20

     * @description: 入库任务已完成

     * @version 1.0

     */

    @Scheduled(cron = "0/15 * * * * ? ")

    @Transactional(rollbackFor = Exception.class)

    public void inExecute() {

        InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());

        try {

@@ -57,7 +68,6 @@


            for (Task task : list) {

                Long hostId = task.getHostId();



                //保存任务历史档

                TaskLog taskLog = new TaskLog();

                taskLog.sync(task);

@@ -65,20 +75,55 @@
                if (!taskLogService.save(taskLog)) {

                    throw new CoolException("保存任务历史档失败");

                }

                //保存任务明细历史档

                List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());



                if (taskDetls.isEmpty()) {

                    throw new CoolException("任务明细不存在");

                } else {

                        //任务类型为53，根据WaveId修改订单明细

                        for (TaskDetl taskDetl : taskDetls) {

                            if (taskDetl.getDetlId() == null) {

                                continue;

                            }

                            OrderDetl orderDetl = orderDetlService.getById(taskDetl.getDetlId());

                            if (orderDetl == null) {

                                throw new CoolException("订单明细不存在");

                            }

                            orderDetl.setWorkQty(orderDetl.getWorkQty() - taskDetl.getAnfme());//工作中数量减少

                            orderDetl.setQty(orderDetl.getQty() + taskDetl.getAnfme());//已完成数量增加

                            orderDetl.setUpdateTime(new Date());

                            if (!orderDetlService.updateById(orderDetl)) {

                                throw new CoolException("更新订单明细失败");

                            }

                            //检测订单是否完成

                            boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());



                            if (checkOrderComplete) {

                                //订单已经完成

                                Order order = orderService.getById(orderDetl.getOrderId());

                                if (order == null) {

                                    throw new CoolException("订单不存在");

                                }

                                order.setOrderSettle(OrderSettleType.COMPLETE.val());

                                order.setUpdateTime(new Date());

                                if (!orderService.updateById(order)) {

                                    throw new CoolException("订单更新失败");

                                }



                            }

                        }

                }



                //删除任务历史档案

                if (!taskService.removeById(task.getId())) {

                    throw new CoolException("删除任务档失败");

                }



                //保存任务明细历史档

                List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());

                if (taskDetls.isEmpty()) {

                    throw new CoolException("任务明细不存在");

                }

                for (TaskDetl taskDetl : taskDetls) {

                    TaskDetlLog taskDetlLog = new TaskDetlLog();

                    taskDetlLog.sync(taskDetl);

                    taskDetlLog.setOrderId(taskDetl.getOrderId());

                    taskDetlLog.setId(null);

                    taskDetlLog.setTaskId(taskLog.getId());

                    if (!taskDetlLogService.save(taskDetlLog)) {

@@ -110,42 +155,6 @@
                        throw new CoolException("明细删除失败");

                    }

                }



                //更新订单信息

                for (TaskDetl taskDetl : taskDetls) {

                    if (taskDetl.getDetlId() == null) {

                        continue;

                    }



                    OrderDetl orderDetl = orderDetlService.getById(taskDetl.getDetlId());

                    if (orderDetl == null) {

                        throw new CoolException("订单明细不存在");

                    }



                    orderDetl.setWorkQty(orderDetl.getWorkQty() - taskDetl.getAnfme());//工作中数量减少

                    orderDetl.setQty(orderDetl.getQty() + taskDetl.getAnfme());//已完成数量增加

                    orderDetl.setUpdateTime(new Date());

                    if (!orderDetlService.updateById(orderDetl)) {

                        throw new CoolException("更新订单明细失败");

                    }



                    //检测订单是否完成

                    boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());

                    if (checkOrderComplete) {

                        //订单已经完成

                        Order order = orderService.getById(orderDetl.getOrderId());

                        if (order == null) {

                            throw new CoolException("订单不存在");

                        }



                        order.setOrderSettle(OrderSettleType.COMPLETE.val());

                        order.setUpdateTime(new Date());

                        if (!orderService.updateById(order)) {

                            throw new CoolException("订单更新失败");

                        }

                    }

                }





            }



@@ -157,62 +166,86 @@
        }

    }



//    @Scheduled(cron = "0/3 * * * * ? ")

    @Transactional



    /**

     * @author Ryan

     * @date 2025/6/20

     * @description: 出库任务完成

     * @version 1.0

     */

    @Scheduled(cron = "0/35 * * * * ? ")

    @Transactional(rollbackFor = Exception.class)

    public void outExecute() {

        InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());

        try {

            //获取出库完成任务

            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()

                    .eq(Task::getTaskSts, TaskStsType.UPDATED_OUT.id)

                    .in(Task::getTaskType, 101, 53, 57));

                    .ge(Task::getTaskType, 101));

            if (list.isEmpty()) {

                return;

            }



            Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "taskLogDiffDays").eq(Dict::getStatus, 1));

            if(dict == null) {

                return;

            }

            for (Task task : list) {

                int diff = DateUtils.diff(task.getCreateTime(), new Date());

                int taskLogDiffDays = Integer.parseInt(dict.getValue());

                if (diff < taskLogDiffDays) {

                    continue;

                }



                Long hostId = task.getHostId();



                //保存任务明细历史档

                List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());

                if (taskDetls.isEmpty()) {

                    throw new CoolException("任务明细不存在");

                }



                boolean flag = false;

                for (TaskDetl taskDetl : taskDetls) {

                    if (taskDetl.getWaveId() == null) {

                        continue;

                    }



                    Wave wave = waveService.getById(taskDetl.getWaveId());

                    if (wave != null) {

                        flag = true;//波次未完成

                        break;

                    }

                }



                if (flag) {

                    continue;

                }





                //保存任务历史档

                TaskLog taskLog = new TaskLog();

                taskLog.sync(task);

                taskLog.setId(null);

                if (!taskLogService.save(taskLog)) {

                    throw new CoolException("保存任务历史档失败");

                } else {

                    //更新订单信息

                    taskDetls.forEach(taskDetl -> {

                        if (taskDetl.getDetlId() != null) {

                            OrderDetl orderDetl = orderDetlService.getById(taskDetl.getDetlId());

                            if (orderDetl == null) {

                                throw new CoolException("订单明细不存在");

                            }



                            orderDetl.setWorkQty(orderDetl.getWorkQty() - taskDetl.getAnfme());//工作中数量减少

                            orderDetl.setQty(orderDetl.getQty() + taskDetl.getAnfme());//已完成数量增加

                            orderDetl.setUpdateTime(new Date());

                            if (!orderDetlService.updateById(orderDetl)) {

                                throw new CoolException("更新订单明细失败");

                            }



                            //检测订单是否完成

                            boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());

                            if (checkOrderComplete) {

                                //订单已经完成

                                Order order = orderService.getById(orderDetl.getOrderId());

                                if (order == null) {

                                    throw new CoolException("订单不存在");

                                }



                                order.setOrderSettle(OrderSettleType.COMPLETE.val());

                                order.setUpdateTime(new Date());

                                if (!orderService.updateById(order)) {

                                    throw new CoolException("订单更新失败");

                                }

                            }

                        }

                    });

                }



                //删除任务历史档案

@@ -254,42 +287,6 @@
                        throw new CoolException("明细删除失败");

                    }

                }



                //更新订单信息

                for (TaskDetl taskDetl : taskDetls) {

                    if (taskDetl.getDetlId() == null) {

                        continue;

                    }



                    OrderDetl orderDetl = orderDetlService.getById(taskDetl.getDetlId());

                    if (orderDetl == null) {

                        throw new CoolException("订单明细不存在");

                    }



                    orderDetl.setWorkQty(orderDetl.getWorkQty() - taskDetl.getAnfme());//工作中数量减少

                    orderDetl.setQty(orderDetl.getQty() + taskDetl.getAnfme());//已完成数量增加

                    orderDetl.setUpdateTime(new Date());

                    if (!orderDetlService.updateById(orderDetl)) {

                        throw new CoolException("更新订单明细失败");

                    }



                    //检测订单是否完成

                    boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());

                    if (checkOrderComplete) {

                        //订单已经完成

                        Order order = orderService.getById(orderDetl.getOrderId());

                        if (order == null) {

                            throw new CoolException("订单不存在");

                        }



                        order.setOrderSettle(OrderSettleType.COMPLETE.val());

                        order.setUpdateTime(new Date());

                        if (!orderService.updateById(order)) {

                            throw new CoolException("订单更新失败");

                        }

                    }

                }





            }

        } catch (Exception e) {