Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master int...

skyouc

2025-07-08 fcd924c9be6fc3811f4d41cbeee31ad8dc01fd97

Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

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

@@ -92,7 +92,9 @@
    @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("托盘已入库，不能再组托！！");

        }


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

@@ -61,7 +61,7 @@


        //可用数量

//        Double count = orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty() - orderDetl.getWaitQty();

        Double count = Math.round((orderDetl.getAnfme() - orderDetl.getWorkQty() - orderDetl.getQty() - orderDetl.getWaitQty()) * 1000) / 1000.0;

        Double count = Math.round((orderDetl.getAnfme() - orderDetl.getWorkQty() - orderDetl.getQty()) * 1000) / 1000.0;

        if (waitPakin.getAnfme() > count) {

            throw new CoolException("组托数量超过剩余可用数量");

        }