From f3ed1f9e98e13b9fb631e2fab851be15b7dde206 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 08:41:48 +0800
Subject: [PATCH] Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index b3bb6a0..a379794 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -300,6 +300,7 @@
itemsDTO.setRealdeAmt(item.getRealdeAmt());
itemsDTO.setPlaninAmt(item.getPlaninAmt());
itemsDTO.setRealinAmt(item.getRealinAmt());
+ itemsDTO.setType(item.getType());
List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
.eq("item_id", item.getId()));
for (ProjectPlan projectPlan : allPlans) {
@@ -317,6 +318,20 @@
return R.ok().add(itemsDTOs);
}
-
+ /**
+ * 椤圭洰姹囨�绘暟鎹�
+ */
+ @RequestMapping("/projectPlan/dataSummary")
+ public R dataSummary(){
+ dataSummary data = new dataSummary();
+ Wrapper<Item> wrapper = new EntityWrapper<>();
+ data.setTotalQuantity(itemService.selectCount(wrapper));//椤圭洰鎬诲叡鏁伴噺
+ data.setIntoSum(itemService.selectCount(wrapper.eq("type","10")));//闆嗘垚椤圭洰鏁�
+ data.setWrongInto(itemService.selectCount(wrapper.ne("type","10")));//闈為泦鎴愰」鐩暟
+ data.setInspected(itemService.selectCount(wrapper.eq("realLADate","").and().eq("realLADate",null)));//宸查獙鏀堕」鐩暟閲�
+ data.setWrongInspected(itemService.selectCount(wrapper.ne("realLADate",null)));//鏈獙鏀堕」鐩暟閲�
+ data.setFinished(itemService.selectCount(wrapper.ne("realinDate", null).eq("realLADate", null)));//宸插畬宸ユ湭楠屾敹鏁伴噺
+ return R.ok().add(data);
+ }
}
--
Gitblit v1.9.1