台机绑定功能优化

skyouc

3 天以前 4001ce31cb08d3a05ce71922568347beb02a9d08

台机绑定功能优化

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

@@ -46,6 +46,8 @@
    private WrkMastLogService wrkMastLogService;
    @Resource
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private BasAreasService basAreasService;

    @RequestMapping(value = "/locMast/init/pwd")
    public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -282,6 +284,15 @@
            if (Cools.isEmpty(basWhsType)) {
                return R.error("库型不存在！！！");
            }

            if (Objects.isNull(param.getAreaId())) {
                throw new CoolException("库区ID不能为空！！！");
            }
            BasAreas basAreas = basAreasService.selectById(param.getAreaId());
            if (Cools.isEmpty(basAreas)) {
                return R.error("库区不存在！！！");
            }

            for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
                for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
                    for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
@@ -320,6 +331,8 @@
                        locMast.setAppeUser(getUserId());
                        locMast.setAppeTime(now);
                        locMast.setModiUser(getUserId());
                        locMast.setAreaId(basAreas.getId());
                        locMast.setAreaName(basAreas.getName());
                        locMast.setModiTime(now);
                        locMast.setWhsType(basWhsType.getId());
                        list.add(locMast);

 src/main/java/com/zy/asrs/entity/LocMast.java

@@ -182,6 +182,14 @@
    @TableField("ctn_no")
    private String ctnNo;

    @ApiModelProperty(value= "库区ID")
    @TableField("area_id")
    private Long areaId;

    @ApiModelProperty(value= "库区名称")
    @TableField("area_name")
    private String areaName;

    /**
     * 是否冻结
     */

 src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java

@@ -47,6 +47,8 @@
    private Integer endCrn;

    private String identifying;
    // 库区ID
    private String areaId;

    public Integer getStartRow() {
        if (null == startRow) {

 src/main/webapp/static/js/locAroundBind/locAroundBind.js

@@ -1,7 +1,7 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
}).use(['table', 'laydate', 'form', 'admin'], function () {
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
@@ -12,8 +12,8 @@
    // 数据渲染
    tableIns = table.render({
        elem: '#locAroundBind',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/locAroundBind/list/auth',
        headers: { token: localStorage.getItem('token') },
        url: baseUrl + '/locAroundBind/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
@@ -21,15 +21,15 @@
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'number', align: 'center',title: '序号'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'devId', align: 'center',title: '台机ID'}
            ,{field: 'devNo', align: 'center',title: '台机号'}
            ,{field: 'bLocId', align: 'center',title: '库位ID'}
            ,{field: 'bLocNo', align: 'center',title: '库位码'}
            { type: 'checkbox' }
            , { field: 'number', align: 'center', title: '序号' }
            , { field: 'id', align: 'center', title: 'ID' }
            , { field: 'devId', align: 'center', title: '台机ID' }
            , { field: 'devNo', align: 'center', title: '台机号' }
            , { field: 'bLocId', align: 'center', title: '库位ID' }
            , { field: 'bLocNo', align: 'center', title: '库位码' }

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
            , { fixed: 'right', title: '操作', align: 'center', toolbar: '#operate', width: 120 }
        ]],
        request: {
            pageName: 'curr',
@@ -46,11 +46,11 @@
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
        done: function (res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
                top.location.href = baseUrl + "/";
            }
            pageCurr=curr;
            pageCurr = curr;
            limit();
        }
    });
@@ -58,37 +58,37 @@
    // 监听排序事件
    table.on('sort(locAroundBind)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
        $.each($('#search-box [name]').serializeArray(), function () {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
            page: { curr: 1 }
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(locAroundBind)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
        switch (obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               del(checkStatus.map(function (d) {
                   return d.id;
               }));
               break;
                if (checkStatus.length === 0) {
                    layer.msg('请选择要删除的数据', { icon: 2 });
                    return;
                }
                del(checkStatus.map(function (d) {
                    return d.id;
                }));
                break;
            case 'exportData':
                admin.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                admin.confirm('确定导出Excel吗', { shadeClose: true }, function () {
                    var titles = [];
                    var fields = [];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
@@ -96,7 +96,7 @@
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                    $.each($('#search-box [name]').serializeArray(), function () {
                        exportData[this.name] = this.value;
                    });
                    var param = {
@@ -104,30 +104,52 @@
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/locAroundBind/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        url: baseUrl + "/locAroundBind/export/auth",
                        headers: { 'token': localStorage.getItem('token') },
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        dataType: 'json',
                        contentType: 'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                                table.exportFile(titles, res.data, 'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                                top.location.href = baseUrl + "/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                                layer.msg(res.msg, { icon: 2 })
                            }
                        }
                    });
                });
                break;
            case "init":
                layer.prompt({ title: '请输入口令，并重置库位', formType: 1, shadeClose: true }, function (pass, idx) {
                    http.get(baseUrl + "/locMast/init/pwd", { pwd: pass }, function (res) {
                        if (res.data) {
                            layer.open({
                                type: 1,
                                title: '初始化库位',
                                area: ["400px"],
                                maxmin: true,
                                shadeClose: true,
                                content: $("#resetLocDiv"),
                                success: function (layero, index) {

                                }
                            })
                        } else {
                            layer.msg("口令错误");
                        }
                        layer.close(idx);
                    })
                });
                break;
        }
    });

    // 监听行工具事件
    table.on('tool(locAroundBind)', function(obj){
    table.on('tool(locAroundBind)', function (obj) {
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
@@ -152,20 +174,20 @@
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/locAroundBind/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        url: baseUrl + "/locAroundBind/" + (mData ? 'update' : 'add') + "/auth",
                        headers: { 'token': localStorage.getItem('token') },
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                            if (res.code === 200) {
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                layer.msg(res.msg, { icon: 1 });
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            } else if (res.code === 403) {
                                top.location.href = baseUrl + "/";
                            } else {
                                layer.msg(res.msg, { icon: 2 });
                            }
                        }
                    })
@@ -186,19 +208,19 @@
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/locAroundBind/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                url: baseUrl + "/locAroundBind/delete/auth",
                headers: { 'token': localStorage.getItem('token') },
                data: { ids: ids },
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                    if (res.code === 200) {
                        layer.msg(res.msg, { icon: 1 });
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else if (res.code === 403) {
                        top.location.href = baseUrl + "/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                        layer.msg(res.msg, { icon: 2 });
                    }
                }
            })
@@ -229,17 +251,17 @@
});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
$(document).on('click', '#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
    $.each($('#search-box [name]').serializeArray(), function () {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
        page: { curr: pageCurr }
    });
}

 src/main/webapp/views/locAroundBind/locAroundBind.html

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="utf-8">
    <title></title>
@@ -10,52 +11,54 @@
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
</head>

<body>

<div class="layui-fluid">
    <div class="layui-card">
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label">编号:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
    <div class="layui-fluid">
        <div class="layui-card">
            <div class="layui-card-body">
                <div class="layui-form toolbar" id="search-box">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">编号:</label>
                            <div class="layui-input-inline">
                                <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                            </div>
                        </div>
                        <div class="layui-inline">&emsp;
                            <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                                <i class="layui-icon">&#xe615;</i>搜索
                            </button>
                            <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                                <i class="layui-icon">&#xe666;</i>重置
                            </button>
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
                    </div>
                </div>
                <table class="layui-hide" id="locAroundBind" lay-filter="locAroundBind"></table>
            </div>
            <table class="layui-hide" id="locAroundBind" lay-filter="locAroundBind"></table>
        </div>
    </div>
</div>

<script type="text/html" id="toolbar">
    <script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">初始化</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>

<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>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/locAroundBind/locAroundBind.js" charset="utf-8"></script>
    <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>
    <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/locAroundBind/locAroundBind.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
@@ -97,5 +100,89 @@
        </div>
    </form>
</script>
</html>

<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
    <div class="layui-form layui-form-pane">
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">删除库位</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="checkbox" name="enable" lay-skin="switch" value="1" lay-text="删除|保留">
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label"><span class="not-null">*</span>库区名称：</label>
                <div class="layui-input-inline cool-auto-complete">
                    <input id="identifying" name="identifying" class="layui-input" type="text" style="display: none">
                    <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)"
                           type="text" onfocus=this.blur()>
                    <div class="cool-auto-complete-window">
                        <input class="cool-auto-complete-window-input" data-key="basAreasQueryBywhsType"
                               onkeyup="autoLoad(this.getAttribute('data-key'))">
                        <select class="cool-auto-complete-window-select" data-key="basAreasQueryBywhsTypeSelect"
                                onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                        </select>
                    </div>
                </div>
            </div>
        </div>
        <!-- 排 -->
        <div class="layui-form-item">
            <label class="layui-form-label">堆垛机数量</label>
            <div class="layui-input-inline">
                <input type="text" name="crnAmount" lay-verify="required|number" autocomplete="off" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">起始堆垛机</label>
                <div class="layui-input-inline">
                    <input type="text" name="staCrn" autocomplete="off" class="layui-input" lay-verify="number">
                </div>
            </div>
        </div>
        <!-- 库位类型 -->
        <div class="layui-form-item">
            <label class="layui-form-label">高低类型</label>
            <div class="layui-input-inline">
                <select name="locType1">
                    <option style="display: none"></option>
                    <option value="0">未知</option>
                    <option value="1">低库位</option>
                    <option value="2">高库位</option>
                </select>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">宽窄类型</label>
            <div class="layui-input-inline">
                <select name="locType2">
                    <option style="display: none"></option>
                    <option value="0">未知</option>
                    <option value="1">窄库位</option>
                    <option value="2">宽库位</option>
                </select>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">轻重类型</label>
            <div class="layui-input-inline">
                <select name="locType3">
                    <option style="display: none"></option>
                    <option value="0">未知</option>
                    <option value="1">轻库位</option>
                    <option value="2">重库位</option>
                </select>
            </div>
        </div>
        <div style="text-align: center; margin-top: 20px">
            <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">
                确定
            </button>
        </div>
    </div>
</div>

</html>

 src/main/webapp/views/locMast/locMast.html

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="utf-8">
    <title></title>
@@ -13,94 +14,100 @@
        #btn-init {
            display: none;
        }

        .layui-layer-page .layui-layer-content {
            position: relative;
            overflow: visible !important;
        }

    </style>
</head>
<body>

<!-- 搜索栏 -->
<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="loc_no" placeholder="库位号" autocomplete="off">
<body>
    <!-- 搜索栏 -->
    <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="loc_no" placeholder="库位号" autocomplete="off">
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="locSts" name="loc_sts" class="layui-input" type="text"  style="display: none">
            <input id="locSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="库位状态" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="basLocStsQueryBylocSts" onkeyup="autoLoad2(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="basLocStsQueryBylocStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
        <div class="layui-inline">
            <div class="layui-input-inline cool-auto-complete">
                <input id="locSts" name="loc_sts" class="layui-input" type="text" style="display: none">
                <input id="locSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text"
                    placeholder="库位状态" onfocus=this.blur()>
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="basLocStsQueryBylocSts"
                        onkeyup="autoLoad2(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="basLocStsQueryBylocStsSelect"
                        onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <!--    <div class="layui-inline">-->
        <!--        <div class="layui-input-inline cool-auto-complete">-->
        <!--            <input id="whsType" name="whs_type" class="layui-input" type="text"  style="display: none">-->
        <!--            <input id="whsType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="库位类型" onfocus=this.blur()>-->
        <!--            <div class="cool-auto-complete-window">-->
        <!--                <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad2(this.getAttribute('data-key'))">-->
        <!--                <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
        <!--                </select>-->
        <!--            </div>-->
        <!--        </div>-->
        <!--    </div>-->
        <div class="layui-inline">
            <div class="layui-input-inline">
                <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="库位类型"
                    autocomplete="off">
                    <!--                    <option style="display: none"></option>-->
                    <option value="">库位类型</option>
                    <option value="1">低库位</option>
                    <option value="2">高库位</option>
                </select>
            </div>
        </div>
    </div>
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline cool-auto-complete">-->
<!--            <input id="whsType" name="whs_type" class="layui-input" type="text"  style="display: none">-->
<!--            <input id="whsType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="库位类型" onfocus=this.blur()>-->
<!--            <div class="cool-auto-complete-window">-->
<!--                <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad2(this.getAttribute('data-key'))">-->
<!--                <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                </select>-->
<!--            </div>-->
<!--        </div>-->
<!--    </div>-->
    <div class="layui-inline">
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="row1" placeholder="排" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="bay1" placeholder="列" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="lev1" placeholder="层" autocomplete="off">
            </div>
        </div>
        <div class="layui-input-inline">
            <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="库位类型" autocomplete="off">
            <select name="frozen" class="layui-input" type="text" autocomplete="off">
                <!--                    <option style="display: none"></option>-->
                <option value="">库位类型</option>
                <option value="1">低库位</option>
                <option value="2">高库位</option>
                <option value="">冻结否</option>
                <option value="0">未冻结</option>
                <option value="1">已冻结</option>
            </select>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" autocomplete="off">
        <!-- 待添加 -->
        <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>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="row1" placeholder="排" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="bay1" placeholder="列" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="lev1" placeholder="层" autocomplete="off">
        </div>
    </div>
    <div class="layui-input-inline">
        <select name="frozen" class="layui-input" type="text" autocomplete="off">
            <!--                    <option style="display: none"></option>-->
            <option value="">冻结否</option>
            <option value="0">未冻结</option>
            <option value="1">已冻结</option>
        </select>
    </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>

<!-- 表格 -->
<div class="layui-form">
    <table class="layui-hide" id="locMast" lay-filter="locMast"></table>
</div>
<script type="text/html" id="toolbar">
    <!-- 表格 -->
    <div class="layui-form">
        <table class="layui-hide" id="locMast" lay-filter="locMast"></table>
    </div>
    <script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
@@ -110,156 +117,182 @@
    </div>
</script>

<script type="text/html" id="operate">
    <script type="text/html" id="operate">
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>-->
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>
</script>
    </script>

<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>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
    <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>
    <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
    <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>

<!-- 重置库位弹窗 -->
<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
    <div class="layui-form layui-form-pane">
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">删除库位</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="checkbox" name="enable" lay-skin="switch" value="1" lay-text="删除|保留">
    <!-- 重置库位弹窗 -->
    <div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
        <div class="layui-form layui-form-pane">
            <div class="layui-form-item">
                <div class="layui-inline">
                    <label class="layui-form-label">删除库位</label>
                    <div class="layui-input-inline" style="width: 100px;">
                        <input type="checkbox" name="enable" lay-skin="switch" value="1" lay-text="删除|保留">
                    </div>
                </div>
            </div>
        </div>
<!--        <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="identifying" class="layui-input" type="text" style="display: none">-->
<!--                <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>-->
<!--                <div class="cool-auto-complete-window">-->
<!--                    <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                    <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                    </select>-->
<!--                </div>-->
<!--            </div>-->
<!--        </div>-->
        <!--
            <!--        <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="identifying" class="layui-input" type="text" style="display: none">-->
            <!--                <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>-->
            <!--                <div class="cool-auto-complete-window">-->
            <!--                    <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
            <!--                    <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
            <!--                    </select>-->
            <!--                </div>-->
            <!--            </div>-->
            <!--        </div>-->
            <!--
        /**
        * 库型 1: 标准堆垛机库  2: 平库  3: 穿梭板  4: 四向车  5: AGV  0: 未知
        */
        -->
        <div class="layui-form-item">
            <label class="layui-form-label">库位类型：</label>
            <div class="layui-input-inline">
                <select name="identifying">
<!--                    <option style="display: none"></option>-->
<!--                    <option value="0">未知</option>-->
                    <option value="1" style="display: none">标准堆垛机库</option>
                    <option value="2">平库</option>
                    <option value="3">穿梭板</option>
                    <option value="4">四向车</option>
                    <option value="5">AGV</option>
                </select>
            </div>
        </div>
        <!-- 排 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">起止排</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="text" name="startRow" autocomplete="off" class="layui-input" lay-verify="required|number">
                </div>
                <div class="layui-form-mid">-</div>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="text" name="endRow" autocomplete="off" class="layui-input" lay-verify="required|number">
            <div class="layui-form-item">
                <div class="layui-inline">
                    <label class="layui-form-label"><span class="not-null">*</span>库区名称：</label>
                    <div class="layui-input-inline cool-auto-complete">
                        <input id="areaId" name="areaId" class="layui-input" type="text"
                            style="display: none">
                        <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)"
                            type="text" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="basAreasQueryBywhsType"
                                onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="basAreasQueryBywhsTypeSelect"
                                onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <!-- 列 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">起止列</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="text" name="startBay" autocomplete="off" class="layui-input" lay-verify="required|number">
                </div>
                <div class="layui-form-mid">-</div>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="text" name="endBay" autocomplete="off" class="layui-input" lay-verify="required|number">
            <div class="layui-form-item">
                <label class="layui-form-label">库位类型：</label>
                <div class="layui-input-inline">
                    <select name="identifying">
                        <!--                    <option style="display: none"></option>-->
                        <!--                    <option value="0">未知</option>-->
                        <option value="1" style="display: none">标准堆垛机库</option>
                        <option value="2">平库</option>
                        <option value="3">穿梭板</option>
                        <option value="4">四向车</option>
                        <option value="5">AGV</option>
                    </select>
                </div>
            </div>
        </div>
        <!-- 层 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">起止层</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="text" name="startLev" autocomplete="off" class="layui-input" lay-verify="required|number">
                </div>
                <div class="layui-form-mid">-</div>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="text" name="endLev" autocomplete="off" class="layui-input" lay-verify="required|number">
            <!-- 排 -->
            <div class="layui-form-item">
                <div class="layui-inline">
                    <label class="layui-form-label">起止排</label>
                    <div class="layui-input-inline" style="width: 100px;">
                        <input type="text" name="startRow" autocomplete="off" class="layui-input"
                            lay-verify="required|number">
                    </div>
                    <div class="layui-form-mid">-</div>
                    <div class="layui-input-inline" style="width: 100px;">
                        <input type="text" name="endRow" autocomplete="off" class="layui-input"
                            lay-verify="required|number">
                    </div>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">堆垛机数量</label>
            <div class="layui-input-inline">
                <input type="text" name="crnAmount" lay-verify="required|number" autocomplete="off" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">起始堆垛机</label>
                <div class="layui-input-inline" >
                    <input type="text" name="staCrn" autocomplete="off" class="layui-input" lay-verify="number">
            <!-- 列 -->
            <div class="layui-form-item">
                <div class="layui-inline">
                    <label class="layui-form-label">起止列</label>
                    <div class="layui-input-inline" style="width: 100px;">
                        <input type="text" name="startBay" autocomplete="off" class="layui-input"
                            lay-verify="required|number">
                    </div>
                    <div class="layui-form-mid">-</div>
                    <div class="layui-input-inline" style="width: 100px;">
                        <input type="text" name="endBay" autocomplete="off" class="layui-input"
                            lay-verify="required|number">
                    </div>
                </div>
            </div>
        </div>
        <!-- 库位类型 -->
        <div class="layui-form-item">
            <label class="layui-form-label">高低类型</label>
            <div class="layui-input-inline">
                <select name="locType1">
                    <option style="display: none"></option>
                    <option value="0">未知</option>
                    <option value="1">低库位</option>
                    <option value="2">高库位</option>
                </select>
            <!-- 层 -->
            <div class="layui-form-item">
                <div class="layui-inline">
                    <label class="layui-form-label">起止层</label>
                    <div class="layui-input-inline" style="width: 100px;">
                        <input type="text" name="startLev" autocomplete="off" class="layui-input"
                            lay-verify="required|number">
                    </div>
                    <div class="layui-form-mid">-</div>
                    <div class="layui-input-inline" style="width: 100px;">
                        <input type="text" name="endLev" autocomplete="off" class="layui-input"
                            lay-verify="required|number">
                    </div>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">宽窄类型</label>
            <div class="layui-input-inline">
                <select name="locType2">
                    <option style="display: none"></option>
                    <option value="0">未知</option>
                    <option value="1">窄库位</option>
                    <option value="2">宽库位</option>
                </select>
            <div class="layui-form-item">
                <label class="layui-form-label">堆垛机数量</label>
                <div class="layui-input-inline">
                    <input type="text" name="crnAmount" lay-verify="required|number" autocomplete="off"
                        class="layui-input">
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">轻重类型</label>
            <div class="layui-input-inline">
                <select name="locType3">
                    <option style="display: none"></option>
                    <option value="0">未知</option>
                    <option value="1">轻库位</option>
                    <option value="2">重库位</option>
                </select>
            <div class="layui-form-item">
                <div class="layui-inline">
                    <label class="layui-form-label">起始堆垛机</label>
                    <div class="layui-input-inline">
                        <input type="text" name="staCrn" autocomplete="off" class="layui-input" lay-verify="number">
                    </div>
                </div>
            </div>
        </div>
<!--        <div id="prompt" style="text-indent: 10px;">-->
<!--            <span class="not-null">初始化库位后将删除库存明细，请谨慎操作！</span>-->
<!--        </div>-->
        <!-- 按钮 -->
        <div style="text-align: center; margin-top: 20px">
            <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">确定</button>
            <!-- 库位类型 -->
            <div class="layui-form-item">
                <label class="layui-form-label">高低类型</label>
                <div class="layui-input-inline">
                    <select name="locType1">
                        <option style="display: none"></option>
                        <option value="0">未知</option>
                        <option value="1">低库位</option>
                        <option value="2">高库位</option>
                    </select>
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">宽窄类型</label>
                <div class="layui-input-inline">
                    <select name="locType2">
                        <option style="display: none"></option>
                        <option value="0">未知</option>
                        <option value="1">窄库位</option>
                        <option value="2">宽库位</option>
                    </select>
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">轻重类型</label>
                <div class="layui-input-inline">
                    <select name="locType3">
                        <option style="display: none"></option>
                        <option value="0">未知</option>
                        <option value="1">轻库位</option>
                        <option value="2">重库位</option>
                    </select>
                </div>
            </div>
            <!--        <div id="prompt" style="text-indent: 10px;">-->
            <!--            <span class="not-null">初始化库位后将删除库存明细，请谨慎操作！</span>-->
            <!--        </div>-->
            <!-- 按钮 -->
            <div style="text-align: center; margin-top: 20px">
                <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit
                    lay-filter="initDo">确定</button>
            </div>
        </div>
    </div>
</div>
</body>
</html>

</html>