skyouc
6 天以前 dc60b3451a2984722c01a5991e5b904b8bd44f0d
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -138,7 +138,11 @@
        if (Objects.isNull(params)) {
            return R.error("参数不能为空!!");
        }
        return mobileService.getItemByContainer(params);
        if (!Objects.isNull(params.get("type")) && params.get("type").equals("unbind")) {
            return mobileService.getUnItemByContainer(params);
        } else {
            return mobileService.getItemByContainer(params);
        }
    }
    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
@@ -156,23 +160,6 @@
            return R.error("跟踪码不能为空!!");
        }
        return R.ok(mobileService.mergeItems(waitPakin, userId));
    }
    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
    @ApiOperation("物料组托")
    @PostMapping("/waitPakin/matnr/merge")
    public R pikinMatnrOrder(@RequestBody WaitPakinParam waitPakin) {
        Long userId = getLoginUserId();
        if (Objects.isNull(waitPakin)) {
            return R.error("参数不能为空!!");
        }
        if (org.apache.commons.lang3.StringUtils.isBlank(waitPakin.getBarcode())) {
            return R.error("托盘码不能为空!!");
        }
        if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
            return R.error("跟踪码不能为空!!");
        }
        return R.ok(mobileService.mergeMatnrItems(waitPakin, userId));
    }
    @PreAuthorize("hasAuthority('manager:waitPakin:update')")