波次任务下发功能优化

skyouc

1 天以前 f2833c7f3e01c997e94a66bd5dd9be738b5c6cc7

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java

@@ -5,13 +5,19 @@
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.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.controller.params.WaveToLocParams;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.WaveMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -46,6 +52,10 @@
    private LocService locService;
    @Autowired
    private OutStockService outStockService;
    @Autowired
    private WaveService waveService;
    @Autowired
    private WaveRuleServiceImpl waveRuleService;

    /**
     * @param
@@ -58,7 +68,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R publicTask(Map<String, Object> map, Long loginUserId) {
        List<WaveItem> itemParams = (List<WaveItem>) map.get("waveItem");
        List<WaveItem> itemParams = JSONArray.parseArray(JSON.toJSONString(map.get("waveItem")), WaveItem.class);
        if (Objects.isNull(itemParams) || itemParams.isEmpty()) {
            throw new CoolException("参数不能为空！！");
        }
@@ -75,7 +85,17 @@
        }
        /**生成出库任务*/
        try {
            generateOutTask(waveItems, loginUserId, waves);
            List<WaveToLocParams> params = new ArrayList<>();
            for (WaveItem item : waveItems) {
                WaveToLocParams locParams = new WaveToLocParams();
                BeanUtils.copyProperties(item, locParams);
                locParams.setBatch(item.getSplrBatch())
                        .setItemId(item.getId())
                        .setWaveId(item.getWaveId());
                params.add(locParams);
            }
            List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, null);
            generateOutTask(results, loginUserId, waves);
        } catch (Exception e) {
            log.error(e.getMessage());
            throw new CoolException("出库任务生成失败！！！");
@@ -93,6 +113,7 @@

    /**
     * 选择波次明细下发任务
     *
     * @param map
     * @param loginUserId
     * @return
@@ -120,15 +141,73 @@
        if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
                .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val)
                .in(WaveItem::getId, waveItems))) {
            throw new CoolException("下发执行异常，请稍候重试！");
            throw new CoolException("执行状态修改失败！！");
        }

        WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>()
                .eq(WaveRule::getType, WaveRuleType.First_In_First_Out.type));
        if (Cools.isEmpty(waveRule)) {
            throw new CoolException("未找到当前策略");
        }

        List<WaveToLocParams> params = new ArrayList<>();
        for (WaveItem item : items) {
            WaveToLocParams locParams = new WaveToLocParams();
            BeanUtils.copyProperties(item, locParams);
            locParams.setBatch(item.getSplrBatch())
                    .setItemId(item.getId())
                    .setWaveId(item.getWaveId());
            params.add(locParams);
        }
        List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule);
        if (results.isEmpty()) {
            waveService.update(new LambdaUpdateWrapper<Wave>()
                    .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
                    .set(Wave::getUpdateBy, loginUserId)
                    .set(Wave::getUpdateTime, new Date())
                    .eq(Wave::getId, waveId));
            return R.ok();
        }
        /**生成出库任务*/
        try {
            generateOutTask(items, loginUserId, waves);
            generateOutTask(results, loginUserId, waves);
        } catch (Exception e) {
            log.error("UNK", e);
            throw new CoolException(e.getMessage());
        }

        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
                .in(TaskItem::getSource, waveItems));
        if (Cools.isEmpty(taskItems)) {
            throw new CoolException("暂无合适库存信息！！");
        }
        for (TaskItem item : taskItems) {
            WaveItem waveItem = waveItemService.getById(item.getSource());

            Double workQty = Math.round((waveItem.getWorkQty() + item.getAnfme()) * 10000) / 10000.0;
            waveItem.setWorkQty(workQty);
            if (workQty.compareTo(waveItem.getAnfme()) < 0) {
                waveItem.setExceStatus(WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val);
            } else {
                waveItem.setExceStatus(WaveItemExceStatus.WAVE_EXCE_STATUS_PUBD.val);
            }

            if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
                    .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_PUBD.val)
                    .setSql("work_qty = work_qty + " + item.getAnfme())
                    .set(WaveItem::getUpdateBy, loginUserId)
                    .set(WaveItem::getUpdateTime, new Date())
                    .eq(WaveItem::getId, item.getSource()))) {
                throw new CoolException("下发执行异常，请稍候重试！");
            }
        }
        if (!waveService.update(new LambdaUpdateWrapper<Wave>()
                .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
                .set(Wave::getWorkQty, taskItems.stream().mapToDouble(TaskItem::getAnfme).sum())
                .set(Wave::getUpdateBy, loginUserId)
                .set(Wave::getUpdateTime, new Date())
                .eq(Wave::getId, waveId))) {
            throw new CoolException("波次状态修改失败！！");
        }
        return R.ok();
    }
@@ -144,119 +223,20 @@
     */
    @Synchronized
    @Transactional(rollbackFor = Exception.class)
    public void generateOutTask(List<WaveItem> itemParams, Long loginUserId, Wave wave) throws Exception {
        List<LocItem> locItemList = new ArrayList<>();
        for (WaveItem param : itemParams) {
            String locs = param.getStockLocs();
            List<LocItem> locItems = JSONArray.parseArray(locs, LocItem.class);
            List<Long> list = new ArrayList<>();
            if (Objects.isNull(locItems) || locItems.isEmpty()) {
                //TODO
            } else {
                list = locItems.stream().map(LocItem::getLocId).collect(Collectors.toList());
            }

            /**根据供应商批次，物料码， 动态字段查询指定的物料库存信息*/
            //TODO 这里需要要根据波次规则查找库存信息
            List<LocItem> items = locItemService.list(new LambdaQueryWrapper<LocItem>()
                    .eq(LocItem::getBatch, param.getSplrBatch())
                    .in(!list.isEmpty(),  LocItem::getLocId, list)
//                    .eq(StringUtils.isNotBlank(param.getFieldsIndex()), LocItem::getFieldsIndex, param.getFieldsIndex())
                    .eq(LocItem::getMatnrCode, param.getMatnrCode()));
            if (items.isEmpty()) {
                throw new CoolException("库存信息有变，请取消当前波次，生新生成新的波次！！");
            }
            /***将有货有的明细信息存放到库位信息中*/
            for (int i = 0; i < items.size(); i++) {
                items.get(i)
                        .setSourceId(param.getWaveId())
                        .setSourceCode(param.getWaveCode())
                        .setSource(param.getId());
            }
            locItemList.addAll(items);
        }
        if (locItemList.isEmpty()) {
            throw new CoolException("没有合适库位！！");
        }

        /**拆分波次明细库位集，合并相同库位，分解任务明细*/
        Map<Long, List<LocItem>> listMap = locItemList.stream().collect(Collectors.groupingBy(LocItem::getLocId));
        /**根据库位汇总信息，生成任务明细**/
        listMap.keySet().forEach(key -> {
            List<LocItem> locItems = listMap.get(key);
            LocItem item1 = locItems.stream().findFirst().get();
            WaveItem waveItem = waveItemService.getById(item1.getSource());
            if (Objects.isNull(waveItem)) {
                throw new CoolException("数据错误：波次明细不存在！！");
            }
            //TODO 当前任务完成后，通过定时事件判断是全盘出库，还是拣料再入库
            Loc loc = locService.getById(key);
            Task task = new Task();
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
            if (StringUtils.isBlank(ruleCode)) {
                throw new CoolException("编码规则错误：请检查「SYS_TASK_CODE」是否设置完成！！");
            }
    public void generateOutTask(List<OrderOutItemDto> itemParams, Long loginUserId, Wave wave) throws Exception {
        for (OrderOutItemDto itemDto : itemParams) {
            LocToTaskParams taskParams = new LocToTaskParams();
            Loc loc = locService.getById(itemDto.getLocId());
            if (Objects.isNull(loc)) {
                throw new CoolException("库位不存在！！");
                continue;
            }

//            List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, wave.getId()));
//            if (!items.isEmpty()) {
//                throw new CoolException("波次任务已生成，不能重复生成！！");
//            }

            task.setTaskCode(ruleCode)
                    .setTaskType(TaskType.TASK_TYPE_OUT.type)
                    .setTaskStatus(TaskStsType.GENERATE_OUT.id)
                    .setResource(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)
                    .setBarcode(loc.getBarcode())
                    .setOrgLoc(loc.getCode())
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId)
                    .setTargSite(wave.getTargSite());

            if (!taskService.save(task)) {
                throw new CoolException("任务生成失败！！");
            }
            List<TaskItem> taskItems = new ArrayList<>();
            /**生成任务明细信息*/
            for (LocItem item : locItems) {
                TaskItem taskItem = new TaskItem();
                BeanUtils.copyProperties(item, taskItem);
                taskItem.setTaskId(task.getId())
                        .setAnfme(item.getAnfme())
                        .setId(null)
                        .setSourceCode(wave.getCode())
                        .setSourceId(wave.getId())
                        .setSource(item.getSource());
                taskItems.add(taskItem);
            }
            if (!taskItemService.saveBatch(taskItems)) {
                throw new CoolException("任务明细保存失败！！");
            }

            /**修改波次执行数量*/
            taskItems.forEach(item -> {
                boolean update = waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
                        .eq(WaveItem::getId, item.getSource())
                                .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_SEED.val)
                        .set(WaveItem::getWorkQty, item.getAnfme()));
                if (!update) {
                    throw new CoolException("波次执行数量修改失败！！");
                }
            });

            List<WaveItem> waveItems = waveItemService.list(new LambdaQueryWrapper<WaveItem>().eq(WaveItem::getWaveId, wave.getId()));
            double sum = waveItems.stream().mapToDouble(WaveItem::getWorkQty).sum();
            /**波次主单信息修改*/
            if (!this.update(new LambdaUpdateWrapper<Wave>()
                    .eq(Wave::getId, wave.getId())
                    .set(Wave::getWorkQty, sum)
                    .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val))) {
                throw new CoolException("波次主单信息修改失败！！");
            }

        });
            taskParams.setItems(Arrays.asList(itemDto.getLocItem()))
                    .setSiteNo(itemDto.getSiteNo())
                    .setType(Constants.TASK_TYPE_WAVE_OUT_STOCK)
                    .setSourceId(wave.getId())
                    .setTarLoc(loc.getCode());
            locItemService.generateTask(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val, taskParams, loginUserId);
        }
    }

    /**
@@ -287,16 +267,16 @@
    }

    /**
    * @author Ryan
    * @description 取消波次
    * @param
    * @return
    * @time 2025/6/17 10:04
    */
     * @param
     * @return
     * @author Ryan
     * @description 取消波次
     * @time 2025/6/17 10:04
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R cancelWave(List<Long> ids) {
        

        return null;
    }

@@ -309,7 +289,7 @@
     * @time 2025/4/27 09:26
     */
    @Synchronized
    private  List<WaveItem> getLocs(List<WaveItem> waveItems) throws Exception {
    private List<WaveItem> getLocs(List<WaveItem> waveItems) throws Exception {
        //TODO  根据物料编码，批次，动态字段 查询符合的库位，再根据库位中物料的数量选择最适合的库位
        waveItems.forEach(waveItem -> {
            List<LocItem> locItems = locItemService.list(new QueryWrapper<LocItem>()