新增出库单优化

skyouc

2025-04-29 669fe984048785873c20fbd0ce8abb3cd52c1fce

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

@@ -6,13 +6,14 @@
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.api.entity.enums.OrderType;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.GroupMergeUtil;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
@@ -62,7 +63,6 @@
    @Transactional(rollbackFor = Exception.class)
    private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
        AsnOrder orders = params.getOrders();

        params.getItems().forEach(item -> {
            item.put("asnId", orders.getId());
            item.put("asnCode", orders.getCode());
@@ -290,12 +290,102 @@
            throw new CoolException("主单修改失败！！");
        }

        for (int i = 0; i < orderItems.size(); i++) {
            orderItems.get(i).setWorkQty(orderItems.get(i).getAnfme());
        }

        if (!asnOrderItemService.saveOrUpdateBatch(orderItems)) {
            throw new CoolException("出库单执行数量修改失败！！");
        }

        double sum2 = orderItems.stream().mapToDouble(AsnOrderItem::getWorkQty).sum();
        if (!this.update(new LambdaUpdateWrapper<AsnOrder>()
                .set(AsnOrder::getWaveId, wave.getId())
                        .set(AsnOrder::getWorkQty, sum2)
                .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
                .in(AsnOrder::getId, ids))) {
            throw new CoolException("执行状态修改修改失败！！");
        }
        return R.ok("操作完成！！");
    }

    /**
     * @author Ryan
     * @description 保存出库主单及明细
     * @param
     * @return
     * @time 2025/4/29 13:47
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R saveOutStock(AsnOrderAndItemsParams params, Long loginUserId) {
        if (Objects.isNull(params.getOrders())) {
            throw new CoolException("主单信息不能为空");
        }
        AsnOrder orders = params.getOrders();
        if (Objects.isNull(orders)) {
            throw new CoolException("单据不能为空！！");
        }
        if (StringUtils.isBlank(orders.getWkType())) {
            throw new CoolException("业务类型不能为空！！");
        }

        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, orders);
        if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
            throw new CoolException("编码规则错误：请检查「SYS_OUT_STOCK_CODE」是否设置正确！！");
        }

        orders.setCode(ruleCode)
                .setType(OrderType.ORDER_OUT.type)
                .setUpdateBy(loginUserId)
                .setCreateBy(loginUserId);
        if (!this.save(orders)) {
            throw new CoolException("主单保存失败！！");
        }
        if (params.getItems().isEmpty()) {
            throw new CoolException("收货通知单明细不能为空！！");
        }
        params.setOrders(orders);
        try {
            svaeOrUpdateOrderItem(params,loginUserId);
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }

        return R.ok();
    }


    /**
     * @author Ryan
     * @description 修改主单及明细
     * @param
     * @return
     * @time 2025/4/29 13:47
     */
    @Override
    public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
        AsnOrder orders = params.getOrders();
        if (Objects.isNull(orders)) {
            throw new CoolException("主单信息不能为空！！");
        }
        if (Objects.isNull(orders.getId())) {
            throw new CoolException("数据错误：单据ID不能为空！！");
        }
        if (!this.updateById(orders)) {
            throw new CoolException("主单修改失败！！");
        }
        if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
            return R.ok("明细参数不能为空！！");
        }

        try {
            svaeOrUpdateOrderItem(params,loginUserId);
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }

        return null;
    }

    /**
@@ -321,7 +411,7 @@
                    .setWaveCode(wave.getCode());
            items.add(item);
        });
        List<WaveItem> waveItems = GroupMergeUtil.groupAndMerge(items,
        List<WaveItem> waveItems = OptimalAlgorithmUtil.groupAndMerge(items,
                (p1, p2) -> new WaveItem(
                        p1.getWaveId(),
                        p1.getWaveCode(),