Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

zjj

2024-05-30 a83eeabe948a953290062e5dcedb0d33f01defef

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java

@@ -70,6 +70,12 @@
        return mobileService.WarehouseIn(locNo,barcode,getHostId());
    }

    @RequestMapping("/pda/WarehouseOut")
    @ManagerAuth
    public R WarehouseOut(@RequestBody CombParam combParam){
        return mobileService.WarehouseOut(combParam,getHostId());
    }

    @RequestMapping("/menu/pda/auth")
    @ManagerAuth
    public R menuPda(){
@@ -375,6 +381,7 @@
            matParam.setOrderNo(orderDetl.getOrderNo());
            matParam.setOrderId(orderDetl.getOrderId());
            matParam.setCount(count);
            matParam.setUseCount(0D);
            maps.add(matParam);
        }
        return R.ok().add(maps);