#当前本版十分完美、冻结

luxiaotao1123

2020-07-25 59139c3f3f6e5d0994b1488b718ed62317f309c9

#当前本版十分完美、冻结

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

@@ -60,6 +60,14 @@
    @RequestMapping(value = "/staDesc/add/auth")
    @ManagerAuth(memo = "站点路径添加")
    public R add(StaDesc staDesc) {
        int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
                .eq("type_no", staDesc.getTypeNo())
                .eq("stn_no", staDesc.getStnNo())
                .eq("crn_no", staDesc.getCrnNo())
                .eq("crn_stn", staDesc.getCrnStn()));
        if (sameRes > 0) {
            return R.error("路径已存在");
        }
        staDesc.setModiUser(getUserId());
        staDesc.setModiTime(new Date());
        staDesc.setAppeUser(getUserId());

 src/main/java/com/zy/common/model/Shelves.java

@@ -61,7 +61,7 @@
     *
     *          货架命中规则如下：
     *              安装位置：   [1]  [2]  |  [3]  [4]  --------  [5] [6]  |  [7] [8]
     *                  命中顺序：      1 -> 5 -> 4 -> 8 -> 2 -> 6 -> 3 -> 9 -> 1 ...
     *                  命中顺序：      1 -> 5 -> 4 -> 8 -> 2 -> 6 -> 3 -> 7 -> 1 ...
     *
     *          1.该规则适不限制货架数量，总数与组别在构造器中设置
     *          2.如有序列号起始问题，用偏移量规避即可

 src/main/webapp/static/js/staDesc/staDesc.js

@@ -83,7 +83,7 @@
                success: function (res) {
                    layer.closeAll();
                    if (res.code === 200){
                        tableReload(false);
                        $(".layui-laypage-btn")[0].click();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
@@ -126,7 +126,7 @@
                    type: 2,
                    title: '新增',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['40%', top.detailHeight],
                    shadeClose: false,
                    content: 'staDesc_detail.html',
                    success: function(layero, index){
@@ -240,7 +240,7 @@
                    type: 2,
                    title: '修改',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['40%', top.detailHeight],
                    shadeClose: false,
                    content: 'staDesc_detail.html',
                    success: function(layero, index){

 src/main/webapp/views/staDesc/staDesc_detail.html

@@ -14,7 +14,7 @@

<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <form id="detail" class="layui-form" style="text-align: center">
    <!--
        <div class="layui-inline"  style="display: none">
            <label class="layui-form-label"><span class="not-null">*</span>编　　号：</label>
@@ -29,7 +29,7 @@
                <input id="typeId" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>入出库类型：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="typeNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number"  style="display: none">
@@ -47,7 +47,7 @@
                <input id="typeDesc" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>作业站点：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="stnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number"  style="display: none">
@@ -59,13 +59,13 @@
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">站点名称：</label>
            <div class="layui-input-inline">
                <input id="stnDesc" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>堆垛机号：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="crnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number"  style="display: none">
@@ -77,7 +77,7 @@
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">堆垛机站点：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="crnStn" class="layui-input" type="text" lay-verify="number"  style="display: none">
@@ -89,7 +89,7 @@
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">备　　注：</label>
            <div class="layui-input-inline">
                <input id="memo" class="layui-input" type="text">