From 5ec06e72f39cae4dd599af6aa798c84c1919528b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 15:00:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 218 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 179 insertions(+), 39 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 6c63f2c..d604117 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -18,6 +18,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@@ -29,6 +32,7 @@
private ItemService itemService;
@Autowired
private FlowStatusService flowStatusService;
+
@RequestMapping(value = "/projectPlan/{id}/auth")
@ManagerAuth
@@ -121,6 +125,25 @@
projectPlan.setModifyTime(new Date());
projectPlan.setModifyId(getUserId());
+ projectPlanService.updateById(projectPlan);
+ return R.ok();
+ }
+
+ @RequestMapping("/projectPlan/update/homepage")
+ public R updateByHomepage(@RequestParam HashMap<String,Object> param){
+ String itemId = (String) param.get("itemId");
+ String weightNum = (String) param.get("weightNum");
+ String realStartTime = (String) param.get("realStartTime");
+ String realEndTime = (String) param.get("realEndTime");
+ ProjectPlan projectPlan = projectPlanService.selectOne(new EntityWrapper<ProjectPlan>()
+ .eq("item_id", itemId)
+ .eq("weight_num", weightNum));
+ try {
+ projectPlan.setRealStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realStartTime));
+ projectPlan.setRealEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realEndTime));
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
projectPlanService.updateById(projectPlan);
return R.ok();
}
@@ -270,52 +293,167 @@
* @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);
return R.ok().add(flowStatuses);
}
+
+ /**
+ * 杩旂粰鏉ㄦ垚寮哄墠绔�
+ */
+ @RequestMapping("/projectPlan/toFront/asrs")
+ public R toFrontAsrs(){
+ EntityWrapper<Item> wrapper = new EntityWrapper<>();
+ wrapper.eq("type",10);
+ List<Item> itemsArray = itemService.selectList(wrapper);
+ ArrayList<ItemDTO> itemDtos = new ArrayList<>();
+ for (Item item : itemsArray) {
+ ItemDTO itemDto = new ItemDTO();
+ itemDto.setProjectName(item.getName());
+ itemDto.setProjectType(item.getType$());
+ itemDto.setProjectStartTime(item.getStartTime$());
+ itemDto.setProjectEndTime(item.getEndTime$());
+ List<ProjectPlan> projectPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
+ .eq("item_id", item.getId())
+ .orderBy("weight_num", true));
+ itemDto.setProjectPlans(projectPlans);
+ itemDtos.add(itemDto);
+ }
+ return R.ok().add(itemDtos);
+
+
+ }
+ @RequestMapping("/projectPlan/toFront/common")
+ public R toFrontCommon(){
+ EntityWrapper<Item> wrapper = new EntityWrapper<>();
+ wrapper.ne("type",10);
+ List<Item> itemsArray = itemService.selectList(wrapper);
+ ArrayList<ItemDTO> itemDtos = new ArrayList<>();
+ for (Item item : itemsArray) {
+ ItemDTO itemDto = new ItemDTO();
+ itemDto.setProjectName(item.getName());
+ itemDto.setProjectType(item.getType$());
+ itemDto.setProjectStartTime(item.getStartTime$());
+ itemDto.setProjectEndTime(item.getEndTime$());
+ List<ProjectPlan> projectPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
+ .eq("item_id", item.getId())
+ .orderBy("weight_num", true));
+ itemDto.setProjectPlans(projectPlans);
+ itemDtos.add(itemDto);
+ }
+ return R.ok().add(itemDtos);
+
+
+ }
+
/**
* 杩斿洖缁欏皬鏉ㄥ墠绔暟鎹�
+ * 鏃х増鏈�,宸插純鐢�
* @return
*/
- @RequestMapping("/projectPlan/toFront")
- public R toFront(){
- List<Item> items = itemService.selectList(new EntityWrapper<Item>()
- .eq("status","1"));
- List<ItemsDTO> itemsDTOs = new ArrayList<>();
-
- for (Item item : items) {
-
- ItemsDTO itemsDTO = new ItemsDTO();
- List<FlowsDTO> flows = new ArrayList<>();
- 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());
- 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$());
- flows.add(flowsDTO);
- }
- itemsDTO.setNodes(flows);
- itemsDTOs.add(itemsDTO);
- }
- return R.ok().add(itemsDTOs);
- }
+// @RequestMapping("/projectPlan/toFront/old")
+// public R toFrontOld(
+// @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<ItemDTO> itemDTOS = new ArrayList<>();
+//
+// for (Item item : items) {
+//
+// ItemDTO itemDTO = new ItemDTO();
+// List<FlowsDTO> flows = new ArrayList<>();
+// itemDTO.setId(item.getName());
+// itemDTO.setStartDay(item.getStartTime$());
+// itemDTO.setEndDay(item.getEndTime$());
+// itemDTO.setPresaleAmt(item.getPresaleAmt());
+// itemDTO.setPlandeAmt(item.getPlandeAmt());
+// itemDTO.setRealdeAmt(item.getRealdeAmt());
+// itemDTO.setPlaninAmt(item.getPlaninAmt());
+// itemDTO.setRealinAmt(item.getRealinAmt());
+// itemDTO.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$());
+// 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);
+// }
+// itemDTO.setNodes(flows);
+// itemDTOS.add(itemDTO);
+// }
+// return R.ok().add(itemDTOS);
+// }
/**
* 椤圭洰姹囨�绘暟鎹�
@@ -326,10 +464,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