自动化立体仓库 - WMS系统
#
luxiaotao1123
2022-03-30 f63064b50164522377c5881f97b0e630217e030c
#
5个文件已修改
173 ■■■■■ 已修改文件
src/main/webapp/static/css/common.css 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakStore/pakStore.js 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/order/out.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/matQuery.html 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/pakStore.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/css/common.css
@@ -98,9 +98,9 @@
.layui-table-box{
    padding-bottom: 10px;
}
.layui-table-body.layui-table-main{
    overflow: hidden;
}
/*.layui-table-body.layui-table-main{*/
/*    overflow: hidden;*/
/*}*/
.layui-table-page{
    border-width: 0;
}
@@ -222,4 +222,4 @@
/* 做响应式布局时,不建议用固定尺寸,尽量用% */
@media only screen and (max-width: 800px) {
}
}
src/main/webapp/static/js/pakStore/pakStore.js
@@ -3,7 +3,7 @@
var matCodeData = [];
function getCol() {
    var cols = [
        {fixed: 'left', field: 'count', title: '数量(必填)', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
        {fixed: 'left', field: 'anfme', title: '数量(必填)', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
        {field: 'batch', title: '批号(选填)', align: 'center', edit:'text', width: 200,  style:'color: blue;font-weight: bold'}
    ];
    cols.push.apply(cols, matCols);
@@ -17,7 +17,6 @@
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    admin = layui.admin;
@@ -30,7 +29,7 @@
        toolbar: '#toolbar',
        cols: [getCol()],
        done: function (res, curr, count) {
            $('td[data-field=count] div').html(initCountVal);
            $('td[data-field=anfme] div').html(initCountVal);
            setMatCodeData(res.data);
            limit();
            getInBound();
@@ -41,22 +40,23 @@
    table.on('edit(chooseData)', function (obj) {
        let index = obj.tr.attr("data-index");
        let data = matCodeData[index];
        let modify = true;
        if (obj.field === 'anfme'){
            let vle = Number(obj.value);
            if (isNaN(vle)) {
                layer.msg("请输入数字", {icon: 2});
                return false;
                modify = false;
            } else {
                if (vle <= 0) {
                    layer.msg("数量必须大于零", {icon: 2});
                    return false;
                    modify = false;
                }
            }
        }
        data[obj.field] = obj.value;
        if (modify) {
            data[obj.field] = obj.value;
        }
        tableIns.reload({data: matCodeData});
        updateMatCodeData(obj.data.matNo, Number(obj.value));
    });
    // 监听头工具栏事件
@@ -72,11 +72,11 @@
                }
                // 判断物料数量是否存在异常
                for (var i=0;i<matCodeData.length;i++){
                    if (isNaN(matCodeData[i].count)) {
                    if (isNaN(matCodeData[i].anfme)) {
                        layer.msg("请输入数字");
                        return;
                    }
                    if (matCodeData[i].count === 0){
                    if (matCodeData[i].anfme === 0){
                        layer.msg("数量不能为零");
                        return;
                    }
@@ -115,14 +115,11 @@
        switch (obj.event) {
            case 'remove':
                for (let i = matCodeData.length - 1; i >= 0; i--) {
                    if (matCodeData[i].matNo === data.matNo) {
                    if (matCodeData[i].matNo === data.matNo && matCodeData[i].batch === data.batch) {
                        matCodeData.splice(i, 1);
                    }
                }
                tableIns.reload({data: matCodeData,done:function (res) {
                        limit();
                        getInBound();
                    }});
                tableIns.reload({data: matCodeData});
                break;
        }
    });
@@ -130,29 +127,8 @@
    function setMatCodeData(data) {
        matCodeData = data;
        for (var i=0;i<matCodeData.length;i++){
            matCodeData[i]["count"] = initCountVal;
            matCodeData[i]["anfme"] = initCountVal;
        }
    }
    function updateMatCodeData(matNo, count) {
        if (isNaN(count)) {
            layer.msg("请输入数字");
        } else {
            if (count > 0) {
                for (var i=0;i<matCodeData.length;i++){
                    if (matCodeData[i]["matNo"] === matNo){
                        matCodeData[i]["count"] = count;
                    }
                }
            } else {
                layer.msg("数量必须大于零");
            }
        }
        tableIns.reload({data: matCodeData,done:function (res) {
                limit();
                getInBound();
            }});
    }
    // 获取可用入库站点
@@ -185,9 +161,10 @@
function getMat() {
    matCodeLayerIdx = admin.open({
        type: 2,
        title: '提取物料',
        maxmin: true,
        area: [top.detailWidth, top.detailHeight],
        title: false,
        closeBtn: false,
        maxmin: false,
        area: ['90%', '85%'],
        shadeClose: true,
        content: 'matQuery.html',
        success: function(layero, index){
src/main/webapp/views/order/out.html
@@ -152,7 +152,7 @@
<!-- 出库预览 -->
<script type="text/html" id="pakoutPreviewBox" style="display: none">
    <div  style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
    <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
        <span style="font-size: large; font-weight: bold">出库预览</span>
    </div>
    <div class="layui-card">
src/main/webapp/views/pakStore/matQuery.html
@@ -12,7 +12,7 @@
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <style>
        body {
            padding: 0 20px;
            /*overflow: hidden;*/
        }
        .layui-table-box {
            border-right: 1px solid #9F9F9F;
@@ -21,44 +21,47 @@
    </style>
</head>
<body>
<div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
    <span style="font-size: large; font-weight: bold">选择商品</span>
</div>
<div class="layui-card" style="padding: 0 20px; overflow: scroll;">
    <fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
        <legend>搜索栏</legend>
        <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="mat_no" placeholder="商品编号" autocomplete="off">
                </div>
            </div>
            <!-- 日期范围 -->
            <div class="layui-inline" style="width: 300px">
                <div class="layui-input-inline">
                    <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                </div>
            </div>
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
                </div>
            </div>
            <!-- 待添加 -->
            <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
                <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
                <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
            </div>
        </div>
    </fieldset>
<!-- 搜索栏 -->
<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
    <legend>搜索栏</legend>
    <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="mat_no" placeholder="商品编号" autocomplete="off">
            </div>
        </div>
        <!-- 日期范围 -->
        <div class="layui-inline" style="width: 300px">
            <div class="layui-input-inline">
                <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
            </div>
        </div>
        <!-- 待添加 -->
        <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
            <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
            <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
        </div>
    <div class="layui-form">
        <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
    </div>
</fieldset>
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">提取</button>
    </div>
</script>
<div class="layui-form">
    <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
</div>
<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>
@@ -79,7 +82,7 @@
        )
        return cols;
    }
    var pageCurr;
    layui.config({
        base: baseUrl + "/static/layui/lay/modules/"
    }).use(['table','laydate', 'form', 'admin'], function() {
@@ -126,12 +129,12 @@
        // 监听头工具栏事件
        table.on('toolbar(matCode)', function (obj) {
            var checkStatus = table.checkStatus(obj.config.id);
            var data = checkStatus.data;
            let checkStatus = table.checkStatus(obj.config.id);
            let data = checkStatus.data;
            switch(obj.event) {
                case 'confirm':
                    if (data.length === 0){
                        layer.msg("请选择数据");
                        layer.msg("请选择数据", {icon: 2});
                        return;
                    }
                    parent.addTableData(data);
@@ -141,13 +144,11 @@
        // 搜索栏搜索事件
        form.on('submit(search)', function (data) {
            pageCurr = 1;
            tableReload(false);
            tableReload();
        });
        // 搜索栏重置事件
        form.on('submit(reset)', function (data) {
            pageCurr = 1;
            clearFormVal($('#search-box'));
            tableReload();
        });
@@ -159,31 +160,13 @@
        });
    })
    function tableReload(child) {
    function tableReload() {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        matQueryTable.reload({
            where: searchData,
            page: {
                curr: pageCurr
            },
            done: function (res, curr, count) {
                if (res.code === 403) {
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
                if (res.data.length === 0 && count !== 0) {
                    tableIns.reload({
                        where: searchData,
                        page: {
                            curr: pageCurr-1
                        }
                    });
                    pageCurr -= 1;
                }
            }
            where: searchData
        });
    }
src/main/webapp/views/pakStore/pakStore.html
@@ -15,6 +15,7 @@
            height: 100%;
            padding: 10px;
            background-color: #f1f1f1;
            box-sizing: border-box;
        }
        body {
            background-color: #fff;
@@ -27,7 +28,7 @@
        }
        .function-btn {
            font-size: 16px;
            padding: 1px 1px 1px 1px;
            padding: 1px 2px;
            width: 100px;
            height: 50px;
            border-color: #2b425b;
@@ -37,7 +38,7 @@
            border-style: solid;
            transition: 0.4s;
            cursor: pointer;
            letter-spacing: 3px;
            letter-spacing: 1.5px;
        }
        .function-btn:hover {
            background-color: #2b425b;
@@ -84,7 +85,7 @@
<body>
<!-- 功能区 -->
<div class="function-area">
    <button id="mat-query" class="function-btn" onclick="getMat()">新增</button>
    <button id="mat-query" class="function-btn" onclick="getMat()">提取商品</button>
</div>
<hr>