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 | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 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 2f91219..e834291 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -31,6 +31,7 @@
@Autowired
private LocDetlService locDetlService;
+
@Autowired
private LocDetlMapper locDetlMapper;
@Autowired
@@ -56,9 +57,27 @@
if (!locNos.isEmpty()) {
List<LocDetl> res = new ArrayList<>();
for (String locNo : new HashSet<>(locNos)) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
- if (!locDetls.isEmpty()) {
- res.addAll(locDetls);
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ if (!locDetls.isEmpty()) {
+ res.addAll(locDetls);
+ }
+ }
+ return R.ok().add(res);
+ }
+ return R.parse(BaseRes.EMPTY);
+ }
+
+ @RequestMapping(value = "/locDetlOut/auth")
+ @ManagerAuth
+ 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).eq("loc_no",locNo));
+ if (!locDetls.isEmpty()) {
+ res.addAll(locDetls);
+ }
}
}
return R.ok().add(res);
@@ -80,10 +99,14 @@
param.remove("modi_time");
}
}
- return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
+ Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ if (stockOut.getRecords().size()==0){
+ stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
+ }
+ return R.ok(stockOut);
}
- @RequestMapping(value = "/locDetl/list/auth")
+ @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -103,6 +126,8 @@
// param.remove("row");
// }
// }
+ Object query_date = param.get("query_date");
+ param.remove("query_date");
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
@@ -111,8 +136,15 @@
// wrapper.and()
// .where("loc_no like '" +row +"%'");
// }
+ if (query_date!=null){
+ if (query_date.toString().contains(" - ")) {
+ String[] dates = query_date.toString().split(" - ");
+ wrapper.ge("appe_time", dates[0]).le("appe_time",dates[1]);
+ }
+ }
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -225,12 +257,6 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
- for (LocDetl locDetl : stockStatis.getRecords()) {
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (mat != null) {
- locDetl.sync(mat);
- }
- }
return R.ok().add(stockStatis);
}
--
Gitblit v1.9.1