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 | 8 ++++++--
1 files changed, 6 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 4dad1f7..7a45480 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -72,6 +72,10 @@
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)));
}
@@ -194,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