yangyang
2025-07-16 8b6a1c695be1893e955bce796b1dc7a534024937
no message
2个文件已修改
44 ■■■■ 已修改文件
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformServiceImpl.java 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
@@ -156,6 +156,7 @@
            for (Integer row : direction) {
                Loc one = locService.getOne(new LambdaQueryWrapper<Loc>()
                                .select(Loc::getId)
                        .eq(Loc::getRow1, row)
                        .eq(Loc::getBay1, loc.getBay1())
                        .eq(Loc::getLev1, loc.getLev1()));
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformServiceImpl.java
@@ -190,43 +190,46 @@
        if (Objects.isNull(pl)) {
            throw new CoolException("集货区不存在!!");
        }
        List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getWaveId, platform.getWaveId()).eq(WaveSeed::getOrderId, platform.getOrderId()));
        List<CacheSite> list = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
                .eq(CacheSite::getOrderId, platform.getOrderId()));
        if (list.isEmpty()) {
            throw new CoolException("订单未绑定播种库位,请完成拣货后,再打印订单!!");
        }
        if (!cacheSiteService.update(new LambdaUpdateWrapper<CacheSite>()
                .eq(CacheSite::getOrderId, platform.getOrderId())
                .set(CacheSite::getPlatformId, pl.getId())
                .set(CacheSite::getPlatformNo, pl.getPlatformNo()))) {
            throw new CoolException("播种墙站点绑定集货区失败!!");
        }
        List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>()
                .eq(WaveSeed::getWaveId, platform.getWaveId())
                .eq(WaveSeed::getOrderId, platform.getOrderId()));
        if (waveSeeds.isEmpty()) {
            throw new CoolException("分拣明细信息不存在,数据错误!!");
        }
        ArrayList<PlatformDetl> detls = new ArrayList<>();
        waveSeeds.forEach(waveSeed -> {
        for (WaveSeed waveSeed : waveSeeds) {
            PlatformDetl platformDetl = new PlatformDetl();
            BeanUtils.copyProperties(waveSeed, platformDetl);
            platformDetl.setPlatformId(pl.getId());
            platformDetl.setPlatformNo(pl.getPlatformNo());
            List<PlatformDetl> list = platformDetlService.list(new LambdaQueryWrapper<PlatformDetl>()
            List<PlatformDetl> plats = platformDetlService.list(new LambdaQueryWrapper<PlatformDetl>()
                    .eq(PlatformDetl::getTaskDetlId, waveSeed.getTaskDetlId())
                    .eq(PlatformDetl::getOrderDetlId, waveSeed.getOrderDetlId())
                    .eq(PlatformDetl::getMatnr, waveSeed.getMatnr()));
            if (!list.isEmpty()) {
                throw new CoolException("订单已入集货区!!");
            if (!plats.isEmpty()) {
                continue;
            }
            detls.add(platformDetl);
        });
        }
        if (!platformDetlService.saveOrUpdateBatch(detls)) {
            throw new CoolException("集货区明细保存失败!!");
        }
        List<CacheSite> list = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, platform.getOrderId()));
        if (list.isEmpty()) {
            throw new CoolException("订单未绑定播种库位,请完成拣货后,再打印订单!!");
        }
        boolean update = cacheSiteService.update(new LambdaUpdateWrapper<CacheSite>()
                .eq(CacheSite::getOrderId, platform.getOrderId())
                .set(CacheSite::getPlatformId, pl.getId())
                .set(CacheSite::getPlatformNo, pl.getPlatformNo()));
        if (!update) {
            throw new CoolException("播种墙站点绑定集货区失败!!");
        }
        return R.ok("绑定成功!!");