From 11aa35cf9d5c94d9715b2914212fd26465c29da9 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 18 四月 2022 08:56:17 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 9 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 36943a1..f292bf4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -295,19 +295,70 @@
itemsDTO.setId(item.getName());
itemsDTO.setStartDay(item.getStartTime$());
itemsDTO.setEndDay(item.getEndTime$());
+ itemsDTO.setPresaleAmt(item.getPresaleAmt());
+ itemsDTO.setPlandeAmt(item.getPlandeAmt());
+ itemsDTO.setRealdeAmt(item.getRealdeAmt());
+ itemsDTO.setPlaninAmt(item.getPlaninAmt());
+ itemsDTO.setRealinAmt(item.getRealinAmt());
+ itemsDTO.setType(item.getType$());
+
+ //add
+ Integer type = Integer.parseInt(item.getType());
+
List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
.eq("item_id", item.getId()));
for (ProjectPlan projectPlan : allPlans) {
FlowsDTO flowsDTO = new FlowsDTO();
flowsDTO.setName(projectPlan.getFlowId$());
- flowsDTO.setStartTime(projectPlan.getStartTime$());
- flowsDTO.setEndTime$(projectPlan.getEndTime$());
- flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
- flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ if(type==5) {
+ if(projectPlan.getFlowId()>=8 && projectPlan.getFlowId()<11){
+ flowsDTO.setStartTime("-");
+ flowsDTO.setEndTime$("-");
+ }else{
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
+ }else if(type==1 || type==2 || type==6 || type==9) {
+ if((projectPlan.getFlowId()>=8&&projectPlan.getFlowId()<11) || projectPlan.getFlowId()==2 || projectPlan.getFlowId()==6){
+ flowsDTO.setStartTime("-");
+ flowsDTO.setEndTime$("-");
+ }else{
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
+ }else if(type==3 || type==8){
+ if((projectPlan.getFlowId()>=8&&projectPlan.getFlowId()<11) || projectPlan.getFlowId()==6){
+ flowsDTO.setStartTime("-");
+ flowsDTO.setEndTime$("-");
+ }else{
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
+ } else if(type==4){
+ if((projectPlan.getFlowId()>=8&&projectPlan.getFlowId()<11) || projectPlan.getFlowId()==6){
+ flowsDTO.setStartTime("-");
+ flowsDTO.setEndTime$("-");
+ }else{
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
+ }else if(type==10){
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
flows.add(flowsDTO);
}
itemsDTO.setNodes(flows);
- itemsDTO.setItems(items);
itemsDTOs.add(itemsDTO);
}
return R.ok().add(itemsDTOs);
@@ -322,10 +373,12 @@
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)));//宸插畬宸ユ湭楠屾敹鏁伴噺
+ data.setWrongInto(data.getTotalQuantity()-data.getIntoSum());//闈為泦鎴愰」鐩暟
+ List<Item> list = itemService.inspected();
+ data.setInspected(list.size());//宸查獙鏀堕」鐩暟閲�
+ data.setWrongInspected(data.getTotalQuantity()-data.getInspected());//鏈獙鏀堕」鐩暟閲�
+ List<Item> lists = itemService.finished();
+ data.setFinished(lists.size());//宸插畬宸ユ湭楠屾敹鏁伴噺
return R.ok().add(data);
}
--
Gitblit v1.9.1