From a75b2d52ab0dcdb180705727dd2176bc5094d3a9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 12 三月 2021 09:26:24 +0800
Subject: [PATCH] 1.0.3 优化平仓管理，增加id主键传入，出库权限判断，增加出库和移除确认弹窗
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 9 +++++++--
1 files changed, 7 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 a9bbe09..10d09bf 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));}
@@ -189,7 +194,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