#

Junjie

2023-12-22 ff7c45827443890b9739bfb5826717b85378f044

#

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

File was renamed from zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManMatController.java
@@ -16,18 +16,18 @@
import java.util.*;

@RestController
public class ManMatController extends BaseController {
public class MatController extends BaseController {

    @Autowired
    private MatService matService;

    @RequestMapping(value = "/manMat/{id}/auth")
    @RequestMapping(value = "/mat/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") Long id) {
        return R.ok(matService.getById(id));
    }

    @RequestMapping(value = "/manMat/page/auth")
    @RequestMapping(value = "/mat/page/auth")
    @ManagerAuth
    public R page(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
@@ -46,14 +46,14 @@
    }


    @RequestMapping(value = "/manMat/add/auth")
    @RequestMapping(value = "/mat/add/auth")
    @ManagerAuth
    public R add(Mat mat) {
        matService.save(mat);
        return R.ok();
    }

    @RequestMapping(value = "/manMat/update/auth")
    @RequestMapping(value = "/mat/update/auth")
    @ManagerAuth
    public R update(Mat mat){
        if (Cools.isEmpty(mat) || null== mat.getId()){
@@ -63,7 +63,7 @@
        return R.ok();
    }

    @RequestMapping(value = "/manMat/delete/auth")
    @RequestMapping(value = "/mat/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
@@ -72,7 +72,7 @@
        return R.ok();
    }

    @RequestMapping(value = "/manMatQuery/auth")
    @RequestMapping(value = "/matQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
@@ -88,7 +88,7 @@
        return R.ok(result);
    }

    @RequestMapping("/manMat/all/get/kv")
    @RequestMapping("/mat/all/get/kv")
    @ManagerAuth
    public R getDataKV(@RequestParam(required = false) String condition) {
        List<KeyValueVo> vos = new ArrayList<>();

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

File was renamed from zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java
@@ -33,7 +33,7 @@
import java.util.*;

@RestController
public class ManTagController extends BaseController {
public class TagController extends BaseController {

    @Autowired
    private TagService tagService;
@@ -42,13 +42,13 @@
    @Autowired
    private TreeUtils treeUtils;

    @RequestMapping(value = "/manTag/{id}/auth")
    @RequestMapping(value = "/tag/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(tagService.getById(String.valueOf(id)));
    }

    @RequestMapping(value = "/manTag/page/auth")
    @RequestMapping(value = "/tag/page/auth")
    @ManagerAuth
    public R page(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
@@ -67,14 +67,14 @@
    }


    @RequestMapping(value = "/manTag/add/auth")
    @RequestMapping(value = "/tag/add/auth")
    @ManagerAuth
    public R add(Tag tag) {
        tagService.save(tag);
        return R.ok();
    }

    @RequestMapping(value = "/manTag/update/auth")
    @RequestMapping(value = "/tag/update/auth")
    @ManagerAuth
    public R update(Tag tag){
        if (Cools.isEmpty(tag) || null== tag.getId()){
@@ -84,7 +84,7 @@
        return R.ok();
    }

    @RequestMapping(value = "/manTag/delete/auth")
    @RequestMapping(value = "/tag/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
@@ -93,7 +93,7 @@
        return R.ok();
    }

    @RequestMapping(value = "/manTagQuery/auth")
    @RequestMapping(value = "/tagQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
@@ -109,7 +109,7 @@
        return R.ok(result);
    }

    @RequestMapping("/manTag/all/get/kv")
    @RequestMapping("/tag/all/get/kv")
    @ManagerAuth
    public R getDataKV(@RequestParam(required = false) String condition) {
        List<KeyValueVo> vos = new ArrayList<>();
@@ -121,7 +121,7 @@
        return R.ok().add(vos);
    }

    @PostMapping(value = "/manTag/tree/auth")
    @PostMapping(value = "/tag/tree/auth")
    @ManagerAuth
    public R tree(@RequestParam(required = false, defaultValue = "") String condition) throws IOException, ClassNotFoundException {
        ArrayList<Map> tree = treeUtils.getTree(String.valueOf(getOriginTag().getId()));

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

File was renamed from zy-asrs-wms/src/main/webapp/static/js/manMat/manMat.js
@@ -49,7 +49,7 @@
    tableIns = table.render({
        elem: '#mat',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/manMat/page/auth',
        url: baseUrl+'/mat/page/auth',
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
@@ -126,7 +126,7 @@
                } else {
                    layer.confirm('确定删除'+(data.length===1?'此':data.length)+'条数据吗', function(){
                        $.ajax({
                            url: baseUrl+"/manMat/delete/auth",
                            url: baseUrl+"/mat/delete/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: {param: JSON.stringify(data)},
                            method: 'POST',
@@ -164,7 +164,7 @@
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/manMat/export/auth",
                        url: baseUrl+"/mat/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
@@ -249,7 +249,7 @@
                form.val('detail', mData);
                // 新增自动生成商品编号
                if (!mData) {
                    http.get(baseUrl + "/manMat/auto/matnr/auth", null, function (res) {
                    http.get(baseUrl + "/mat/auto/matnr/auth", null, function (res) {
                        $('#matnr').val(res.data);
                    })
                }
@@ -262,7 +262,7 @@
                    }
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/manMat/"+(mData?'update':'add')+"/auth",
                        url: baseUrl+"/mat/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
@@ -318,7 +318,7 @@
    form.on('submit(doPrint)', function (data) {
        var templateNo = data.field.selectTemplate;
        $.ajax({
            url: baseUrl+"/manMat/print/auth",
            url: baseUrl+"/mat/print/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {param: printMatCodeNos},
            method: 'POST',
@@ -380,7 +380,7 @@
// excel导入模板下载
function excelMouldDownload(){
    layer.load(1, {shade: [0.1,'#fff']});
    location.href = baseUrl + "/manMat/excel/import/mould";
    location.href = baseUrl + "/mat/excel/import/mould";
    layer.closeAll('loading');
}

@@ -395,7 +395,7 @@
    var file = obj.files[0];
    admin.confirm('确认同步 [' + file.name +'] 文件吗？', function (index) {
        layer.load(1, {shade: [0.1,'#fff']});
        var url = baseUrl + "/manMat/excel/import/auth";
        var url = baseUrl + "/mat/excel/import/auth";
        var form = new FormData();
        form.append("file", file);
        xhr = new XMLHttpRequest();

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

File was renamed from zy-asrs-wms/src/main/webapp/static/js/manTag/manTag.js
@@ -13,9 +13,9 @@

    // 数据渲染
    tableIns = table.render({
        elem: '#manTag',
        elem: '#tag',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/manTag/page/auth',
        url: baseUrl+'/tag/page/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
@@ -72,7 +72,7 @@
    });

    // 监听排序事件
    table.on('sort(manTag)', function (obj) {
    table.on('sort(tag)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
@@ -86,7 +86,7 @@
    });

    // 监听头工具栏事件
    table.on('toolbar(manTag)', function (obj) {
    table.on('toolbar(tag)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
@@ -116,11 +116,11 @@
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'manTag': exportData,
                        'tag': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/manTag/export/auth",
                        url: baseUrl+"/tag/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
@@ -143,7 +143,7 @@
    });

    // 监听行工具事件
    table.on('tool(manTag)', function(obj){
    table.on('tool(tag)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
@@ -168,7 +168,7 @@
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/manTag/"+(mData?'update':'add')+"/auth",
                        url: baseUrl+"/tag/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
@@ -202,7 +202,7 @@
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/manTag/delete/auth",
                url: baseUrl+"/tag/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',