From ca0886f59d593821ac6b12ef0e8fd8cf3ff29549 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 09:32:14 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 18 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 efb12a6..d108b45 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -64,16 +64,6 @@
excludeTrash(param);
convert(param, wrapper);
-// HashSet<String> excludeItems = new HashSet<>();
-// excludeItems.add("id");
-// excludeItems.add("item_id");
-// excludeItems.add("weight_num");
-// excludeItems.add("create_time");
-// excludeItems.add("create_id");
-// excludeItems.add("modify_time");
-// excludeItems.add("modify_id");
-//
-// allLike(ProjectPlan.class,excludeItems,wrapper, (String) param.get("id"));
wrapper.orderBy("item_id");
return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -280,8 +270,17 @@
* @return
*/
@RequestMapping("/projectPlan/flowStatus")
- public R flowStatus(){
+ public R flowStatus(
+ @RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param
+ ){
+
EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
wrapper.orderBy("weight_num");
List<FlowStatus> flowStatuses = flowStatusService.selectList(wrapper);
@@ -293,8 +292,17 @@
* @return
*/
@RequestMapping("/projectPlan/toFront")
- public R toFront(){
- List<Item> items = itemService.selectList(new EntityWrapper<Item>()
+ public R toFront(
+ @RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param
+ ){
+ EntityWrapper<Item> itemEntityWrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, itemEntityWrapper);
+ List<Item> items = itemService.selectList(itemEntityWrapper
.eq("status","1"));
List<ItemsDTO> itemsDTOs = new ArrayList<>();
@@ -305,15 +313,67 @@
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);
@@ -322,6 +382,22 @@
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(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