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);
@@ -480,7 +487,7 @@
            }

            //更新订单工作数量
            orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount());
            orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount(), getHostId());
        }
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
        locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId, getHostId()));