From af11d4845251da536d564a82fa019b4306875da9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 29 五月 2021 14:48:54 +0800
Subject: [PATCH] Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms
---
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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 fad4062..e07d7cb 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -46,6 +46,7 @@
Integer usersQty = jdbcTemplate.queryForObject("select count(*) from sys_user", Integer.class);
Integer deptQty = jdbcTemplate.queryForObject("select count(*) from sys_dept", Integer.class);
+ Integer optQty = jdbcTemplate.queryForObject("select count(*) from sys_operate_log", Integer.class);
return R.ok().add(Cools
.add("combQtyDay", Optional.ofNullable(combQtyDay).orElse(0)) // 缁勬墭鏁伴噺(褰撳ぉ锛�
@@ -59,6 +60,7 @@
.add("usersQty", Optional.ofNullable(usersQty).orElse(0)) // 鐢ㄦ埛鏁伴噺
.add("deptQty", Optional.ofNullable(deptQty).orElse(0)) // 閮ㄩ棬鏁伴噺
+ .add("optQty", Optional.ofNullable(optQty).orElse(0)) // 鎿嶄綔娆℃暟
);
}
@@ -69,7 +71,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");
@@ -96,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"))){
@@ -118,10 +127,10 @@
}
}
// 搴撳瓨婊炵暀
- 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");
+ List<Map<String, Object>> retentionList = jdbcTemplate.queryForList("select top 7 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");
+ Object create_time = retentionList.get(i).get("create_time");
retentionList.get(i).put("createTime", String.valueOf(create_time).substring(0, 11));
}
--
Gitblit v1.9.1