#
luxiaotao1123
2020-06-27 07c3f96ba711bb308cedbbd894b0e9e52cfd32d8
#
3个文件已修改
67 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/MatCodeController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/comb.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/matQuery.html 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -44,6 +44,13 @@
        return R.ok(matCodeService.selectById(String.valueOf(id)));
    }
    @RequestMapping(value = "/matCode/auth")
    @ManagerAuth
    public R find(@RequestParam("id") String id) {
        return R.ok(matCodeService.selectById(String.valueOf(id)));
    }
    @RequestMapping(value = "/matCode/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
src/main/webapp/views/pda/comb.html
@@ -132,6 +132,7 @@
    window.onload = function(){document.getElementById("code").focus();}
    var matCodeLayerIdx;
    function getMat() {
        matCodeLayerIdx = layer.open({
            type: 2,
src/main/webapp/views/pda/matQuery.html
@@ -39,6 +39,7 @@
            text-overflow:ellipsis;
        }
        #confirm {
            margin-top: 10px;
            padding: 5px 20px;
        }
@@ -77,42 +78,70 @@
<div class="form-box">
    <div class="form-item">
        <span>物料编码</span>
        <input id="matNo" type="text" placeholder="扫码/输入">
        <input id="matNo" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">
    </div>
    <div class="form-item">
        <span>物料名称</span>
        <input type="text" disabled="disabled">
        <input id="matName" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>物料描述</span>
        <input type="text" disabled="disabled">
        <span>物料规格</span>
        <input id="str2" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>单位</span>
        <input type="text" disabled="disabled">
        <input id="str1" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span style="vertical-align: middle">数量</span>
        <div class="number-tool" style="vertical-align: middle">
            <button onclick="add()">+</button><input id="count" type="number" value="1"><button onclick="reduce()">-</button>
        </div>
    </div>
    <button id="confirm">提取</button>
    <button id="confirm" onclick="confirm()">提取</button>
</div>
</body>
<script>
    var countDom = $('#count');
    var pageCurr;
    layui.use(['table','laydate', 'form'], function() {
        var table = layui.table;
        var $ = layui.jquery;
        var layer = layui.layer;
        var layDate = layui.laydate;
        var form = layui.form;
    });
    /**
     * 根据物料编码查询物料详情
     */
    function find(el){
        if (isEmpty(el.value)) {
            return;
        }
        $.ajax({
            url: baseUrl + "/matCode/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                id: el.value
            },
            method: 'POST',
            success: function (res) {
                if (res.code === 200) {
                    if (res.data != null) {
                        $('#matName').val(res.data.matName);
                        $('#str1').val(res.data.str1);
                        $('#str2').val(res.data.str2);
                    }
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    alert(res.msg)
                }
            }
        })
    }
    /**
     * 提取
     */
    function confirm(){
        parent.layer.close(parent.matCodeLayerIdx);
    }
    window.onload = function(){document.getElementById("matNo").focus();}
    $(document).on('click','#confirm', function () {
@@ -128,7 +157,7 @@
        countDom.val(Number(countDom.val()) + 1);
    }
    function reduce() {
        if (countDom.val() <= 0) {
        if (countDom.val() <= 1) {
            return;
        }
        countDom.val(countDom.val() - 1);