#

luxiaotao1123

2020-06-18 ae5401a34b32643b2db847b4e5266758e63cd7aa

#

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

@@ -59,7 +59,11 @@
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else {
                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                if (entry.getKey().equals("locNo")) {
                    wrapper.eq("loc_no", String.valueOf(entry.getValue()));
                } else {
                    wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                }
            }
        }
    }

 src/main/webapp/static/js/pakStore/stockAdjust.js

@@ -30,12 +30,13 @@

    // 检索事件
    form.on('submit(search)', function (data) {
        if (data.field.loc_no === "") {
        let locNo = data.field.loc_no;
        if (locNo === "") {
            inputTip($("#searchLocNo"));
            layer.msg("请输入库位号");
            return;
        }
        http.post(baseUrl + "/locDetl/list/auth", {loc_no: data.field.loc_no,limit: 1000}, function (res) {
        http.post(baseUrl + "/locDetl/list/auth", {locNo: locNo,limit: 1000}, function (res) {
            matCodeData = [];
            let data = res.data.records;
            for (var i = 0; i<data.length; i++) {
@@ -45,8 +46,8 @@
                    count: 0,
                })
            }
            locTips(true, locNo);
            tableReload();
            console.log(matCodeData);
        })
    });

@@ -55,13 +56,38 @@
        clearFormVal($('#search-box'));
        matCodeData = [];
        tableReload();
        locTips(false);
    });

    // 重载表格
    function tableReload() {
        tableIns.reload({data: matCodeData,done:function (res) {
                limit();
            }});
    }

    // 库位提示框
    function locTips(retrieve, locNo) {
        if (retrieve) {
            http.post(baseUrl+"/locMast/"+locNo+"/auth", null, function (res) {
                let data = res.data;
                if (data != null) {
                    $(".retrieve").show();
                    $("#locMsg").html(locNo + "&nbsp;,库位状态：" + data.locType$);
                    $('.not-retrieve').hide();
                } else {
                    layer.msg("请输入有效库位号");
                    $('.not-retrieve').show();
                    $("#locMsg").html("");
                    $(".retrieve").hide();
                }
            })
        } else {
            $('.not-retrieve').show();
            $("#locMsg").html("");
            $(".retrieve").hide();
        }
    }
})

// 提取物料

 src/main/webapp/views/pakStore/stockAdjust.html

@@ -50,7 +50,7 @@
        .function-btn {
            font-size: 16px;
            padding: 1px 1px 1px 1px;
            width: 100px;
            width: 120px;
            height: 40px;
            border-color: #2b425b;
            border-radius: 4px;
@@ -59,7 +59,6 @@
            border-style: solid;
            transition: 0.4s;
            cursor: pointer;
            letter-spacing: 3px;
        }
        .function-btn:hover {
            background-color: #2b425b;
@@ -82,13 +81,23 @@
        <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 style="display: inline-block; font-size: 16px">
        <div class="not-retrieve" style="color: red">
            未检索库位
        </div>
        <div class="retrieve" style="display: none;color: blue">
            当前检索库位:&nbsp; <span id="locMsg"></span>
        </div>

    </div>
</div>

<hr>

<!-- 功能区 -->
<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>

<!-- 表格 -->