# 6. 大屏添加作业类型 (全盘，还是分拣 IOType) 10.平库出库时，当前平库ID是写死在Sql里，需修改 11.平库出库没有判断是否预约...

skyouc

2025-01-18 4fb06a58ed5df46f29af1e9fa65cfd40335263ad

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

@@ -1015,7 +1015,7 @@
        List<OrderOutMergeParam> mergeParam = params.stream().filter(par -> {

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

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

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

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

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



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

@@ -1198,6 +1198,10 @@
                //锁定库存量

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



                if (!locDetlService.updateById(locDetl)) {

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

                }



            });



        });

@@ -1338,7 +1342,7 @@


    }



    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void cancelWave(List<Long> waveIds) {

        if (waveIds == null) {

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

@@ -1361,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);

@@ -1373,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());