blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
2025-01-18 4fb06a58ed5df46f29af1e9fa65cfd40335263ad 
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java


@@ -3,6 +3,7 @@


import com.alibaba.fastjson.JSON;



import com.baomidou.mybatisplus.core.conditions.Wrapper;



import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;



import com.mysql.cj.util.StringUtils;



import com.zy.asrs.framework.exception.CoolException;



import com.zy.asrs.wms.asrs.entity.dto.*;



import com.zy.asrs.wms.asrs.entity.dto.OrderOutMergeDto;



@@ -24,6 +25,7 @@


import java.text.SimpleDateFormat;



import java.util.*;



import java.util.stream.Collectors;



import java.util.stream.Stream;







/**



 * 出库管理



@@ -551,7 +553,7 @@


        sortParams.add(sortParam);







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







        //优先查询平库数据



        param.forEach(pars -> {



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



            MergePreviewResultDto resultDto = new MergePreviewResultDto();



@@ -600,15 +602,9 @@






                resultDtos.add(resultDto);







            } else {



                resultDto.sync(pars);



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



                resultDto.setOrderIds(pars.getOrderIds());



                resultDto.setAnfme(pars.getAnfme());



                resultDtos.add(resultDto);



            }



        });







        //平库查询完成后，再查询TCU



        for (MergePreviewDto dto : param) {



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



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



@@ -647,7 +643,7 @@


                locDto.setLocId(locDetl.getLocId());



                locDto.setLocNo(locDetl.getLocNo());



                locDto.setLocDetlId(locDetl.getId());







                locDto.setTypeId(LocAreaTypeSts.LOC_AREA_TYPE_UTC.id);



                locDtos.add(locDto);



                if (anfme - locDetl.getAnfme() < 0) {



                    locDto.setAnfme(anfme);



@@ -671,6 +667,7 @@


                MergePreviewResultLocDto locDto = new MergePreviewResultLocDto();



                locDto.setLocId(locDetl.getLocId());



                locDto.setLocNo(locDetl.getLocNo());



                locDto.setTypeId(LocAreaTypeSts.LOC_AREA_TYPE_UTC.id);



                locDto.setLocDetlId(locDetl.getId());



                locDto.setAnfme(locDetl.getAnfme());



                otherLocDtos.add(locDto);



@@ -998,7 +995,7 @@


    }







    /**



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



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



     *



     * @param dto



     * @param wave



@@ -1014,9 +1011,13 @@


        //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));



        //fixme 如果库存不足时，生成任务档 过滤掉没有库位信息的数据。找君杰确认



        List<OrderOutMergeParam> mergeParam = params.stream().filter(par -> {



            return !StringUtils.isNullOrEmpty(par.getLocNo());



        }).collect(Collectors.toList());



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



        Map<Long, List<OrderOutMergeParam>> listMap = mergeParam.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));



@@ -1045,9 +1046,7 @@


     */



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



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



        if (!Objects.isNull(map)) {



            return;



        }







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



            Long locId = entry.getKey();



            List<OrderOutMergeDto> list = entry.getValue();



@@ -1199,6 +1198,10 @@


                //锁定库存量



                locDetl.setWorkQty(locDetl.getWorkQty() + outOder.getAnfme());







                if (!locDetlService.updateById(locDetl)) {



                    throw new CoolException("库存加锁失败！！");



                }







            });







        });



@@ -1232,12 +1235,12 @@


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



        }







        for (String channel : channels) {



            long count = cacheSiteService.count(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, channel).ne(CacheSite::getSiteStatus, 0));



            if (count > 0) {



                throw new CoolException(channel + "通道已经分配波次");



            }



        }



//        for (String channel : channels) {



//            long count = cacheSiteService.count(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, channel).ne(CacheSite::getSiteStatus, 0));



//            if (count > 0) {



//                throw new CoolException(channel + "通道已经分配波次");



//            }



//        }











        List<Long> orderIds = param.getOrderIds();



@@ -1290,19 +1293,19 @@


                throw new CoolException("订单反写波次失败");



            }







            List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).in(CacheSite::getChannel, channels).orderBy(true, true, CacheSite::getChannel));



            if (cacheSites.isEmpty()) {



                throw new CoolException("缓存站空间不足，请稍后再试");



            }







            CacheSite cacheSite = cacheSites.get(0);



            cacheSite.setOrderId(order.getId());



            cacheSite.setOrderNo(order.getOrderNo());



            cacheSite.setSiteStatus(CacheSiteStatusType.R.id);



            cacheSite.setUpdateTime(new Date());



            if (!cacheSiteService.updateById(cacheSite)) {



                throw new CoolException("缓存站更新失败");



            }



//            List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).in(CacheSite::getChannel, channels).orderBy(true, true, CacheSite::getChannel));



//            if (cacheSites.isEmpty()) {



//                throw new CoolException("缓存站空间不足，请稍后再试");



//            }



//



//            CacheSite cacheSite = cacheSites.get(0);



//            cacheSite.setOrderId(order.getId());



//            cacheSite.setOrderNo(order.getOrderNo());



//            cacheSite.setSiteStatus(CacheSiteStatusType.R.id);



//            cacheSite.setUpdateTime(new Date());



//            if (!cacheSiteService.updateById(cacheSite)) {



//                throw new CoolException("缓存站更新失败");



//            }



        }







        for (Map.Entry<String, List<OrderDetl>> entry : map.entrySet()) {



@@ -1339,7 +1342,7 @@






    }







    @Transactional



    @Transactional(rollbackFor = Exception.class)



    public void cancelWave(List<Long> waveIds) {



        if (waveIds == null) {



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



@@ -1362,6 +1365,14 @@


                    throw new CoolException("已存在任务，禁止取消波次");



                }







                List<PickSheet> pickSheets = pickSheetService.list(new LambdaQueryWrapper<PickSheet>()



                        .eq(PickSheet::getWaveNo, wave.getWaveNo())



                        .eq(PickSheet::getDeleted, 0)



                        .eq(PickSheet::getStatus, 1));



                if (!pickSheets.isEmpty()) {



                    throw new CoolException("当前波次有拣货单存在！！");



                }







                List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, wave.getId()));



                for (Order order : orders) {



                    order.setWaveId(null);



@@ -1374,17 +1385,17 @@


                        throw new CoolException("订单反写失败");



                    }







                    CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, order.getId()));



                    if (cacheSite == null) {



                        throw new CoolException("缓存站不存在");



                    }



                    cacheSite.setSiteStatus(CacheSiteStatusType.O.id);



                    cacheSite.setOrderId(null);



                    cacheSite.setOrderNo(null);



                    cacheSite.setUpdateTime(new Date());



                    if (!cacheSiteService.updateById(cacheSite)) {



                        throw new CoolException("缓存站清空失败");



                    }



//                    CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, order.getId()));



//                    if (cacheSite == null) {



//                        throw new CoolException("缓存站不存在");



//                    }



//                    cacheSite.setSiteStatus(CacheSiteStatusType.O.id);



//                    cacheSite.setOrderId(null);



//                    cacheSite.setOrderNo(null);



//                    cacheSite.setUpdateTime(new Date());



//                    if (!cacheSiteService.updateById(cacheSite)) {



//                        throw new CoolException("缓存站清空失败");



//                    }



                }







                waveDetlService.removeById(waveDetl.getId());