#平库出库功能

skyouc

2025-01-07 83b504d7a369baa08b15c741c3b6daf71f6fa1f9

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

@@ -14,11 +14,13 @@
import com.zy.asrs.wms.utils.Utils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.BeanUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import java.util.*;

import java.util.stream.Collectors;



/**

 * 出库管理

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

     * 出库

     */

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void out(OutParam outParam) {

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

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

@@ -152,7 +154,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("订单明细不存在");

@@ -160,8 +161,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; }

@@ -270,7 +302,7 @@
        return previewDtos;

    }



    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void orderOutBatch(List<OrderOutBatchPreviewDto> param) {

        if (param == null) {

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

@@ -509,6 +541,46 @@
        sortParams.add(sortParam);



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



        param.forEach(pars -> {

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

            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.setLocDetlId(detl.getId());



                    locDtos.add(locDto);

                    //库位实际可用数量

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

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

//                    double workQty = anfme - surplusQty;

                    anfme = anfme - surplusQty;

                    if (anfme > 0) {

                        locDto.setAnfme(detl.getAnfme());

                        locDto.setWorkQty(surplusQty);

                    } else {

                        locDto.setAnfme(anfme);

                        locDto.setWorkQty(anfme);

                        break;

                    }

                }



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

            }

        });



        for (MergePreviewDto dto : param) {

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

            if(locDetls.isEmpty()){

@@ -525,10 +597,9 @@


            MergePreviewResultDto resultDto = new MergePreviewResultDto();

            resultDto.sync(dto);

            resultDto.setLocs(locDtos);

            resultDto.setOrderIds(dto.getOrderIds());



            Double anfme = dto.getAnfme();

            resultDto.setLocs(locDtos);

            for (LocDetl locDetl : locDetls) {

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

                if (loc == null) {

@@ -581,7 +652,18 @@
        return resultDtos;

    }



    @Transactional

    /**

     * 波次生成出库任务

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

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

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

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

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

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

     * 6. 删除波次列表数据

     * @param dto

     */

    @Transactional(rollbackFor = Exception.class)

    public void orderOutMerge(OrderOutMergeParamDto dto) {

        if(dto == null){

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

@@ -804,11 +886,6 @@
            throw new CoolException("参数不能为空");

        }







//        Long waveId = dto.getWaveId();

//        String waveNo = dto.getw



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

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



@@ -943,8 +1020,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, wave.getId()), false);

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

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

                if (waveDetl == null) {

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

                }

@@ -955,12 +1032,6 @@
                }

            }



            //出库库存更新逻辑

//            List<Long> orderIds = dto.getList().stream().findFirst().get().getOrderIds();

//            List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, orderIds));

//            orderDetls.forEach(orderDetl -> {

//                orderUtils.updateWorkQty(orderDetl.getId(), orderDetl.getAnfme());

//            });



            //库位F => R

            loc.setLocStsId(LocStsType.R.val());