From bd6095e7af86faf7ed0a5ca188775aeac7b031f2 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 09:40:55 +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 | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 e107a13..d108b45 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -270,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);
@@ -283,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<>();
@@ -300,7 +318,7 @@
itemsDTO.setRealdeAmt(item.getRealdeAmt());
itemsDTO.setPlaninAmt(item.getPlaninAmt());
itemsDTO.setRealinAmt(item.getRealinAmt());
- itemsDTO.setType(item.getType());
+ itemsDTO.setType(item.getType$());
//add
Integer type = Integer.parseInt(item.getType());
@@ -373,10 +391,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