| src/main/java/com/zy/asrs/controller/LocMastController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/LocMast.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/static/js/locAroundBind/locAroundBind.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/locAroundBind/locAroundBind.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/locMast/locMast.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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
@@ -123,6 +123,28 @@ }); }); 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; } });
@@ -1,5 +1,6 @@ <!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8"> <title></title> @@ -10,6 +11,7 @@ <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"> @@ -42,6 +44,7 @@ <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> @@ -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,15 +14,15 @@ #btn-init { display: none; } .layui-layer-page .layui-layer-content { position: relative; overflow: visible !important; } </style> </head> <body> <body> <!-- 搜索栏 --> <div id="search-box" class="layui-form layui-card-header"> <div class="layui-inline"> @@ -32,10 +33,13 @@ <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()> <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"> <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> @@ -53,7 +57,8 @@ <!-- </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"> <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> @@ -91,8 +96,10 @@ </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> <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> @@ -151,6 +158,24 @@ */ --> <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 class="layui-form-item"> <label class="layui-form-label">库位类型：</label> <div class="layui-input-inline"> <select name="identifying"> @@ -169,11 +194,13 @@ <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"> <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"> <input type="text" name="endRow" autocomplete="off" class="layui-input" lay-verify="required|number"> </div> </div> </div> @@ -182,11 +209,13 @@ <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"> <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"> <input type="text" name="endBay" autocomplete="off" class="layui-input" lay-verify="required|number"> </div> </div> </div> @@ -195,18 +224,21 @@ <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"> <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"> <input type="text" name="endLev" autocomplete="off" class="layui-input" lay-verify="required|number"> </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"> <input type="text" name="crnAmount" lay-verify="required|number" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-form-item"> @@ -256,10 +288,11 @@ <!-- </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> <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">确定</button> </div> </div> </div> </body> </html> </html>
