| src/main/java/zy/cloud/wms/common/service/MainService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/zy/cloud/wms/manager/service/LocDetlService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/LocDetlMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/home/console.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -73,9 +73,16 @@ if (!pakoutService.insert(pakout)) { throw new CoolException("保存出库通知单失败"); } // 修改库存明细数量 if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued)) { throw new CoolException("修改库存明细数量失败"); if (issued>=locDetl.getAnfme()) { // 删除库存明细 if (!locDetlService.removeStock(locDetl.getNodeId(), mat.getMatnr())) { throw new CoolException("删除库存明细失败"); } } else { // 修改库存明细数量 if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued)) { throw new CoolException("修改库存明细数量失败"); } } // 剩余待出数量递减 issued = issued - locDetl.getAnfme(); src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -113,11 +113,20 @@ for (int i=0;i<safeQuaList.size();i++) { safeQuaList.get(i).put("no", i+1); } // 库存滞留 List<Map<String, Object>> retentionList = jdbcTemplate.queryForList("select top 6 CONVERT(decimal, DATEDIFF(second, man_loc_detl.create_time, GETDATE()) / 86400.0, 9) AS stayDays, * from man_loc_detl order by create_time desc"); for (int i=0;i<retentionList.size();i++) { retentionList.get(i).put("no", i+1); Object create_time = combList.get(i).get("create_time"); retentionList.get(i).put("createTime", String.valueOf(create_time).substring(0, 11)); } return R.ok().add(Cools .add("combList", combList) // 组托最新动态 .add("pakoutList", pakoutList) // 最新拣货单 .add("safeQuaList", safeQuaList) // 安全库存警告 .add("retentionList", retentionList) // 库存滞留数据 ); }
@@ -21,6 +21,8 @@ Integer reduceStock(@Param("nodeId") Long nodeId, @Param("matnr") String matnr, @Param("anfme") Double anfme); Integer removeStock(@Param("nodeId") Long nodeId, @Param("matnr") String matnr); List<LocDetl> selectByPrior(@Param("matnr") String matnr, @Param("nodeId") Long nodeId); } src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
@@ -25,4 +25,12 @@ */ Boolean reduceStock(Long nodeId, String matnr, Double anfme); /** * 删除库存 * @param nodeId * @param matnr * @return */ Boolean removeStock(Long nodeId, String matnr); } src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
@@ -82,5 +82,11 @@ return this.baseMapper.reduceStock(nodeId, matnr, anfme)>0; } @Override public Boolean removeStock(Long nodeId, String matnr) { return this.baseMapper.removeStock(nodeId, matnr)>0; } } src/main/resources/mapper/LocDetlMapper.xml
@@ -76,6 +76,13 @@ and matnr = #{matnr} </update> <update id="removeStock"> delete from man_loc_detl where 1=1 and node_id = #{nodeId} and matnr = #{matnr} </update> <select id="selectByPrior" resultMap="BaseResultMap"> select mld.* src/main/webapp/views/home/console.html
@@ -306,91 +306,19 @@ <col/> <col/> <col/> <col width="160"/> <col width="300"/> </colgroup> <thead> <tr> <td></td> <td>项目名称</td> <td align="center">开始时间</td> <td align="center">截至时间</td> <td align="center">状态</td> <td align="center">进度</td> <td align="center">货位</td> <td align="center">置入时间</td> <td align="center">滞留天数</td> <td align="center">商品编码</td> <td align="center">商品名称</td> </tr> </thead> <tbody> <tr> <td>1</td> <td><span class="layui-text"><a>仓库管理系统</a></span></td> <td align="center">2020-03-01</td> <td align="center">2020-06-01</td> <td align="center"><span class="text-success">进行中</span></td> <td> <div class="layui-progress" lay-showPercent="yes"> <div class="layui-progress-bar" lay-percent="30%"></div> </div> </td> </tr> <tr> <td>2</td> <td><span class="layui-text"><a>档案管理系统</a></span></td> <td align="center">2020-03-01</td> <td align="center">2020-08-01</td> <td align="center"><span class="text-success">进行中</span></td> <td> <div class="layui-progress" lay-showPercent="yes"> <div class="layui-progress-bar" lay-percent="10%"></div> </div> </td> </tr> <tr> <td>3</td> <td><span class="layui-text"><a>后台管理系统</a></span></td> <td align="center">2020-01-01</td> <td align="center">2020-05-01</td> <td align="center"><span class="text-danger">已延期</span></td> <td> <div class="layui-progress" lay-showPercent="yes"> <div class="layui-progress-bar" lay-percent="60%"></div> </div> </td> </tr> <tr> <td>4</td> <td><span class="layui-text"><a>粮情监测系统</a></span></td> <td align="center">2020-06-01</td> <td align="center">2020-10-01</td> <td align="center"><span class="text-warning">未开始</span></td> <td> <div class="layui-progress" lay-showPercent="yes"> <div class="layui-progress-bar" lay-percent="0%"></div> </div> </td> </tr> <tr> <td>5</td> <td><span class="layui-text"><a>项目00000001</a></span></td> <td align="center">2020-01-01</td> <td align="center">2020-04-01</td> <td align="center"><span class="text-muted">已完成</span></td> <td> <div class="layui-progress" lay-showPercent="yes"> <div class="layui-progress-bar" lay-percent="90%"></div> </div> </td> </tr> <tr> <td>6</td> <td><span class="layui-text"><a>项目00000002</a></span></td> <td align="center">2020-01-01</td> <td align="center">2020-03-01</td> <td align="center"><span class="text-muted">已完成</span></td> <td> <div class="layui-progress" lay-showPercent="yes"> <div class="layui-progress-bar" lay-percent="100%"></div> </div> </td> </tr> <tbody id="retentionList"> </tbody> </table> </div> @@ -550,6 +478,11 @@ var template3 = Handlebars.compile(tpl3); var html3 = template3(res.data); $('#safeQuaList').append(html3); // 库存滞留 var tpl4 = $('#retentionTpl').html(); var template4 = Handlebars.compile(tpl4); var html4 = template4(res.data); $('#retentionList').append(html4); } else if (res.code === 403) { top.location.href = baseUrl + "/"; } else { @@ -597,5 +530,19 @@ </div> {{/each}} </script> <script type="text/template" id="retentionTpl"> {{#each retentionList}} <tr> <td>{{no}}</td> <td align="center"><span class="layui-text"><a>{{loc_no}}</a></span></td> <td align="center">{{createTime}}</td> <td align="center"><span style="font-weight: bold">{{stayDays}}</span> 天</td> <td align="center"><span class="text-success">{{matnr}}</span></td> <td align="center"> <span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{maktx}}</span> </td> </tr> {{/each}} </script> </body> </html>
