From db4180c88d1aa3b410b719ac2710e70eeb9431d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 16:30:34 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 1fd5337..0535dce 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -69,7 +69,7 @@
for (int i=0;i<combList.size();i++) {
Object create_time = combList.get(i).get("create_time");
combList.get(i).put("time", String.valueOf(create_time).substring(5, 16));
- combList.get(i).put("active", i<3?"active":"");
+ combList.get(i).put("active", String.valueOf(combList.get(i).get("io_status")).equals("4")?"":"active");
}
// 鎷ｈ揣鍗�
List<Map<String, Object>> pakoutList = jdbcTemplate.queryForList("select top 5 * from man_pakout where 1=1 order by create_time desc");
@@ -97,19 +97,20 @@
}
// 瀹夊叏搴撳瓨璀﹀憡
List<Map<String, Object>> safeQuaList = jdbcTemplate.queryForList("select \n" +
- "top 10\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 - mld.anfme) as dValue\n" +
+ "(mp.safe_qua - isnull(mld.anfme, 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" +
- "order by (mp.safe_qua - mld.anfme) desc");
+ "and mp.safe_qua > mld.anfme or mld.anfme is null\n" +
+ "order by (mp.safe_qua - isnull(mld.anfme, 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"))){
--
Gitblit v1.9.1