From 3ed6292b3d3436b880338a86a67d9199225edfb6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 02 十一月 2023 10:09:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 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..5dc97e7 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);
@@ -330,22 +338,30 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
+ Integer owner = null;
+ Integer payment = null;
if (param.get("owner$") != null && param.get("owner$") != ""){
- LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
if(locOwner == null){
return R.error("鍙傛暟鏈夎锛�");
}
param.remove("owner$");
- param.put("owner",locOwner.getId());
+ owner = locOwner.getId();
+ }
+ if (param.get("payment$") != null && param.get("payment$") != ""){
+ if ( param.get("payment$").equals("浠撳偍") ){
+ payment = 1;
+ } else if (param.get("payment$").equals("浠ｉ噰")) {
+ payment = 0;
+ }
+ param.remove("payment$");
}
LocDetlDTO locDetlDTO = new LocDetlDTO();
locDetlDTO.setPageSize(limit);
locDetlDTO.setPageNumber(curr);
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);
}
@@ -373,20 +389,20 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
+ Integer owner = null;
if (param.get("owner$") != null && param.get("owner$") != ""){
- LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
if(locOwner == null){
return R.error("鍙傛暟鏈夎锛�");
}
param.remove("owner$");
- param.put("owner",locOwner.getId());
+ owner = locOwner.getId();
}
LocDetlDTO locDetlDTO = new LocDetlDTO();
locDetlDTO.setPageSize(limit);
locDetlDTO.setPageNumber(curr);
String locNo = String.valueOf(param.get("locNo"));
- String owner = String.valueOf(param.get("owner"));
String matnr = String.valueOf(param.get("matnr"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
locDetlDTO.setLocNo(locNo);
@@ -415,12 +431,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