no message

skyouc

2025-07-10 87d66c61fc5047fb5708d609f4a5f1f868cd646c

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java

@@ -76,23 +76,23 @@
    @Autowired

    private OrderDetlMapper orderDetlMapper;

    @Autowired

    private WaveSeedMapper waveSeedMapper;

    private WaveSeedService waveSeedMapper;

    @Autowired

    private WaveSeedLogService waveSeedLogService;

    @Autowired

    private OrderDetlLogService orderDetlLogService;



    @Autowired

    private PlatformDetlService platformDetlService;

    @Autowired

    private PlatformDetlLogService platformDetlLogService;







    @Override

    @Transactional(rollbackFor = Exception.class)

    public boolean batchMergeOrders(BatchMergeOrdersParam ordersParam) {

        Loc locServiceOne = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, ordersParam.getMergeNo()), false);

        Loc locServiceOne = locService.getOne(new LambdaQueryWrapper<Loc>()

                .eq(Loc::getLocStsId, 1)

                .eq(Loc::getBarcode, ordersParam.getMergeNo()), false);

        if (!Objects.isNull(locServiceOne)) {

            throw new CoolException("托盘已入库，不能再组托！！");

        }

@@ -425,15 +425,14 @@
                    .setOrderId(order.getId())

                    .setSiteStatus(CacheSiteStatusType.R.id)

                    .setBarcode(param.get("barcode").toString());

            if (cacheSiteMapper.updateById(siteNo) < 1) {

            if (!cacheSiteService.saveOrUpdate(siteNo)) {

                throw new CoolException("订单播种位绑定失败！！" );

            }



            int update = waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()

            if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()

                    .eq(WaveSeed::getOrderNo, order.getOrderNo())

                    .set(WaveSeed::getSiteId, siteNo.getId())

                    .set(WaveSeed::getSiteNo, siteNo.getSiteNo()));

            if (update < 1) {

                    .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {

                throw new CoolException("播种站点更新失败！！");

            }

        } else {

@@ -515,14 +514,14 @@
                    throw new CoolException("订单明细不存在！！");

                }

            } else { //部分拣货

                byId.setQty(order.getWorkQty() + byId.getQty());

                byId.setQty(Math.round((order.getWorkQty() + byId.getQty()) * 1000) / 1000.0);

                byId.setWorkQty(0.0);

                if (!orderDetlService.updateById(byId)) {

                    throw new CoolException("部分拣料明细更新失败！！");

                }

            }



            List<WaveSeed> waveSeeds = waveSeedMapper.selectList(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderDetlId, order.getId()));

            List<WaveSeed> waveSeeds = waveSeedMapper.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderDetlId, order.getId()));

            //fixme 订单明细未播种，默认可发货

            if (!waveSeeds.isEmpty()) {

                ArrayList<WaveSeedLog> waveSeedLogs = new ArrayList<>();

@@ -535,11 +534,15 @@
                if (!waveSeedLogService.saveBatch(waveSeedLogs)) {

                    throw new CoolException("波明历史档保存失败！！");

                }



                List<Long> list = waveSeeds.stream().map(WaveSeed::getId).collect(Collectors.toList());

                //删除播种明细信息

                if (!waveSeedMapper.removeByIds(list)) {

                    throw new CoolException("播种明细删除携程！！");

                }



            }

            //删除播种明细信息

            if (waveSeedMapper.deleteByIds(waveSeeds) < 1) {

                throw new CoolException("播种明细删除携程！！");

            }



        });



        orderList.forEach(one -> {