From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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..7a45480 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -68,6 +68,14 @@
param.remove("modi_time");
}
}
+ /* 閫氱煡鍗曞彿涓虹┖锛屽垹闄ゅ叆鍙傞�氱煡鍗曞彿supplier */
+ if (Cools.isEmpty(param.get("supplier"))) {
+ param.remove("supplier");
+ }
+ /* 鐢熶骇鍗曞彿涓虹┖锛屽垹闄ょ敓浜у崟鍙穡arehouse */
+ if (Cools.isEmpty(param.get("warehouse"))) {
+ param.remove("warehouse");
+ }
return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
@@ -79,8 +87,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));}
@@ -185,7 +198,7 @@
*/
@RequestMapping(value = "/locDetl/getAllLocDetlData")
@ManagerAuth
- public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String matStatusFlag) {
- return locDetlService.getAllLocDetlData(loc_no, matnr, matStatusFlag);
+ public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String mat_status) {
+ return locDetlService.getAllLocDetlData(loc_no, matnr, mat_status);
}
}
--
Gitblit v1.9.1