| src/main/java/com/zy/asrs/controller/LocMastController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/model/Shelves.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/thread/LedThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/static/wms/js/locMast/locMast.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/locMast/locMast.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/taskWrkLog/taskWrkLog.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -197,6 +197,68 @@ return R.ok(); } @RequestMapping(value = "/locMast/init/auth2") @ManagerAuth(memo = "初始化库位") // @Transactional public R init2(LocMastInitParam param) { try{ List<LocMast> list = new ArrayList<>(); 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++) { // 获取库位号 String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l); // 获取堆垛机号 int crnNo = 0; try{ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow()); for (List<Integer> node : shelves.nodes){ if (node.contains(r)) { if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn(); }else { crnNo = shelves.nodes.indexOf(node) + 1; } break; } } }catch (Exception e){ throw new Exception("解析堆垛机号失败，请填写正确的数据!!!"); } Date now = new Date(); LocMast locMast = new LocMast(); locMast.setLocNo(locNo); locMast.setLocSts("O"); locMast.setRow1(r); // 排 locMast.setBay1(b); // 列 locMast.setLev1(l); // 层 // locMast.setGro1(r); // 组 locMast.setCrnNo(crnNo); // 堆垛机 locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1); locMast.setLocType2(param.getLocType2()); locMast.setLocType3(param.getLocType3()); locMast.setAppeUser(getUserId()); locMast.setAppeTime(now); locMast.setModiUser(getUserId()); locMast.setModiTime(now); // locMast.setWhsType(basWhs.getId()); list.add(locMast); } } } if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){ locMastService.delete(new EntityWrapper<>()); } locMastService.insertBatch(list); return R.ok("初始化成功"); }catch (Exception e){ return R.error("初始化失败===>"+e.getMessage()); } } @RequestMapping(value = "/locMast/init/auth") @ManagerAuth(memo = "初始化库位") // @Transactional src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java
@@ -2,10 +2,12 @@ import com.core.common.BaseRes; import com.core.exception.CoolException; import lombok.Data; /** * Created by vincent on 2020/6/13 */ @Data public class LocMastInitParam { // 起始排 @@ -38,6 +40,14 @@ // 轻重类型： 1：轻库位 2：重库位 private Short locType3; private Integer enable; private Integer staCrn; private Integer endCrn; private String identifying; public Integer getStartRow() { if (null == startRow) { throw new CoolException(BaseRes.PARAM); src/main/java/com/zy/common/model/Shelves.java
@@ -37,7 +37,7 @@ public Shelves(int size, int group, int offset) { this.size = size; this.group = group; this.offset = offset; this.offset = offset-1; init(); }
@@ -112,7 +112,7 @@ if(idx >= 0){ strQty.substring(0,idx); } page.newLine(matDto.getMaknx() + "[数量" + strQty +"]"); page.newLine(matDto.getMaktx() + "[数量" + strQty +"]"); // page.newLine(matDto.getMaknx() + "【数量" + matDto.getCount() +"】"); } } src/main/webapp/static/wms/js/locMast/locMast.js
@@ -393,7 +393,7 @@ // 初始化保存 form.on('submit(initDo)', function (data) { $.ajax({ url: baseUrl+"/locMast/init/auth", url: baseUrl+"/locMast/init/auth2", headers: {'token': localStorage.getItem('token')}, data: data.field, method: 'POST', src/main/webapp/views/locMast/locMast.html
@@ -104,6 +104,45 @@ <!-- 重置库位弹窗 --> <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-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"> @@ -149,15 +188,23 @@ <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> <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> <option value="1">低库位</option> <option value="2">高库位</option> </select> </div> </div> @@ -183,9 +230,9 @@ </select> </div> </div> <div id="prompt" style="text-indent: 10px;"> <span class="not-null">初始化库位后将删除库存明细，请谨慎操作！</span> </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> src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -41,16 +41,16 @@ </el-form-item> </el-form> <el-table ref="singleTable" :data="tableData" style="width: 100%;"> <el-table-column label="操作" width="100"> <template slot-scope="scope"> <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}"> <el-button icon="el-icon-more" size="mini" type="primary"></el-button> <el-dropdown-menu slot="dropdown"> <el-dropdown-item command="showCommand">查看指令</el-dropdown-item> </el-dropdown-menu> </el-dropdown> </template> </el-table-column> <!-- <el-table-column label="操作" width="100">--> <!-- <template slot-scope="scope">--> <!-- <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">--> <!-- <el-button icon="el-icon-more" size="mini" type="primary"></el-button>--> <!-- <el-dropdown-menu slot="dropdown">--> <!-- <el-dropdown-item command="showCommand">查看指令</el-dropdown-item>--> <!-- </el-dropdown-menu>--> <!-- </el-dropdown>--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column property="taskNo" label="任务号"> </el-table-column> <el-table-column property="status$" label="任务状态">
