src/main/java/com/zy/common/web/WcsController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/agvWrkMast/wrkMast.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/common/web/WcsController.java
@@ -686,6 +686,9 @@ public R containerMove(@RequestBody ReplenishmentParam param){ String devNo = param.getDevNo(); if(Cools.isEmpty(currentContainerMap)){ currentContainerMap = new HashMap<>(); } String containerCode = currentContainerMap.get(devNo); AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto(); @@ -723,10 +726,10 @@ agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList); } System.out.println("currentContainerMap: " + currentContainerMap); //System.out.println("currentContainerMap: " + currentContainerMap); System.out.println("agvBasDevpDto: " + agvBasDevpDto); //System.out.println("agvBasDevpDto: " + agvBasDevpDto); return R.ok(agvBasDevpDto); } src/main/webapp/views/agvWrkMast/wrkMast.html
@@ -104,7 +104,7 @@ <div class="layui-btn-container"> <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon"></i>增加优先级</button> <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon"></i>降低优先级</button> <button class="layui-btn layui-btn-primary" id="btn-startWrk" lay-event="startWrk">开始任务</button> <button class="layui-btn layui-btn-primary" id="btn-startWrk" lay-event="startWrk" style="display: none">开始任务</button> <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button> </div> </script>