From 0dd24ca8ed10ed9cf94bcc4e73389958bc86f932 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 13:29:29 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 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 84d2c52..daebb99 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -95,11 +95,38 @@
                 pakoutList.get(i).put("wrkStsName", wrkSts.getStsName());
             }
         }
+        // 瀹夊叏搴撳瓨璀﹀憡
+        List<Map<String, Object>> safeQuaList = jdbcTemplate.queryForList("select \n" +
+                "top 10\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" +
+                "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");
+        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) // 搴撳瓨婊炵暀鏁版嵁
         );
     }
 

--
Gitblit v1.9.1