自动化立体仓库 - WMS系统
#
luxiaotao1123
2022-03-31 6641f2dbe3bd3d0c64cafeaafc469c34c4d54589
#
6个文件已修改
153 ■■■■■ 已修改文件
src/main/webapp/static/js/common.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakStore/locCheckOut.js 82 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakStore/pakStore.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakStore/stockOut.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/locCheckOut.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/locDetlCheckQuery.html 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/common.js
@@ -10,6 +10,9 @@
    return typeof obj == "undefined" || obj == null || obj === "";
}
// let loadIndex = layer.msg('请求中...', {icon: 16, shade: 0.01, time: false});
//       layer.close(loadIndex);
// 时间 ==>> 字符串
function dateToStr(date) {
    var time = new Date(date);
src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -1,8 +1,8 @@
var pageCurr;
var locDetlLayerIdx;
var tableIns;
function getCol() {
    var cols = [
        {field: 'locNo$', align: 'center',title: '库位号'}
        {field: 'locNo', align: 'center',title: '库位号', merge: true, style: 'font-weight: bold'}
    ];
    cols.push.apply(cols, detlCols);
    return cols;
@@ -10,13 +10,14 @@
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function() {
}).use(['table','laydate', 'form', 'admin', 'tableMerge'], 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 tableMerge = layui.tableMerge;
    tableIns = table.render({
        elem: '#chooseData',
@@ -27,14 +28,10 @@
        cellMinWidth: 50,
        cols: [getCol()],
        done: function(res, curr, count) {
            tableMerge.render(this);
            limit();
            getOutBound();
        }
    });
    // 页面修改
    table.on('edit(chooseData)', function (obj) {
        updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
    });
    // 监听头工具栏事件
@@ -82,43 +79,6 @@
        }
    });
    // 监听行工具事件
    table.on('tool(chooseData)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'remove':
                for (var i = locDetlData.length - 1; i >= 0; i--) {
                    if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
                        locDetlData.splice(i, 1);
                    }
                }
                tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
                break;
        }
    });
    function updateLocDetlData(locNo, matnr, count) {
        if (isNaN(count)) {
            layer.msg("请输入数字");
        } else {
            if (count > 0) {
                for (var i=0;i<locDetlData.length;i++){
                    if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
                        if (count > locDetlData[i]["anfme"]) {
                            layer.msg("不能超过原数量");
                        } else {
                            locDetlData[i]["count"] = count;
                        }
                        break;
                    }
                }
            } else {
                layer.msg("数量必须大于零");
            }
        }
        tableIns.reload({data: locDetlData,done:function (res) {limit(); getOutBound();}});
    }
    // 获取出库口
    function getOutBound(){
        $.ajax({
@@ -141,22 +101,24 @@
            }
        })
    }
})
// 提取物料
var locDetlLayerIdx;
function getLocDetl() {
    locDetlLayerIdx = layer.open({
        type: 2,
        title: '提取出货内容',
        maxmin: true,
        area: [top.detailWidth, top.detailHeight],
        shadeClose: true,
        content: 'locDetlCheckQuery.html',
        success: function(layero, index){
        }
    });
}
    $(document).on('click','#mat-query', function () {
        let loadIndex = layer.msg('请求中...', {icon: 16, shade: 0.01, time: false});
        locDetlLayerIdx = layer.open({
            type: 2,
            title: false,
            closeBtn: false,
            maxmin: false,
            area: ['90%', '85%'],
            shadeClose: true,
            content: 'locDetlCheckQuery.html',
            success: function(layero, index){
                layer.close(loadIndex);
            }
        });
    })
})
// 添加表格数据
function addTableData(data) {
src/main/webapp/static/js/pakStore/pakStore.js
@@ -148,6 +148,7 @@
    // 提取物料
    $(document).on('click','#mat-query', function () {
        let loadIndex = layer.msg('请求中...', {icon: 16, shade: 0.01, time: false});
        matCodeLayerIdx = admin.open({
            type: 2,
            title: false,
@@ -157,6 +158,7 @@
            shadeClose: true,
            content: 'matQuery.html',
            success: function(layero, index){
                layer.close(loadIndex);
            }
        });
    })
src/main/webapp/static/js/pakStore/stockOut.js
@@ -137,6 +137,7 @@
    $(document).on('click','#mat-query', function () {
        let loadIndex = layer.msg('请求中...', {icon: 16, shade: 0.01, time: false});
        locDetlLayerIdx = layer.open({
            type: 2,
            title: false,
@@ -146,6 +147,7 @@
            shadeClose: true,
            content: 'locDetlQuery.html',
            success: function(layero, index){
                layer.close(loadIndex);
            }
        });
    })
src/main/webapp/views/pakStore/locCheckOut.html
@@ -54,7 +54,7 @@
        }
        .function-btn {
            font-size: 16px;
            padding: 1px 1px 1px 1px;
            padding: 1px 2px;
            width: 100px;
            height: 50px;
            border-color: #2b425b;
@@ -64,7 +64,7 @@
            border-style: solid;
            transition: 0.4s;
            cursor: pointer;
            letter-spacing: 3px;
            letter-spacing: 1.5px;
        }
        .function-btn:hover {
            background-color: #2b425b;
@@ -83,7 +83,7 @@
<!-- 功能区 -->
<div class="function-area">
    <button id="mat-query" class="function-btn" onclick="getLocDetl()">新增</button>
    <button id="mat-query" class="function-btn">提取库存</button>
</div>
<hr>
@@ -96,7 +96,7 @@
        <div class="layui-form">
            <div class="layui-btn-container">
                <!-- 1.选择出库口 -->
                <span id="staNoSpan">出库口:</span>
                <span id="staNoSpan">盘点站:</span>
                <select id="staNoSelect" lay-verify="required">
                    <option value="">请选择站点</option>
                </select>
src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -7,6 +7,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <style>
@@ -93,11 +94,10 @@
</body>
<script>
    var pageCurr;
    function getCol() {
        var cols = [
            {type: 'checkbox'}
            ,{field: 'locNo$', align: 'center',title: '库位号'}
        let cols = [
            {type: 'checkbox', merge: ['locNo']}
            ,{field: 'locNo', align: 'center',title: '库位号', merge: true, style: 'font-weight: bold'}
        ];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
@@ -105,12 +105,17 @@
        return cols;
    }
    layui.use(['table','laydate', 'form'], function() {
    layui.config({
        base: baseUrl + "/static/layui/lay/modules/"
    }).use(['table','laydate', 'form', 'admin', 'tableMerge'], 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 tableMerge = layui.tableMerge;
        // 数据渲染
        locDetlTableIns = table.render({
            elem: '#stockOut',
@@ -139,12 +144,10 @@
                statusCode: 200
            },
            done: function(res, curr, count) {
                tableMerge.render(this);
                if (res.code === 403) {
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
                $('.layui-form-checkbox').css("pointer-events", "none");
                $('td[data-field="0').css("cursor", "pointer")
            }
        });
@@ -185,14 +188,6 @@
        // 搜索栏搜索事件
        form.on('submit(search)', function (data) {
            pageCurr = 1;
            tableReload();
        });
        // 搜索栏重置事件
        form.on('submit(reset)', function (data) {
            pageCurr = 1;
            clearFormVal($('#search-box'));
            tableReload();
        });
@@ -203,38 +198,13 @@
        });
    })
    var b = true;
    $(function(){
        $(document.body).on('click','td[data-field="0"]',function(){
            var locNo = $(this).next().children("div").html();
            if (b) {
                b = false;
                $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
                setTimeout(function () {
                    b = true;
                }, 200)
            }
        });
    })
    function tableReload(child) {
    function tableReload() {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        locDetlTableIns.reload({
            where: searchData,
            page: {
                curr: pageCurr
            },
            done: function (res, curr, count) {
                if (res.code === 403) {
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
                $('.layui-form-checkbox').css("pointer-events", "none");
                $('td[data-field="0').css("cursor", "pointer")
            }
            where: searchData
        });
    }