#

luxiaotao1123

2020-06-22 1cc03a3d52f01b885d629ce96018516a212f2ae2

#

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

@@ -41,7 +41,7 @@

    @PostMapping(value = "/group/empty/stock")
    @ManagerAuth(memo = "获取同组货架的空库位")
    public R getGroupEmptyStock(@RequestParam String sourceLocNo) {
    public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
        return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo));
    }


 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
@@ -26,11 +25,11 @@
    @Override
    public List<String> queryGroupEmptyStock(String sourceLocNo) {
        if (Cools.isEmpty(sourceLocNo)) {
            throw new CoolException("源库位不能为空");
            return null;
        }
        LocMast sourceStock = this.selectById(sourceLocNo);
        if (Cools.isEmpty(sourceStock)) {
            throw new CoolException("源库位不存在");
            return null;
        }
        return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
    }

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

@@ -3,7 +3,6 @@
layui.use(['table','laydate', 'form'], function() {
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var form = layui.form;

    // 数据渲染
@@ -62,7 +61,6 @@
        }
    });


});

// 搜索库位物料
@@ -72,20 +70,21 @@
        , where: {loc_no: el.value}
        , done:function (res) {
            limit();
        }
    });
    http.post(baseUrl + "/locMast/"+el.value+"/auth", null, function (res) {
        if (res.data != null) {
            $("#targetLocNo").empty();
            layui.form.render('select');
            // 获取同一堆垛机的空库位
            http.post(baseUrl + "/group/empty/stock", {sourceLocNo: el.value}, function (res) {
                var tpl = $("#emptyLocStock").html();
                var template = Handlebars.compile(tpl);
                var html = template(res);
                $('#targetLocNo').append(html);
                layui.form.render('select');
                if (res.data != null) {
                    var tpl = $("#emptyLocStock").html();
                    var template = Handlebars.compile(tpl);
                    var html = template(res);
                    $('#targetLocNo').append(html);
                    layui.form.render('select');
                }
            });
        }
    })
    });

}

// 移库启动
@@ -96,16 +95,16 @@
        $("#sourceLocNo").css("border-color", "red");
        setTimeout(function () {
            $("#sourceLocNo").css("border-color", "#b8b8b8");
        }, 2000);
        layer.msg("请输入库位");
        }, 1000);
        layer.msg("请输入源库位");
        return;
    }
    if (targetLocNo === null || targetLocNo === "") {
        $("#targetLocNo").css("border-color", "red");
        $(".layui-select-title .layui-input").css("border-color", "red");
        setTimeout(function () {
            $("#targetLocNo").css("border-color", "#b8b8b8");
        }, 2000);
        layer.msg("请输入库位");
            $(".layui-select-title .layui-input").css("border-color", "#b8b8b8");
        }, 1000);
        layer.msg("请输入目标库位");
        return;
    }
    $.ajax({
@@ -120,9 +119,17 @@
        success: function (res) {
            if (res.code === 200) {
                $("#sourceLocNo").val("");
                $("#targetLocNo").val("");
                $("#targetLocNo").empty();
                layui.form.render('select');
                layer.closeAll();
                layer.msg(res.msg);
                tableIns.reload({
                    data: [],
                    url: '',
                    done:function (res) {
                        limit();
                    }
                });
            } else if (res.code === 403) {
                top.location.href = baseUrl + "/";
            } else {
@@ -132,41 +139,41 @@
    })
}

// 库位状态获取
var tips;
function locStatus(el) {
    let val = el.value;
    if (val === null|| val === ""){
        return;
    }
    $.ajax({
        url: baseUrl+"/locMast/"+val+"/auth",
        headers: {'token': localStorage.getItem('token')},
        dataType:'json',
        method: 'POST',
        success: function (res) {
            if (res.code === 200) {
                var status;
                if (res.data != null) {
                    status = res.data.locType$;
                } else {
                    status = "未找到库位";
                }
                tips = layer.tips(
                    "<span style='color:#333;text-overflow: clip;'>"+status+"</span>",
                    el,
                    {
                        tipsMore: true,
                        area: ['160px'],
                        tips: [3,'#fff'],
                        time:0
                        ,maxWidth:500
                    });
            } else if (res.code === 403) {
                top.location.href = baseUrl+"/";
            } else {
                layer.msg(res.msg);
            }
        }
    });
}
// // 库位状态获取
// var tips;
// function locStatus(el) {
//     let val = el.value;
//     if (val === null|| val === ""){
//         return;
//     }
//     $.ajax({
//         url: baseUrl+"/locMast/"+val+"/auth",
//         headers: {'token': localStorage.getItem('token')},
//         dataType:'json',
//         method: 'POST',
//         success: function (res) {
//             if (res.code === 200) {
//                 var status;
//                 if (res.data != null) {
//                     status = res.data.locType$;
//                 } else {
//                     status = "未找到库位";
//                 }
//                 tips = layer.tips(
//                     "<span style='color:#333;text-overflow: clip;'>"+status+"</span>",
//                     el,
//                     {
//                         tipsMore: true,
//                         area: ['160px'],
//                         tips: [3,'#fff'],
//                         time:0
//                         ,maxWidth:500
//                     });
//             } else if (res.code === 403) {
//                 top.location.href = baseUrl+"/";
//             } else {
//                 layer.msg(res.msg);
//             }
//         }
//     });
// }

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

@@ -75,19 +75,13 @@
    <!-- 源库位 -->
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input id="sourceLocNo" value="0100203" class="layui-input cool-auto-complete-div" onkeyup="getLoc(this)" type="text" placeholder="源库位" style="width: 150px;cursor: initial" autocomplete="off">
            <input id="sourceLocNo" value="0100203" class="layui-input" onkeyup="getLoc(this)" type="text" placeholder="源库位" autocomplete="off">
        </div>
    </div>
    <div class="layui-form-mid" style="float: none; display: inline-block; margin-left: 10px">-</div>
    <!-- 目标库位 -->
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <input id="targetLocNo" class="layui-input cool-auto-complete-div" onkeyup="locStatus(this)" type="text" placeholder="目标库位" style="width: 150px;cursor: initial" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
    <div class="layui-input-inline">
        <select id="targetLocNo" name="modules" lay-verify="required" lay-search="">
            <option value="">目标库位</option>
            <option value="">目标空库位</option>
        </select>
    </div>
    <button id="loc-move-btn" class="function-btn" onclick="locMove()" style="background: #4476A7;text-shadow: inherit;height: 45px;font-size: 15px;margin-left: 20px">库位移转</button>
@@ -109,7 +103,6 @@
    <option value="{{this}}">{{this}}</option>
    {{/each}}
</script>


<div id="locMoveWindow" style="height: 100%;display: none">
    <div style="float: left;width: 35%;height: 100%">