From d426a65ba84bd4ef3298cb7cda0e9664cc6038e7 Mon Sep 17 00:00:00 2001 From: 18516761980 <4761516tqsxp> Date: 星期四, 13 一月 2022 14:23:30 +0800 Subject: [PATCH] #单据类型区分入库单和出库单 --- 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..0f6e272 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.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