#

Junjie

2023-12-22 9446f5a0bb5a578f50046046d2b735a7b13b53ce

#

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java

@@ -211,24 +211,4 @@
        return R.ok("成功同步"+listener.getTotal()+"条商品数据");
    }

    /*************************************** xm-select ***********************************************/

    // xm-select 搜索商品列表
    @RequestMapping("/mat/all/get/kv")
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<Mat>()
                .like(Mat::getMatnr, condition).or().like(Mat::getMaktx, condition)
                .orderByAsc(Mat::getCreateTime);
        List<Mat> mats = matService.page(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (Mat mat : mats) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(mat.getMatnr() + " - " + mat.getMaktx());
            vo.setValue(mat.getId());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);
    }

}

 zy-asrs-wms/src/main/webapp/static/js/mat/mat.js

@@ -30,7 +30,7 @@
    // 商品分类数据
    var insTb = treeTable.render({
        elem: '#tag',
        url: baseUrl+'/manTag/page/auth',
        url: baseUrl+'/tag/page/auth',
        headers: {token: localStorage.getItem('token')},
        tree: {
            iconIndex: 2,           // 折叠图标显示在第几列

 zy-asrs-wms/src/main/webapp/static/js/tagTree.js

@@ -19,7 +19,7 @@
    window.loadTree = function(condition){
        var loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl+"/manTag/tree/auth",
            url: baseUrl+"/tag/tree/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                'condition': condition