#

lsh

2024-09-03 42f705050f528d50270607cc43903c272f3e1edc

 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) {
@@ -175,6 +189,15 @@
            print.setSpecs(mat.getSpecs());
            print.setUnit(mat.getUnit());
            print.setMemo(mat.getMemo());

            print.setMaterial(mat.getMaterial());
            print.setDecrees(mat.getDecrees());
            print.setImgNum(mat.getImgNum());
            print.setWeight(String.valueOf(mat.getWeight()));
            print.setModel(mat.getModel());
            print.setLength(String.valueOf(mat.getLength()));
            print.setWidth(mat.getWidth());
            print.setHeight(mat.getHeight());
            res.add(print);
        }
        return R.ok().add(res);
@@ -199,6 +222,16 @@
                .doWrite(excels);
    }

//    // excel导入-------判断是否有重复物料
//    @PostMapping(value = "/mat/excel/import/check/auth")
//    @ManagerAuth(memo = "商品档案数据导入")
//    @Transactional
//    public R matExcelImportCheck(MultipartFile file) throws IOException {
//        MatExcelListener listener = new MatExcelListener(getUserId(), getHostId());
//        EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
//        return R.ok("成功同步"+listener.getTotal()+"条商品数据");
//    }

    // excel导入
    @PostMapping(value = "/mat/excel/import/auth")
    @ManagerAuth(memo = "商品档案数据导入")