标准版WMS
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
3 天以前 27f59f44345d044967e2048f09dbd704f90ce3db 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java


@@ -6,19 +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.dto.PoItemsDto;


import com.vincent.rsf.server.api.service.ReceiveMsgService;


import com.vincent.rsf.server.api.service.ReportMsgService;


import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;


import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;


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.mapper.PurchaseMapper;


import com.vincent.rsf.server.manager.service.*;


import com.vincent.rsf.server.manager.utils.GroupMergeUtil;


import com.vincent.rsf.server.system.constant.SerialRuleCode;


import com.vincent.rsf.server.system.mapper.SerialRuleMapper;


import com.vincent.rsf.server.system.utils.SerialRuleUtils;


import org.apache.commons.lang3.StringUtils;


import org.springframework.beans.BeanUtils;


@@ -26,7 +21,6 @@


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import java.util.*;


import java.util.stream.Collectors;




@@ -208,7 +202,7 @@


            if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {


                throw new CoolException("编码规则错误：请检查 「SYS_OUT_STOCK_CODE」编码是否设置成功");


            }


            order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)


            order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)


                    .setCode(ruleCode)


                    .setPoId(delivery.getId())


                    .setId(null)


@@ -222,6 +216,9 @@


                BeanUtils.copyProperties(item, orderItem);


                orderItem.setId(null)


                        .setPoCode(order.getPoCode())


                        .setMaktx(item.getMaktx())


                        .setMatnrCode(item.getMatnrCode())


                        .setFieldsIndex(item.getFieldsIndex())


                        .setAsnId(order.getId())


                        .setAsnCode(order.getCode())


                        .setPlatItemId(item.getPlatItemId())


@@ -255,9 +252,11 @@


        if (Objects.isNull(ids) || ids.isEmpty()) {


            throw new CoolException("参数不能为空！！");


        }


        List<AsnOrder> orders = this.listByIds(ids);


        List<AsnOrder> orders = this.list(new LambdaQueryWrapper<AsnOrder>()


                .in(AsnOrder::getId, ids)


                .eq(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val));


        if (orders.isEmpty()) {


            throw new CoolException("单据不存在！！");


            throw new CoolException("当前单据状态不能执行波次生成操作！！");


        }


        double sum = orders.stream().mapToDouble(AsnOrder::getAnfme).sum();


        Wave wave = new Wave();


@@ -274,25 +273,83 @@


            throw new CoolException("波次保存失败！！");


        }


        List<Long> list = orders.stream().map(AsnOrder::getId).collect(Collectors.toList());


        List<WaveItem> items = new ArrayList<>();


        List<AsnOrderItem> orderItems = asnOrderItemService


                .list(new LambdaQueryWrapper<AsnOrderItem>()


                        .in(AsnOrderItem::getAsnId, list));






        for (AsnOrderItem item : orderItems) {


            WaveItem waveItem = new WaveItem();


            BeanUtils.copyProperties(item, waveItem);


            waveItem.setWaveId(wave.getId())


                    .setWaveCode(wave.getCode())


                    .setOrderId(item.getAsnId())


                    .setOrderCode(item.getAsnCode())


                    .setOrderItemId(item.getId());


            items.add(waveItem);


        if (orderItems.isEmpty()) {


            throw new CoolException("单据不存在！！");


        }


        if (!waveItemService.saveBatch(items)) {




        List<WaveItem> waveItems = mergeWave(orderItems, wave);


        if (!waveItemService.saveBatch(waveItems)) {


            throw new CoolException("波次明细保存失败！！");


        }


        double sum1 = waveItems.stream().mapToDouble(WaveItem::getAnfme).sum();


        wave.setAnfme(sum1);


        if (!waveService.saveOrUpdate(wave)) {


            throw new CoolException("主单修改失败！！");


        }




        if (!this.update(new LambdaUpdateWrapper<AsnOrder>()


                .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)


                .in(AsnOrder::getId, ids))) {


            throw new CoolException("执行状态修改修改失败！！");


        }


        return R.ok("操作完成！！");


    }




    /**


     * @param


     * @param wave


     * @return


     * @author Ryan


     * @description 合并生成波次


     * @time 2025/4/25 10:07


     */


    private List<WaveItem> mergeWave(List<AsnOrderItem> orderItems, Wave wave) {


        List<WaveItem> items = new ArrayList<>();


        orderItems.forEach(order -> {


            WaveItem item = new WaveItem();


            BeanUtils.copyProperties(order, item);


            item.setOrderItemId(order.getId())


                    .setId(null)


                    .setOrderCode(order.getAsnCode())


                    .setOrderId(order.getAsnId())


                    .setMatnrId(order.getMatnrId())


                    .setMaktx(order.getMaktx())


                    .setWaveId(wave.getId())


                    .setWaveCode(wave.getCode());


            items.add(item);


        });


        List<WaveItem> waveItems = GroupMergeUtil.groupAndMerge(items,


                (p1, p2) -> new WaveItem(


                        p1.getWaveId(),


                        p1.getWaveCode(),


                        p1.getMatnrId(),


                        p1.getMaktx(),


                        p1.getMatnrCode(),


                        p1.getBatch(),


                        p1.getSplrBatch(),


                        p1.getOrderCode(),


                        p1.getOrderId(),


                        p1.getOrderItemId(),


                        p1.getUnit(),


                        p1.getTrackCode(),


                        p1.getFieldsIndex(),


                        p1.getAnfme() + p2.getAnfme(),


                        p1.getWorkQty(),


                        p1.getTenantId(),


                        p1.getStatus(),


                        p1.getDeleted(),


                        p1.getCreateTime(),


                        p1.getCreateBy(),


                        p1.getUpdateTime(),


                        p1.getUpdateBy(),


                        p1.getMemo()


                ),


                WaveItem::getSplrBatch, WaveItem::getMatnrCode, WaveItem::getFieldsIndex


        );




        return waveItems;


    }


}