From efbeaaa761669c49507cbff449b2242f374cfa8a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 20 九月 2023 13:58:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 746b520..81f7717 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -112,11 +112,19 @@
// }
excludeTrash(param);
String locNo = convert(param, wrapper);
+ String zpallet = String.valueOf( param.get("zpallet"));
+ String matnr = String.valueOf( param.get("matnr"));
+ if (!Cools.isEmpty(zpallet) && zpallet.equals("null")) {
+ zpallet = null;
+ }
+ if (!Cools.isEmpty(matnr) && matnr.equals("null")) {
+ matnr = null;
+ }
allLike(LocDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
if (Cools.isEmpty(locDetlPage) || locDetlPage.getTotal()==0){
- List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo);
+ List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo,zpallet,matnr);
return R.ok(locDetlPage.setRecords(locDetls));
}else {
return R.ok(locDetlPage);
@@ -415,12 +423,12 @@
@RequestMapping(value = "/locDetl/selectLocF")
@ManagerAuth
- public Boolean selectLocF(@RequestParam String locNo){
+ public R selectLocF(@RequestParam String locNo){
String s = locDetlService.selectLocNoF(locNo);
if (s.equals("F")){
- return false;
+ return R.error("褰撳墠搴撲綅涓嶆槸绌哄簱浣�");
}
- return true;
+ return R.ok("褰撳墠搴撲綅鏄┖搴撲綅");
}
--
Gitblit v1.9.1