From 6b14a5e769e992967c224ee68b6e2dc88717e993 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 17 七月 2023 14:45:58 +0800
Subject: [PATCH] #数字孪生获取数据
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 9 +++++++++
src/main/java/com/zy/asrs/entity/param/DigitalTwin.java | 18 ++++++++++++------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 16 ++++++++++++++++
3 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java b/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java
index 647e8a9..939e317 100644
--- a/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java
+++ b/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java
@@ -11,12 +11,18 @@
private int oqty;//绌哄簱浣�
private int uqty;//浣跨敤搴撲綅
private int xqty;//绂佺敤搴撲綅
-// private Integer artificialWarehousecount; //骞冲簱鎬婚噺
-// private Integer automatedWarehousecount; //绔嬪簱鎬婚噺
-// private Integer artificialWarehouseF; //骞冲簱闈炵┖鎬婚噺
-// private Integer automatedWarehouseF; //绔嬪簱闈炵┖鎬婚噺
-// private Integer artificialWarehouseO; //骞冲簱绌烘�婚噺
-// private Integer automatedWarehouseO; //绔嬪簱绌烘�婚噺
+
+ private Integer countL; //鎬婚噺
+ private int fqtyL; //绔嬪簱鍦ㄥ簱搴撲綅
+ private int oqtyL;//绔嬪簱绌哄簱浣�
+ private int uqtyL;//绔嬪簱浣跨敤搴撲綅
+ private int xqtyL;//绔嬪簱绂佺敤搴撲綅
+
+ private Integer countP; //鎬婚噺
+ private int fqtyP; //骞冲簱鍦ㄥ簱搴撲綅
+ private int oqtyP;//骞冲簱绌哄簱浣�
+ private int uqtyP;//骞冲簱浣跨敤搴撲綅
+ private int xqtyP;//骞冲簱绂佺敤搴撲綅
public DigitalTwin(){}
public DigitalTwin(Integer count){
this.count=count;
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 41fe703..c8e20c1 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -64,6 +64,15 @@
//楗肩姸鍥�
@Select("select * from asr_loc_use_view")
public LocChartPie getLocUseRate();
+
+ //绔嬪簱鏁版嵁
+ @Select("select * from asr_loc_use_view_L")
+ public LocChartPie getLocUseRateL();
+
+ //骞冲簱鏁版嵁
+ @Select("select * from asr_loc_use_view_P")
+ public LocChartPie getLocUseRateP();
+
//鏇茬嚎鍥�
@Select("select ymd,SUM(sto_qty) inqty,SUM(ret_qty) outqty from asr_sta_inout_view "
+ "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4bdab86..ab1d3b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -514,6 +514,8 @@
public DigitalTwin inventoryQuantity() {
DigitalTwin digitalTwin = new DigitalTwin();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ LocChartPie locUseRateL = reportQueryMapper.getLocUseRateL();
+ LocChartPie locUseRateP = reportQueryMapper.getLocUseRateP();
if(locUseRate!=null) {
digitalTwin.setCount(locUseRate.getOqty()+locUseRate.getFqty()+locUseRate.getUqty()+locUseRate.getXqty());
digitalTwin.setOqty(locUseRate.getOqty());
@@ -521,6 +523,20 @@
digitalTwin.setUqty(locUseRate.getUqty());
digitalTwin.setXqty(locUseRate.getXqty());
}
+ if(locUseRateL!=null) {
+ digitalTwin.setCountL(locUseRateL.getOqty()+locUseRateL.getFqty()+locUseRateL.getUqty()+locUseRateL.getXqty());
+ digitalTwin.setOqtyL(locUseRateL.getOqty());
+ digitalTwin.setFqtyL(locUseRateL.getFqty());
+ digitalTwin.setUqtyL(locUseRateL.getUqty());
+ digitalTwin.setXqtyL(locUseRateL.getXqty());
+ }
+ if (locUseRateP!=null){
+ digitalTwin.setCountP(locUseRateP.getOqty()+locUseRateP.getFqty()+locUseRateP.getUqty()+locUseRateP.getXqty());
+ digitalTwin.setOqtyP(locUseRateP.getOqty());
+ digitalTwin.setFqtyP(locUseRateP.getFqty());
+ digitalTwin.setUqtyP(locUseRateP.getUqty());
+ digitalTwin.setXqtyP(locUseRateP.getXqty());
+ }
return digitalTwin;
}
--
Gitblit v1.9.1