From f6e0107233bd7fc000b77b3cc9164c5c00b16448 Mon Sep 17 00:00:00 2001 From: 王佳豪 <g675230687@126.com> Date: 星期三, 10 三月 2021 11:19:56 +0800 Subject: [PATCH] 1.0.5 1.增加平仓入库功能 2.优化平仓管理出入库状态查询功能 --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index a9bbe09..4dad1f7 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -83,8 +83,13 @@ @RequestParam(required = false)String orderByType, @RequestParam(required = false)String condition, @RequestParam Map<String, Object> param){ + excludeTrash(param); EntityWrapper<LocDetl> wrapper = new EntityWrapper<>(); + if ("0".equals(param.get("mat_status"))) { + wrapper.isNull("mat_status"); + param.remove("mat_status"); + } convert(param, wrapper); allLike(LocDetl.class, param.keySet(), wrapper, condition); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} -- Gitblit v1.9.1