From 641e3e8729273d55f2643a6a1693061bf86ce9ab Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 17:07:10 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 5 ++++-
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 23 +++++++++++++++--------
src/main/webapp/static/js/safeSto/safeSto.js | 1 -
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
index 3be7a28..3bc2464 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -98,21 +98,28 @@
}
}
// 瀹夊叏搴撳瓨璀﹀憡
- List<Map<String, Object>> safeQuaList = jdbcTemplate.queryForList("select \n" +
+ List<Map<String, Object>> safeQuaList = jdbcTemplate.queryForList("select\n" +
"top 5\n" +
"mp.node_id,\n" +
"mp.node_name,\n" +
"mp.matnr,\n" +
"mp.maktx,\n" +
"mp.safe_qua,\n" +
- "mld.anfme,\n" +
- "(mp.safe_qua - isnull(mld.anfme, 0)) as dValue\n" +
+ "ISNULL(ls.amount, 0) as amount,\n" +
+ "(mp.safe_qua - isnull(ls.amount, 0)) as dValue\n" +
"from man_prior mp\n" +
- "left join \n" +
- "(select SUM(anfme) as anfme, node_id from man_loc_detl where 1=1 group by node_id) mld on mp.node_id = mld.node_id\n" +
- "where 1=1 \n" +
- "and mp.safe_qua > mld.anfme or mld.anfme is null\n" +
- "order by (mp.safe_qua - isnull(mld.anfme, 0)) desc");
+ "left join\n" +
+ "(\n" +
+ " select\n" +
+ " node_id,\n" +
+ " matnr,\n" +
+ " sum(anfme) as amount\n" +
+ " from man_loc_detl\n" +
+ " group by node_id, matnr\n" +
+ ") as ls on ls.node_id = mp.node_id and ls.matnr = mp.matnr\n" +
+ "where 1=1\n" +
+ "and mp.safe_qua > ls.amount or ls.amount is null\n" +
+ "order by (mp.safe_qua - isnull(ls.amount, 0)) desc");
for (int i=0;i<safeQuaList.size();i++) {
safeQuaList.get(i).put("no", i+1);
if (Cools.isEmpty(safeQuaList.get(i).get("dValue"))){
diff --git a/src/main/webapp/static/js/safeSto/safeSto.js b/src/main/webapp/static/js/safeSto/safeSto.js
index c1769e1..d53037b 100644
--- a/src/main/webapp/static/js/safeSto/safeSto.js
+++ b/src/main/webapp/static/js/safeSto/safeSto.js
@@ -105,7 +105,6 @@
switch (obj.event) {
// 琛ヤ粨
case 'allot':
- console.log(data)
layer.confirm(data.node_name +'琛ヤ粨 '+ data.matnr + '锛屾暟閲忥細' + (data.safe_qua - data.amount), function(){
var index = layer.load(1, {shade: [0.1,'#000']});
$.ajax({
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 58497b5..0a262e1 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -369,7 +369,10 @@
</div>
</div>
<div class="layui-card">
- <div class="layui-card-header">瀹夊叏搴撳瓨璀﹀憡</div>
+ <div class="layui-card-header">
+ 瀹夊叏搴撳瓨璀﹀憡
+ <button class="layui-btn layui-btn-primary layui-btn-xs" style="float: right; margin: 11px 5px 0 0" lay-href="safeSto/safeSto.html?resourceId=30466" lay-text="瀹夊叏搴撳瓨">鏌ョ湅鏇村</button>
+ </div>
<div class="layui-card-body" id="safeQuaList">
</div>
</div>
--
Gitblit v1.9.1