zjj
2024-05-28 b593d59cb199148666faa0df1015a8d0512bfa7e
#pda组托
2个文件已修改
33 ■■■■■ 已修改文件
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
@@ -36,9 +36,13 @@
    @RequestMapping(value = "/mat/auth")
    @ManagerAuth
    public R find(@RequestParam("matnr") String matnr) {
        return R.ok(matService.getOne(new LambdaQueryWrapper<Mat>()
        Mat one = matService.getOne(new LambdaQueryWrapper<Mat>()
                .eq(Mat::getMatnr, matnr)
                .eq(Mat::getHostId, getHostId())));
                .eq(Mat::getHostId, getHostId()));
        if (Cools.isEmpty(one)){
            return R.error("未查询到相关物料");
        }
        return R.ok(one);
    }
    @RequestMapping(value = "/mat/page/auth")
@@ -151,4 +155,15 @@
        return R.ok().add(orderDetl);
    }
    @RequestMapping(value = "/mat/list/pda/page/auth")
    @ManagerAuth
    public R pdaPageList(@RequestParam(required = true)Long tagId,
                         @RequestParam(defaultValue = "1")Integer curr,
                         @RequestParam(defaultValue = "10")Integer limit){
        LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(Mat::getTagId, tagId);
        wrapper.orderBy(true, false,Mat::getCreateTime);
        return R.ok().add(matService.page(new Page<>(curr, limit), wrapper));
    }
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
@@ -42,6 +42,20 @@
    @Autowired
    private TreeUtils treeUtils;
    @RequestMapping(value = "/tag/list/pda/auth")
    @ManagerAuth
    public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
                     @RequestParam(defaultValue = "10")Integer limit,
                     @RequestParam(required = false)Long parentId){
        LambdaQueryWrapper<Tag> tagLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if(!Cools.isEmpty(parentId)) {
            tagLambdaQueryWrapper.eq(Tag::getParentId, parentId == null ? getOriginTag().getId() : parentId);
        }
        List<Tag> tags = tagService.list(tagLambdaQueryWrapper);
        return R.ok().add(tags);
    }
    @RequestMapping(value = "/tag/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {