1.0.3 平仓入库调整-改为用uuid库区编码作为库区主键

王佳豪

2021-03-16 eacf0e50b4a7fe138a3788af7f71d894d3be0394

1.0.3
平仓入库调整-改为用uuid库区编码作为库区主键

 src/main/java/com/zy/asrs/controller/LocNormalController.java

@@ -56,7 +56,7 @@
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        if (Cools.isEmpty(param.get("state"))) {
            wrapper.eq("state", "1").or().eq("state", "2");
            wrapper.in("state", "1,2");
        }
        return R.ok(locNormalService.selectPage(new Page<>(curr, limit), wrapper));
    }

 src/main/webapp/static/js/locArea/locArea.js

@@ -19,17 +19,14 @@
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'uuid', align: 'center',title: '库区编号'}
            ,{field: 'name', align: 'center',title: '库区名称'}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'createBy$', align: 'center',title: '添加人员',event: 'createBy', style: 'cursor:pointer'}
            // ,{field: 'createBy$', align: 'center',title: '添加人员',event: 'createBy', style: 'cursor:pointer', hide: true}
            ,{field: 'createTime$', align: 'center',title: '添加时间'}
            ,{field: 'updateBy$', align: 'center',title: '修改人员',event: 'updateBy', style: 'cursor:pointer'}
            // ,{field: 'updateBy$', align: 'center',title: '修改人员',event: 'updateBy', style: 'cursor:pointer', hide: true}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{field: 'memo', align: 'center',title: '备注'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {
@@ -305,9 +302,17 @@
    });

    function method(name){
        var index = layer.load(1, {
            shade: [0.5,'#000'] //0.1透明度的背景
        });
        var uuid = $('#uuid').val();
        var areaName = $('#name').val();
        if (uuid === '' || !uuid) {
            layer.msg('请输入库区编号');
            return;
        }
        if (areaName === '' || !areaName) {
            layer.msg('请输入库区名称');
            return;
        }

        var data = {
//            id: $('#id').val(),
            id: $('#id').val(),
@@ -321,6 +326,9 @@
            memo: $('#memo').val(),

        };
        var index = layer.load(1, {
            shade: [0.5,'#000'] //0.1透明度的背景
        });
        $.ajax({
            url: baseUrl+"/locArea/"+name+"/auth",
            headers: {'token': localStorage.getItem('token')},

 src/main/webapp/static/js/locNormal/locNormal.js

@@ -43,7 +43,7 @@
            var html = "";
            if (res.data && res.data.length > 0) {
                html += res.data.map(function (item) {
                    return "<Option value=" + item.id + ">" + item.name + "</Option>";
                    return "<Option value=" + item.uuid + ">" + item.name + "</Option>";
                });
            }
            $('#putSiteSelect').append(html);
@@ -142,7 +142,7 @@
            var records = res.data.records;
            records.map(function (item) {
                locArea.map(function (d) {
                    if (d.id == item.warehouse) {
                    if (d.uuid == item.warehouse) {
                        item.warehouse = d.name;
                    }
                })

 src/main/webapp/static/js/locNormal/locNormalIn.js

@@ -175,7 +175,7 @@
                    var html = "";
                    if (res.data && res.data.length > 0) {
                        html += res.data.map(function (item) {
                            return "<Option value=" + item.id + ">" + item.name + "</Option>";
                            return "<Option value=" + item.uuid + ">" + item.name + "</Option>";
                        });
                    }
                    $('#putSiteSelect').append(html);

 src/main/webapp/views/locArea/locArea.html

@@ -16,29 +16,12 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
            <input class="layui-input" type="text" name="uuid" placeholder="库区编号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="createBy" class="layui-input" name="create_by" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="添加人员" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="updateBy" class="layui-input" name="update_by" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="修改人员" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="name" placeholder="库区名称" autocomplete="off">
        </div>
    </div>


 src/main/webapp/views/locArea/locArea_detail.html

@@ -15,24 +15,16 @@
<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <!--
        <div class="layui-inline"  style="display: none">
            <label class="layui-form-label"><span class="not-null">*</span>编　　号：</label>
        <div class="layui-inline"  style="width:31%; display: none">
            <label class="layui-form-label">ID：</label>
            <div class="layui-input-inline">
                <input id="id" class="layui-input" type="text" placeholder="编号">
            </div>
        </div>
    -->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>I　　D：</label>
            <div class="layui-input-inline">
                <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'locArea')" lay-verify="number" >
                <input id="id" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">库区编号：</label>
            <div class="layui-input-inline">
                <input id="uuid" class="layui-input" type="text">
                <input id="uuid" class="layui-input" onkeyup="check(this.id, 'locArea')" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">

 src/main/webapp/views/locNormal/locNormal.html

@@ -161,7 +161,7 @@
    <script type="text/html" id="locArea">
        {{
        locArea.map(function(item){
        if (d.warehouse == item.id) {
        if (d.warehouse == item.uuid) {
        return item.name;
        }
        });