skyouc
2025-02-06 b4453189f458329bf9eb7ff25944b3a7bdf55574
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -995,7 +995,7 @@
    }
    /**
     * 根据不同库位类型生成出库拣单及CTU任务档
     * 根据不同库位类型生成出库拣货单或CTU任务档
     *
     * @param dto
     * @param wave
@@ -1008,10 +1008,9 @@
        //平库数据源
        List<OrderOutMergeParam> flatOrders = new ArrayList<>();// listMap.get(LocAreaTypeSts.LOC_AREA_TYPE_FLAT);
        //TUC数据源
        //CTU数据源
        List<OrderOutMergeParam> tucOrders = new ArrayList<>();//listMap.get(LocAreaTypeSts.LOC_AREA_TYPE_UTC);
        //按库位类型分类
        //fixme 如果库存不足时,生成任务档 过滤掉没有库位信息的数据。找君杰确认
        List<OrderOutMergeParam> mergeParam = params.stream().filter(par -> {
            return !StringUtils.isNullOrEmpty(par.getLocNo());
        }).collect(Collectors.toList());
@@ -1031,20 +1030,19 @@
        }
        if (!tucOrders.isEmpty()) {
            //TUC出库
            //CTU出库
            outStockByTUC(tucOrders, wave);
        }
    }
    /**
     * TUC出库--生成出库任务档
     * CTU出库--生成出库任务档
     *
     * @param tucOrders
     * @param wave
     */
    private void outStockByTUC(List<OrderOutMergeParam> tucOrders, Wave wave) {//123
    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()) {
@@ -1126,6 +1124,32 @@
                waveDetl.setUpdateTime(new Date());
                if (!waveDetlService.updateById(waveDetl)) {
                    throw new CoolException("波次数据更新失败");
                }
            }
            List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveNo, wave.getWaveNo()));
            if (orders.isEmpty()) {
                throw new CoolException("当前波次订单不存在!!");
            }
            List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).orderByAsc(CacheSite::getChannel));
            if (cacheSites.isEmpty()) {
                throw new CoolException("缓存站空间不足,请稍后再试");
            }
            if (cacheSites.size() < orders.size()) {
                throw new CoolException("缓存站空间不足,请稍后再试");
            }
            for (int i = 0; i < orders.size(); i++) {
                CacheSite cacheSite = cacheSites.get(i);
                cacheSite.setOrderId(orders.get(i).getId());
                cacheSite.setOrderNo(orders.get(i).getOrderNo());
                cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
                cacheSite.setUpdateTime(new Date());
                if (!cacheSiteService.updateById(cacheSite)) {
                    throw new CoolException("缓存站更新失败");
                }
            }
@@ -1385,17 +1409,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());