From da3528953feea71e85a8e6d2ccdd56d423e4f6e3 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 09 三月 2021 10:16:26 +0800
Subject: [PATCH] 1.0.4 库物料状态维护-新增待检状态的物料查询
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 9 +++++++++
1 files changed, 9 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 020b83c..4dad1f7 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -68,6 +68,10 @@
param.remove("modi_time");
}
}
+ /* 閫氱煡鍗曞彿涓虹┖锛屽垹闄ゅ叆鍙傞�氱煡鍗曞彿supplier */
+ if (Cools.isEmpty(param.get("supplier"))) {
+ param.remove("supplier");
+ }
return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
@@ -79,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