From 84334c663dba00af90b4a3ffe86a4d321f8d5deb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 九月 2023 16:23:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 fc615fd..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);
@@ -345,6 +353,7 @@
String locNo = String.valueOf(param.get("locNo"));
String owner = String.valueOf(param.get("owner"));
String matnr = String.valueOf(param.get("matnr"));
+ String payment = String.valueOf(param.get("payment"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
locDetlDTO.setLocNo(locNo);
}
@@ -353,6 +362,9 @@
}
if (!Cools.isEmpty(owner) && !owner.equals("null")) {
locDetlDTO.setOwner(owner);
+ }
+ if (!Cools.isEmpty(payment) && !payment.equals("null")) {
+ locDetlDTO.setPayment(payment);
}
List<LocDetlAll> list = locDetlService.selectAllPyment(locDetlDTO);
int count = locDetlService.selectAllPymentcount(locDetlDTO);
@@ -398,8 +410,26 @@
Page<LocDetlAll> page = new Page<>();
page.setRecords(list);
page.setTotal(count);
+ if (list.size()==0){
+ locDetlDTO.setPageNumber(1);
+ list = locDetlService.selectAllOwner(locDetlDTO);
+ count = locDetlService.selectAllCount(locDetlDTO);
+ page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ }
return R.ok(page);
}
+ @RequestMapping(value = "/locDetl/selectLocF")
+ @ManagerAuth
+ public R selectLocF(@RequestParam String locNo){
+ String s = locDetlService.selectLocNoF(locNo);
+ if (s.equals("F")){
+ return R.error("褰撳墠搴撲綅涓嶆槸绌哄簱浣�");
+ }
+ return R.ok("褰撳墠搴撲綅鏄┖搴撲綅");
+ }
+
}
--
Gitblit v1.9.1