no message

yangyang

2025-07-14 06c4e59fa35c1b9e74da9cf3d081e78c13d17e20

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

@@ -1153,28 +1153,30 @@
                throw new CoolException("当前波次订单不存在！！");

            }



            List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()

                    .eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).eq(CacheSite::getChannel, task.getTargetSite()));

//            List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()

//                    .eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).eq(CacheSite::getChannel, task.getTargetSite()));

//

//            if (cacheSites.isEmpty()) {

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

//            }

//

//            if (cacheSites.size() < orders.size()) {

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

//            }



            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.setBarcode(loc.getBarcode());

                cacheSite.setUpdateTime(new Date());

                if (!cacheSiteService.updateById(cacheSite)) {

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

                }

            }

//            for (int i = 0; i < orders.size(); i++) {

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

//                if (Objects.isNull(cacheSite)) {

//                    cacheSite.setOrderId(orders.get(i).getId());

//                    cacheSite.setOrderNo(orders.get(i).getOrderNo());

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

//                    cacheSite.setBarcode(loc.getBarcode());

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

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

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

//                    }

//                }

//            }



            //库位F => R

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

@@ -1226,7 +1228,7 @@
    /**

     * @author Ryan

     * @date 2025/7/4

     * @description: 生面拣货明细

     * @description: 生成拣货明细

     * @version 1.0

     */

    @Transactional(rollbackFor = Exception.class)

@@ -1496,12 +1498,12 @@
                continue;

            }

            OrderOutMergeDto outMergeParam = new OrderOutMergeDto();

            outMergeParam.setAnfme(outLocDetl.getAnfme())

                    .setLocNo(outLocDetl.getLocNo())

                    .setLocDetlId(detl.getId())

                    .setLocId(detl.getLocId())

                    .setMatnr(outLocDetl.getMatnr())

                    .setBatch(detl.getBatch());

            outMergeParam.setAnfme(outLocDetl.getAnfme());

            outMergeParam.setLocNo(outLocDetl.getLocNo());

            outMergeParam.setLocDetlId(detl.getId());

            outMergeParam.setLocId(detl.getLocId());

            outMergeParam.setMatnr(outLocDetl.getMatnr());

            outMergeParam.setBatch(detl.getBatch());

            orders.add(outMergeParam);



            //根据库位ID分组