From b78ae7e1682002001305bb5a300785f14aca27f9 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 23 十月 2025 10:54:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 8 +++++---
src/main/webapp/views/pakStore/locDetlQuery.html | 13 ++++++-------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index f061841..e834291 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -69,15 +69,17 @@
@RequestMapping(value = "/locDetlOut/auth")
@ManagerAuth
- public R stockOutListAll(@RequestParam(value = "matnrs[]",required = false) List<String> matnrs){
- if (!matnrs.isEmpty()) {
+ public R stockOutListAll(@RequestParam(value = "locNos[]") List<String> locNos,@RequestParam(value = "matnrs[]",required = false) List<String> matnrs){
+ if (!locNos.isEmpty()&&!matnrs.isEmpty()) {
List<LocDetl> res = new ArrayList<>();
+ for (String locNo : new HashSet<>(locNos)) {
for (String matnr : new HashSet<>(matnrs)) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr",matnr));
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr",matnr).eq("loc_no",locNo));
if (!locDetls.isEmpty()) {
res.addAll(locDetls);
}
}
+ }
return R.ok().add(res);
}
return R.parse(BaseRes.EMPTY);
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index f47d520..605e5b3 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -192,17 +192,16 @@
layer.msg("璇烽�夋嫨鏁版嵁", {icon: 2});
return;
}
- // let locNos = [];
+ let locNos = [];
let matnrs = [];
- // data.forEach(function(elem) {
- // // locNos.push(elem.locNo);
- // matnrs.push(elem.matnr);
- // });
+ data.forEach(function(elem) {
+ locNos.push(elem.locNo);
+ matnrs.push(elem.matnr);
+ });
$.ajax({
url: baseUrl+"/locDetlOut/auth",
headers: {'token': localStorage.getItem('token')},
- // data: {locNos:locNos,matnrs:matnrs},
- data: {matnrs},
+ data: {locNos:locNos,matnrs:matnrs},
method: 'POST',
async: false,
success: function (res) {
--
Gitblit v1.9.1