From b43d307ac60607bcc556ca52c54cee0176b66273 Mon Sep 17 00:00:00 2001
From: DELL <56479841@qq.com>
Date: 星期五, 06 五月 2022 14:54:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index da624a0..5be8bc0 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -63,6 +63,7 @@
@ManagerAuth
public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
+// @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
if (!Cools.isEmpty(param.get("modi_time"))){
String val = String.valueOf(param.get("modi_time"));
@@ -124,7 +125,7 @@
value= (String) param.get(s);
}
LocMast loc_no = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", value));
- if (loc_no.getLocSts().equals("O")||loc_no.getLocSts().equals("F")){
+ if (loc_no.getLocSts().equals("O")||loc_no.getLocSts().equals("D")||loc_no.getLocSts().equals("F")){
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
--
Gitblit v1.9.1