From 6ced774977791ce511d1af9f017288438f85ec54 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 六月 2021 11:33:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index de77a91..526274e 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -72,9 +72,9 @@
if (Cools.isEmpty(param.get("supplier"))) {
param.remove("supplier");
}
- /* 鐢熸垚鍗曞彿涓虹┖锛屽垹闄ょ敓鎴愬崟鍙穡arehouse */
- if (Cools.isEmpty(param.get("warehouse"))) {
- param.remove("warehouse");
+ /* 鐢熶骇鍗曞彿涓虹┖锛屽垹闄ょ敓浜у崟鍙穡arehouse */
+ if (Cools.isEmpty(param.get("mnemonic"))) {
+ param.remove("mnemonic");
}
return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
@@ -192,13 +192,24 @@
/**
* 鎵归噺淇敼鐗╂枡鐘舵��
- * @param loc_no
- * @param matnr
* @return
*/
@RequestMapping(value = "/locDetl/getAllLocDetlData")
- @ManagerAuth
- public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String mat_status) {
- return locDetlService.getAllLocDetlData(loc_no, matnr, mat_status);
+ @ManagerAuth(memo = "鎵归噺淇敼鐗╂枡鐘舵��")
+ public R getAllLocDetlData(@RequestBody JSONObject param) {
+ List<LocDetl> list = JSONObject.parseArray(param.getJSONArray("list").toJSONString(), LocDetl.class);
+ Integer result = locDetlService.getAllLocDetlData(list);
+ return R.ok().add(result);
+ }
+
+ /**
+ * 鏌ヨ鎬诲簱瀛橈紙绔嬪簱+骞充粨锛�
+ */
+ @RequestMapping(value = "/locDetl/queryAllMatDetl")
+ @ManagerAuth(memo = "鏌ヨ鎬诲簱瀛�")
+ public R queryAllMatDetl(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param) {
+ return R.ok(locDetlService.queryAllMatDetl(toPage(curr, limit, param, LocDetl.class)));
}
}
--
Gitblit v1.9.1