出库任务历史档优化

pjb

2025-06-20 60fdc9564c65b90a8911ff10a25f3f3a63d3812c

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

@@ -21,6 +21,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;



import java.util.*;

import java.util.stream.Collectors;



@Component

public class TaskWaveTimer {

@@ -47,7 +48,7 @@
     * original : fetch datasource of task type on WCS_EXECUTE_OUT_TASK_DONE

     * now: Fetch datasource of task type  on WCS_EXECUTE_OUT_ARRIVED, After completing the task and for setting  the task type equal to GENERATE_WAVE_SEED

     */

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

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

    @Transactional(rollbackFor = Exception.class)

    public void taskWave() {

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

@@ -62,7 +63,7 @@
            }

            //查询状态为RCS任务完成所有任务单据

//            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));

            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id));

            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT.id));

            HashSet<String> sycMatnrs = new HashSet<>();

            if (taskList.isEmpty()) {

//                throw new CoolException("没有可播种任务！！");

@@ -74,12 +75,17 @@
                    if (taskDetls.isEmpty()) {

                        continue;

                    }

                    // 过滤已经生成波次播种数据的任务  该任务的任务明细号不能在播种数据表里面

                    long count = waveSeedService.count(new LambdaQueryWrapper<WaveSeed>().in(WaveSeed::getTaskDetlId, taskDetls.stream().map(TaskDetl::getId).collect(Collectors.toList())).eq(WaveSeed::getHostId, hostId));

                    if (count > 0) {

                        continue;

                    }



                    for (TaskDetl taskDetl : taskDetls) {

                        //分配订单

                        Long waveId = taskDetl.getWaveId();

                        //同一个物料只添加一次播种任务

                        if(sycMatnrs.contains(taskDetl.getMatnr())) {

                        if (sycMatnrs.contains(taskDetl.getMatnr())) {

                            continue;

                        }

                        sycMatnrs.add(taskDetl.getMatnr());

@@ -99,7 +105,7 @@
                                .in(OrderDetl::getOrderId, orderIds)

                                .eq(OrderDetl::getStockIndex, matUniqueKey)

                                .eq(OrderDetl::getHostId, hostId));

                        if(orderDetls.isEmpty()){

                        if (orderDetls.isEmpty()) {

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

                        }



@@ -107,17 +113,21 @@
                        for (OrderDetl orderDetl : orderDetls) {

                            //fixme 作业中数量调整放至，生成出库任务成功后

                            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty()).orElse(0.0D);

                            if (issued <= 0.0D) { continue; }

                            if (anfme <= 0.0D) { break; }

                            if (issued <= 0.0D) {

                                continue;

                            }

                            if (anfme <= 0.0D) {

                                break;

                            }



                            double workQty = issued;

                            if(anfme - issued < 0){

                            if (anfme - issued < 0) {

                                workQty = anfme;

                            }

                            anfme -= workQty;



                            orderUtils.updateWorkQty(orderDetl.getId(), workQty, true);



//

                            //fixme 生成波次播种数据时，不自动添加站点绑定，站点绑定调整至出库绑定播种库位时更新

//                            CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, orderDetl.getOrderId()).eq(CacheSite::getHostId, hostId));

//                            if (cacheSite == null) {

@@ -153,17 +163,17 @@
                        }

                    }



                    task.setTaskSts(TaskStsType.GENERATE_WAVE_SEED.id);

                    task.setUpdateTime(new Date());

                    if (!taskService.updateById(task)) {

                        throw new CoolException("任务更新失败");

                    }

//                    task.setTaskSts(TaskStsType.GENERATE_WAVE_SEED.id);

//                    task.setUpdateTime(new Date());

//                    if (!taskService.updateById(task)) {

//                        throw new CoolException("任务更新失败");

//                    }

                }

            }

        } catch (Exception e) {

            e.printStackTrace();

            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

        }finally {

        } finally {

            InterceptorIgnoreHelper.clearIgnoreStrategy();

        }

    }