From f45838dcf659f51112900d5e74a8016ec0d51127 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 13 七月 2023 11:18:48 +0800
Subject: [PATCH] #平库库位查询bug修复
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index b914ab1..fc615fd 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -242,11 +242,20 @@
public R statis(@RequestParam(defaultValue = "1")Integer curr,
@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());
+// 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);
+
+ Page<LocDetlAll> stockStatis = locDetlService.getStockStatisAll(toPage(curr, limit, param, LocDetlAll.class));
+ for (LocDetlAll locDetlAll : stockStatis.getRecords()) {
+ Mat mat = matService.selectByMatnr(locDetlAll.getMatnr());
if (mat != null) {
- locDetl.sync(mat);
+ locDetlAll.sync(mat);
}
}
return R.ok().add(stockStatis);
@@ -281,7 +290,7 @@
*/
@RequestMapping("/locDetl/count")
public R getAllCount(){
- Integer sum = locDetlService.sum();
+ Double sum = locDetlService.sumAll();
return R.ok(sum);
}
--
Gitblit v1.9.1