#拣货单功能

DESKTOP-LMJ82IJ\Eno

2025-01-07 adfce6c5a94c7aefa9b5d4f67e63db7eaac268d9

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java

@@ -19,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;



import java.util.*;

import java.util.stream.Collectors;



/**

 * 出库管理

@@ -66,7 +67,7 @@
    /**

     * 出库

     */

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void out(OutParam outParam) {

        if (outParam.getOperationPort() == null) {

            throw new CoolException("作业口不存在");

@@ -105,6 +106,11 @@
            for (OutDetlDto detl : locDto.getDetls()) {

                LocDetl locDetl = locDetlService.getById(detl.getDetlId());

                if(locDetl == null) {

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

                }



                OrderDetl orderDetl = orderDetlService.getById(detl.getOrderDetlId());

                if (orderDetl == null) {

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

                }



@@ -147,7 +153,6 @@
        if (orderDetlIds.isEmpty()) {

            throw new CoolException("订单明细不能为空");

        }



        List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getId, orderDetlIds).orderByAsc(OrderDetl::getOrderNo, OrderDetl::getCreateTime));

        if (orderDetls.isEmpty()) {

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

@@ -155,8 +160,39 @@
        orderDetls = orderDetlService.parseDetl(orderDetls);



        HashMap<Long, List<LocDetl>> orderDetlLocMap = new HashMap<>();

//        //出库订单合计

        List<OutDetlDto> detlDtos = new ArrayList<>();

//        //获取平仓中符合条件的所有库位

//        orderDetls.forEach(detl -> {

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

//            if (issued <= 0.0D) {

//                return;

//            }

//            List<LocDetl> locs = locDetlService.queryFlatStock(detl.getMat$().getMatnr(), detl.getBatch(), detl.getUniqueField());

//            //平库有当明物料优先出库

//            if (!locs.isEmpty()) {

//                for (LocDetl locDetl : locs) {

//                    if (issued > 0) {

//                        OutDetlDto outDetlDto = new OutDetlDto();

//                        outDetlDto.setDetlId(locDetl.getId());

//                        outDetlDto.setAnfme(issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);

//                        outDetlDto.setStock(locDetl.getAnfme());

//                        outDetlDto.setOrderDetlId(locDetl.getId());

//                        detlDtos.add(outDetlDto);

//                        issued = issued - outDetlDto.getAnfme();

//                    }

//                }

//                //订单明细需出库数量

//                double workQty = Optional.of(detl.getAnfme() - detl.getQty() - detl.getWorkQty()).orElse(0.0D);

//                //更新平库订单明细的实际可用数量

//                detl.setWorkQty(workQty - issued);

//            }

//        });



        /**

         * 平库优先出库完成后，当订单明细workQty + qty 还不等于anfme时，查询TCU库

         */

        //获取TCU符合条件库位

        for (OrderDetl orderDetl : orderDetls) {

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

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

@@ -265,7 +301,7 @@
        return previewDtos;

    }



    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void orderOutBatch(List<OrderOutBatchPreviewDto> param) {

        if (param == null) {

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

@@ -480,11 +516,10 @@
            mergePreviewDtos.add(dto);

        }





        return mergePreviewDtos;

    }



    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public List<MergePreviewResultDto> orderOutMergeLocPreview(List<MergePreviewDto> param) {

        if (param == null) {

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

@@ -504,7 +539,68 @@
        sortParams.add(sortParam);



        List<MergePreviewResultDto> resultDtos = new ArrayList<>();



        param.forEach(pars -> {

            List<MergePreviewResultLocDto> locDtos = new ArrayList<>();

            MergePreviewResultDto resultDto = new MergePreviewResultDto();

            resultDto.sync(pars);

            resultDto.setOrderIds(pars.getOrderIds());

            resultDto.setLocs(locDtos);



            List<LocDetl> locs = locDetlService.queryFlatStock(pars.getMatnr(), pars.getBatch(), pars.getFieldParams());

            if (!locs.isEmpty()) {

                double anfme = pars.getAnfme() - pars.getWorkQty();

                for (LocDetl detl : locs) {

                    Loc loc = locService.getById(detl.getLocId());

                    if (loc == null) {

                        throw new CoolException("库位数据不存在");

                    }



                    if (loc.getLocStsId() != LocStsType.F.val()) {

                        continue;

                    }

                    MergePreviewResultLocDto locDto = new MergePreviewResultLocDto();

                    locDto.setLocId(detl.getLocId());

                    locDto.setLocNo(detl.getLocNo());

                    locDto.setTypeId(LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id);

                    locDto.setLocDetlId(detl.getId());



                    locDtos.add(locDto);

                    //库位实际可用数量

                    double surplusQty = detl.getAnfme() - detl.getWorkQty();

                    //波次数量减去库位可用数量后，盈余数量

                    anfme = anfme - surplusQty;

                    if (anfme > 0) {

                        locDto.setAnfme(detl.getAnfme());

                        locDto.setWorkQty(surplusQty);

                    } else {

                        locDto.setAnfme(pars.getAnfme() - pars.getWorkQty());

                        locDto.setWorkQty(pars.getAnfme() - pars.getWorkQty());

                        break;

                    }

                }

                //保存出库数量（平库）

                pars.setWorkQty(pars.getAnfme() - pars.getWorkQty() - anfme);



                resultDto.setOtherLocs(new ArrayList<>());



                resultDto.setAnfme(pars.getAnfme());



                resultDtos.add(resultDto);



            } else {

                resultDto.sync(pars);

                resultDto.setLocs(new ArrayList<>());

                resultDto.setOrderIds(pars.getOrderIds());

                resultDto.setAnfme(pars.getAnfme());

                resultDtos.add(resultDto);

            }

        });



        for (MergePreviewDto dto : param) {

            Double anfme = dto.getAnfme() - dto.getWorkQty();

            //减去平库数量后，小于等于0，跳出处理

            if (anfme <= 0) {continue;}

            List<LocDetl> locDetls = locDetlService.queryStock(dto.getMatnr(), dto.getBatch(), dto.getFieldParams(), sortParams);

            if(locDetls.isEmpty()){

                MergePreviewResultDto resultDto = new MergePreviewResultDto();

@@ -520,10 +616,9 @@


            MergePreviewResultDto resultDto = new MergePreviewResultDto();

            resultDto.sync(dto);

            resultDto.setLocs(locDtos);

            resultDto.setOrderIds(dto.getOrderIds());



            Double anfme = dto.getAnfme();

//            Double anfme = dto.getAnfme();

            resultDto.setLocs(locDtos);

            for (LocDetl locDetl : locDetls) {

                Loc loc = locService.getById(locDetl.getLocId());

                if (loc == null) {

@@ -576,7 +671,7 @@
        return resultDtos;

    }



    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void orderOutMerge(OrderOutMergeParamDto dto) {

        if(dto == null){

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

@@ -778,6 +873,18 @@


    }





    /**

     * 波次生成出库任务

     * UTC出库任务逻辑不变，添加平库判别逻辑

     * 1. 获取波次订单明细，判别是否为平库订单

     * 2. 平库订单生成拣货单， UTC订单生成出库任务

     * 3. 平库单据明细所占库位物料数量加锁

     * 4. 生成出库单PDA端，统一出库扣减库存

     * 5. 生成拣货单历史档，出库单据加入历史档，删除原单据

     * 6. 删除波次列表数据

     * @param dto

     */

    @Transactional(rollbackFor = Exception.class)

    public void orderOutMergeWave(OrderOutMergeParamDto dto) {

        if(dto == null){

@@ -788,31 +895,33 @@
            throw new CoolException("未生成波次");

        }



        List<OrderOutMergeParam> params = dto.getList();



        if (params.isEmpty()) {

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

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

        if (Objects.isNull(wave)) {

            throw new CoolException("波次不存在");

        }



        Long waveId = dto.getWaveId();

        /**

         * 波次合并出库

         * 1. 判断是平库还TCU库

         * 2. 根据单库单据类型

         * 2. 平库生成拣货单

         * 3. TCU库生成任务单

         */

        outStockByArea(dto, wave);



        List<Long> filterParamsList = new ArrayList<>();

        List<OrderOutMergeParam> filterParams = new ArrayList<>();

        for (OrderOutMergeParam param : params) {

            if (param.getLocId() == null) {

                continue;

            }



            if(!filterParamsList.contains(param.getLocId())){

                filterParamsList.add(param.getLocId());

                filterParams.add(param);

            }

        //波次状态修改为--生成任务

        wave.setWaveStatus(WaveStatusType.GENERATE.id);

        wave.setUpdateTime(new Date());

        if (!waveService.updateById(wave)) {

            throw new CoolException("波次更新失败");

        }

    }



    private Map<Long, List<OrderOutMergeDto>> checkLoc(List<OrderOutMergeParam>  mergeParams, Wave wave) {

        HashMap<String, Double> stockMap = new HashMap<>();

        for (OrderOutMergeParam param : filterParams) {

        for (OrderOutMergeParam param : mergeParams) {

            String matUniqueKey = Utils.getMatUniqueKey(param.getMatnr(), param.getBatch(), param.getFieldParams());

            WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));

            WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, wave.getId()));

            if(waveDetl == null){

                throw new CoolException("波次数据不存在");

            }

@@ -824,7 +933,7 @@
        }



        HashMap<Long, List<OrderOutMergeDto>> map = new HashMap<>();

        for (OrderOutMergeParam param : filterParams) {

        for (OrderOutMergeParam param : mergeParams) {

            LocDetl locDetl = locDetlService.getById(param.getLocDetlId());

            if(locDetl == null) {

                continue;

@@ -860,6 +969,57 @@
        if (map.isEmpty()) {

            throw new CoolException("库存不足");

        }



        return map;

    }



    /**

     * 根据不同库位类型生成出库拣单及TUC任务档

     * @param dto

     * @param wave

     */

    private void outStockByArea(OrderOutMergeParamDto dto, Wave wave) {

        List<OrderOutMergeParam> params = dto.getList();

        if (params.isEmpty()) {

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

        }



        //平库数据源

        List<OrderOutMergeParam> flatOrders = new ArrayList<>();// listMap.get(LocAreaTypeSts.LOC_AREA_TYPE_FLAT);

        //TUC数据源

        List<OrderOutMergeParam> tucOrders = new ArrayList<>();//listMap.get(LocAreaTypeSts.LOC_AREA_TYPE_UTC);

        //按库位类型分类

        Map<Long, List<OrderOutMergeParam>> listMap = params.stream().collect(Collectors.groupingBy(OrderOutMergeParam::getTypeId));



        //数据分类 1.平库数据  2. TUC数据

        listMap.keySet().forEach(key -> {

            if (key == LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id) {

                flatOrders.addAll(listMap.get(key));

            } else {

                tucOrders.addAll(listMap.get(key));

            }

        });

        if (flatOrders.isEmpty()) {

            //平库出库

            outStockByFlat(flatOrders, wave);

        }



        if (tucOrders.isEmpty()) {

            //TUC出库

            outStockByTUC(tucOrders, wave);

        }





    }



    /**

     * TUC出库--生成出库任务档

     *

     * @param tucOrders

     * @param wave

     */

    private void outStockByTUC(List<OrderOutMergeParam> tucOrders, Wave wave) {

        Map<Long, List<OrderOutMergeDto>>  map = checkLoc(tucOrders, wave);



        for (Map.Entry<Long, List<OrderOutMergeDto>> entry : map.entrySet()) {

            Long locId = entry.getKey();

@@ -910,7 +1070,8 @@
                taskDetl.setTaskNo(task.getTaskNo());

                taskDetl.setAnfme(merge.getAnfme());

                taskDetl.setStock(locDetl.getAnfme());

                taskDetl.setWaveId(waveId);

                taskDetl.setWaveId(wave.getId());

                taskDetl.setWaveNo(wave.getWaveNo());

                taskDetl.setOrderId(null);

                taskDetl.setOrderNo(null);

                if (!taskDetlService.save(taskDetl)) {

@@ -929,10 +1090,8 @@
                    }

                }



                //TODO 确认后，需将注释打开

                String matUniqueKey = Utils.getMatUniqueKey(taskDetl.getMatnr(), taskDetl.getBatch(), taskDetl.getUniqueField());

//                WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));

                WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, waveId), false);

                WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, wave.getId()));

                if (waveDetl == null) {

                    throw new CoolException("波次数据不存在");

                }

@@ -950,21 +1109,24 @@
            if(!locUpdate){

                throw new CoolException("库位状态更新失败");

            }



        }



        Wave wave = waveService.getById(waveId);

        if (wave == null) {

            throw new CoolException("波次不存在");

        }



        wave.setWaveStatus(WaveStatusType.GENERATE.id);

        wave.setUpdateTime(new Date());

        if (!waveService.updateById(wave)) {

            throw new CoolException("波次更新失败");

        }

    }



    /**

     * 平库出库--生成出库拣货单

     *

     * @param flatOrders

     * @param wave

     */

    private void outStockByFlat(List<OrderOutMergeParam> flatOrders, Wave wave) {

        Map<Long, List<OrderOutMergeDto>> map = checkLoc(flatOrders, wave);









    }





    @Transactional(rollbackFor = Exception.class)

    public void generateWave(GenerateWaveParam param) {

        if (param == null) {