Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

4 天以前 eba3ce4a22ea7bd74c6ad4a9114039c3ce43f476

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java

@@ -49,8 +49,10 @@
    private WaitPakinService waitPakinService;
    @Autowired
    private AgvService agvService;

    /**
     * PDA用户登录
     * 
     * @param param
     * @param request
     * @return
@@ -71,13 +73,12 @@
        return mobileService.login(param, request);
    }


    /**
     * 标准扫码收货信息
     * 
     * @param trackCode
     * @return
     */
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @GetMapping("/orders/{trackCode}")
    @ApiOperation("标准扫码收货")
    public R  getOrderBybarcode(@PathVariable String trackCode) {
@@ -89,10 +90,10 @@

    /**
     * 确认收货信息
     * 
     * @param params
     * @return
     */
    @PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
    @PostMapping("/orders/confirm")
    @ApiOperation("确认收货")
    public R confirmReceipt(@RequestBody Map<String, Object> params) {
@@ -102,7 +103,6 @@
        return mobileService.receiptToWarehouse(params, getLoginUserId());
    }

    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @PostMapping("/orders/other")
    @ApiOperation("其它扫码收货")
    public R getOtherReceipt(@RequestBody OtherReceiptParams params) {
@@ -112,38 +112,30 @@
        return mobileService.otherReceipt(params);
    }

    @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
    @ApiOperation("获取收货区")
    @GetMapping("/areas/receipt")
    public R getReceiptAreas() {
        return mobileService.getReceiptAreas(getLoginUser());
    }

    @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
    @ApiOperation("获取可用库区")
    @GetMapping("/areas/user/all")
    public R getAreasUserAll() {
        return mobileService.getAreasUserAll(getLoginUser());
    }


    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @GetMapping("/orders/asn")
    @ApiOperation("获取通知单")
    public R getAllAsnOrders() {
        return R.ok(mobileService.getAllAsnOrders());
    }


    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @GetMapping("/dynamic/fields")
    @ApiOperation("获取动态字段")
    public R getDynamicFields() {
        return R.ok(mobileService.getDynamicFields());
    }


    @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
    @ApiOperation("获取订单物料明细")
    @PostMapping("/asnOrderItem/trackCode")
    public R getItemByTrackCode(@RequestBody Map<String, Object> params) {
@@ -153,7 +145,6 @@
        return mobileService.getDeltByCode(params);
    }

    @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
    @ApiOperation("获取拖盘明细")
    @PostMapping("/asnOrderItem/container")
    public R getItemByContainer(@RequestBody Map<String, Object> params) {
@@ -167,7 +158,6 @@
        }
    }

    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
    @ApiOperation("组托")
    @PostMapping("/waitPakin/merge")
    public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
@@ -189,7 +179,6 @@
        return R.ok();
    }

    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
    @ApiOperation("组拖解绑")
    @PostMapping("/waitPakin/unbind")
    public R pakinUnBind(@RequestBody WaitPakinParam param) {
@@ -207,7 +196,7 @@

    @ApiOperation("报检")
    @GetMapping("/asnOrder/inspect/{code}")
    @PreAuthorize("hasAuthority('manager:waitPakin:list')")

    public R getAsnOdrers(@PathVariable String code) {
        if (Objects.isNull(code)) {
            throw new CoolException("参数不能为空！！");
@@ -217,7 +206,7 @@

    @ApiOperation("提交报检")
    @GetMapping("/inspect/confirm/{id}")
    @PreAuthorize("hasAuthority('manager:waitPakin:list')")

    public R confirmInspect(@PathVariable String id) {
        if (Objects.isNull(id)) {
            throw new CoolException("参数不能为空！");
@@ -226,7 +215,7 @@
    }

    @ApiOperation("快速质检信息")
    @PreAuthorize("hasAuthority('manager:qlyInspect:list')")

//    @PostMapping("/inspect/query")
    public R checkObjs(@RequestBody CheckObjParams params) {
        if (Objects.isNull(params)) {
@@ -235,9 +224,8 @@
        return mobileService.checkObjs(params);
    }


    @ApiOperation("快速质检")
    @PreAuthorize("hasAuthority('manager:qlyInspect:update')")

    @PostMapping("/inspect/check/update")
    public R checkUpdate(@RequestBody List<QlyIsptItem> params) {
        if (Objects.isNull(params) || params.isEmpty()) {
@@ -247,7 +235,7 @@
    }

    @ApiOperation("获取上架信息")
    @PreAuthorize("hasAuthority('manager:qlyInspect:list')")

    @PostMapping("/stock/operate/list")
    public R operateToStock(@RequestBody OpStockParams params) {
        if (Objects.isNull(params)) {
@@ -257,21 +245,22 @@
    }

    @ApiOperation("人工上架")
    @PreAuthorize("hasAuthority('manager:qlyInspect:update')")

    @PostMapping("/stock/operate")
    public R publicToStock(@RequestBody ManualShelvingParams params) {
        if (Cools.isEmpty(params.getItemList()) || Cools.isEmpty(params.getLocCode()) || Cools.isEmpty(params.getBarcode())) {
        if (Cools.isEmpty(params.getItemList()) || Cools.isEmpty(params.getLocCode())
                || Cools.isEmpty(params.getBarcode())) {
            return R.error("参数不能为空！！");
        }
        WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode()));

        WaitPakin waitPakin = waitPakinService
                .getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode()));

        return taskService.generateFlatWarehouseTasks(waitPakin, params.getLocCode(), getLoginUserId());
//        return mobileService.publicToStock(params, getLoginUserId());
    }

    @ApiOperation("获取任务信息")
    @PreAuthorize("hasAuthority('manager:qlyInspect:list')")

    @PostMapping("/task/stock/{code}")
    public R taskToStock(@PathVariable String code) {
        if (Objects.isNull(code)) {
@@ -281,7 +270,7 @@
    }

    @ApiOperation("任务上架")
    @PreAuthorize("hasAuthority('manager:qlyInspect:update')")

    @PostMapping("/task/public/{code}")
    public R taskToLocs(@PathVariable String code) throws Exception {
        if (Objects.isNull(code)) {
@@ -292,7 +281,7 @@

    @ApiOperation("一键收货")
    @PostMapping("/complete/{id}")
    @PreAuthorize("hasAuthority('manager:asnOrder:update')")

    public R completeOrder(@PathVariable Long id) {
        if (Objects.isNull(id)) {
            return R.error("参数不能为空！！");
@@ -300,10 +289,9 @@
        return mobileService.completeOrder(id, getLoginUserId());
    }


    @ApiOperation("获取不良托盘物料")
    @PostMapping("/defect/matnrs")
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")

    public R getAsnDefectItemByCode(@RequestBody Map<String, Object> map) {
        if (Objects.isNull(map)) {
            return R.error("参数不能为空！！");
@@ -313,7 +301,7 @@

    @ApiOperation("获取订单不良物料")
    @PostMapping("/defect/{trackCode}")
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")

    public R defectProducts(@PathVariable String trackCode) {
        if (Objects.isNull(trackCode)) {
            return R.error("参数不能为空！！");
@@ -323,7 +311,7 @@

    @ApiOperation("获取组拖入库信息")
    @PostMapping("/pakin/info/{barcode}")
    @PreAuthorize("hasAuthority('manager:waitPakin:list')")

    public R getPakinInStock(@PathVariable String barcode) {
        if (Objects.isNull(barcode)) {
            return R.error("参数不能为空！！");
@@ -333,21 +321,21 @@

    @ApiOperation("获取上架站点信息")
    @GetMapping("/inStock/sites")
    @PreAuthorize("hasAuthority('manager:deviceSite:list')")

    public R getTarSite() {
        return mobileService.getDeviceSites();
    }

    @ApiOperation("获取推荐库位列表信息")
    @GetMapping("/locs/list")
    @PreAuthorize("hasAuthority('manager:deviceSite:list')")

    public R getLocs() {
        return mobileService.getRecommondLocs();
    }

    @ApiOperation("生成任务列表")
    @PostMapping("/pakin/task")
    @PreAuthorize("hasAuthority('manager:deviceSite:list')")

    public R pakinToTask(@RequestBody Map<String, Object> map) {
        if (Objects.isNull(map)) {
            return R.error("参数不能为空！！");
@@ -355,4 +343,3 @@
        return mobileService.generateTask(map, getLoginUserId());
    }
}