From 36de27cf6c6010bd2c8a5d1e09f12fc49932f4a9 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 14 一月 2022 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitblit/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 ce70745..1f81ed4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -47,12 +47,22 @@
@RequestParam Map<String, Object> param) {
String target = (String) param.get("items");
param.remove("items");
-
EntityWrapper<ProjectPlan> wrapper = new EntityWrapper<>();
- wrapper.eq("item_id",target);
+ if (target != null && !target.equals("0")){
+ wrapper.eq("item_id",target);
+ }else{
+ List<Item> items = itemService.selectList(new EntityWrapper<Item>()
+ .eq("status", "2"));
+ for (Item item : items) {
+ wrapper.ne("item_id",item.getId());
+ }
+
+ }
excludeTrash(param);
convert(param, wrapper);
- wrapper.orderBy("weight_num");
+
+ wrapper.orderBy("item_id");
+
// if (!Cools.isEmpty(orderByField)) {
// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
@@ -163,7 +173,7 @@
public R allProjects() {
List<Item> items = itemService.selectList(new EntityWrapper<Item>()
- .eq("status","1"));
+ .ne("status","2"));
List<Map<String, Object>> result = new ArrayList<>();
for (Item item : items) {
@@ -293,4 +303,5 @@
}
+
}
--
Gitblit v1.9.1