#

luxiaotao1123

2021-04-01 725a9f8c9594399c613ea7bf1b7a606e290687ad

#

 src/main/java/zy/cloud/wms/manager/controller/NodeController.java

@@ -50,6 +50,20 @@
        return R.ok(nodeService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/node/tree/auth")
    @ManagerAuth
    public R tree(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Node> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.parse("0-操作成功").add(nodeService.selectList(wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());

 src/main/webapp/static/js/ioWorks/stockIn.js

@@ -10,12 +10,17 @@
    return cols;
}

layui.use(['table','laydate', 'form'], function() {
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin', 'xmSelect', 'treeTable'], function() {
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;
    var xmSelect = layui.xmSelect;
    var treeTable = layui.treeTable;

    tableIns = table.render({
        elem: '#chooseData',
@@ -42,7 +47,7 @@
        var checkStatus = table.checkStatus(obj.config.id);
        var data = checkStatus.data;
        switch(obj.event) {
            case 'comb':
            case 'confirm':
                // 判断是否存在物料
                if (matCodeData.length === 0) {
                    layer.msg("请先添加物料");
@@ -59,29 +64,32 @@
                        return;
                    }
                }
                $.ajax({
                    url: baseUrl+"/full/store/put/start",
                    headers: {'token': localStorage.getItem('token')},
                    data: JSON.stringify({
                        devpNo: Number($('#putSiteSelect').val()),
                        list: matCodeData
                    }),
                    contentType:'application/json;charset=UTF-8',
                    method: 'POST',
                    async: false,
                    success: function (res) {
                        if (res.code === 200){
                            layer.msg("入库启动成功，目标库位：" + res.data);
                            matCodeData = [];
                            tableIns.reload({data: matCodeData,done:function (res) { limit();}});
                        } else if (res.code === 403){
                            top.location.href = baseUrl+"/";
                        }else {
                            layer.msg(res.msg)
                        }
                    }
                })
                break;

                showNodeSelect();

                // $.ajax({
                //     url: baseUrl+"/full/store/put/start",
                //     headers: {'token': localStorage.getItem('token')},
                //     data: JSON.stringify({
                //         devpNo: Number($('#putSiteSelect').val()),
                //         list: matCodeData
                //     }),
                //     contentType:'application/json;charset=UTF-8',
                //     method: 'POST',
                //     async: false,
                //     success: function (res) {
                //         if (res.code === 200){
                //             layer.msg("入库启动成功，目标库位：" + res.data);
                //             matCodeData = [];
                //             tableIns.reload({data: matCodeData,done:function (res) { limit();}});
                //         } else if (res.code === 403){
                //             top.location.href = baseUrl+"/";
                //         }else {
                //             layer.msg(res.msg)
                //         }
                //     }
                // })
                // break;
        }
    });

@@ -131,6 +139,100 @@
            }});
    }

    /* 显示表单弹窗 */
    function showNodeSelect() {
        admin.open({
            type: 1,
            area: '400px',
            title: '选择入库货位',
            content: $('#nodeSelect').html(),
            success: function (layero, dIndex) {
                // 表单提交事件
                form.on('submit(pakin)', function (data) {
                    data.field.parentId = insXmSel.getValue('valueStr');
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/work/stock/pakin",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify({
                            devpNo: Number($('#putSiteSelect').val()),
                            list: matCodeData
                        }),
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        async: false,
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.msg("入库启动成功，目标库位：" + res.data);
                                matCodeData = [];
                                tableIns.reload({data: matCodeData,done:function (res) { limit();}});
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                });
                // 渲染下拉树
                var insXmSel = xmSelect.render({
                    el: '#nodeSel',
                    height: '250px',
                    data: insTb.options.data,
                    initValue: [],
                    model: {label: {type: 'text'}},
                    prop: {
                        name: 'name',
                        value: 'id'
                    },
                    radio: true,
                    clickClose: true,
                    tree: {
                        show: true,
                        indent: 15,
                        strict: false,
                        expandedKeys: true
                    }
                });
                // 弹窗不出现滚动条
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    var insTb = treeTable.render({
        elem: '#node',
        url: baseUrl+'/node/tree/auth',
        headers: {token: localStorage.getItem('token')},
        height: 'full-200',
        tree: {
            iconIndex: 2,           // 折叠图标显示在第几列
            isPidData: true,        // 是否是id、pid形式数据
            idName: 'id',           // id字段名称
            pidName: 'parentId'     // pid字段名称
        },
        cols: [[
            {type: 'checkbox'}
            ,{type: 'numbers'}
            ,{field: 'name', align: 'left',title: '名称', minWidth: 150}
            ,{field: 'type$', align: 'center',title: '类型'}
            ,{field: 'leading', align: 'center',title: '负责人'}
            ,{field: 'sort', align: 'center',title: '排序', hide: true}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{field: 'updateBy$', align: 'center',title: '修改人员', hide: true}
            ,{field: 'memo', align: 'center',title: '备注', hide: true}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        done: function (data) {
            $('.ew-tree-table-box').css('height', '100%');
            insTb.expandAll();
            tbDataList = data;
        }
    });

});

// 提取物料

 src/main/webapp/views/ioWorks/stockIn.html

@@ -9,6 +9,7 @@
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css" media="all">
    <style>
        html {
            height: 100%;
@@ -78,6 +79,10 @@
            margin-left: 20px;
            display: none;
        }
        #detail {
            margin: 0;
            padding: 25px 30px 0 0;
        }
    </style>
</head>
<body>
@@ -96,7 +101,7 @@
        <div class="layui-form">
            <div class="layui-btn-container">
                <!-- 启动出库 -->
                <button class="layui-btn layui-btn-lg" id="btn-inbound" lay-event="comb" style="">确认入库</button>
                <button class="layui-btn layui-btn-lg" id="btn-inbound" lay-event="confirm" style="">确认入库</button>
            </div>
        </div>
    </script>
@@ -108,7 +113,7 @@

    <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
</div>

<!--<table id="node" style="display: none"></table>-->
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
@@ -121,6 +126,20 @@
        <option value="{{this}}">{{this}}</option>
    {{/each}}
</script>
<script type="text/html" id="nodeSelect">
    <form id="detail" lay-filter="detail" class="layui-form">
        <div class="layui-form-item">
            <label class="layui-form-label">货位</label>
            <div class="layui-input-block">
                <div id="nodeSel" class="ew-xmselect-tree"></div>
            </div>
        </div>
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="pakin" lay-submit="">入库</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</body>
</html>