From 36d1eb6827686c92012344e0f4a40f6fa9494edf Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 29 十月 2022 16:46:47 +0800
Subject: [PATCH] #异常库存合并
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 1eadc60..78453a7 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -298,8 +298,9 @@
// excludeTrash(param);
param.put("curr", curr);
param.put("limit", limit);
- List<LocDetl> groupLocDetl = locDetlService.selectGroupPage(param, curr, limit);
- for (LocDetl locDetl : groupLocDetl) {
+ Page<LocDetl> groupLocDetl = locDetlService.getStockStatis2(toPage(1, 10000, param, LocDetl.class));
+// List<LocDetl> groupLocDetl = locDetlService.selectGroupPage(param, curr, limit);
+ for (LocDetl locDetl : groupLocDetl.getRecords()) {
Mat mat = matService.selectOne(new EntityWrapper<Mat>()
.eq("matnr", locDetl.getMatnr()));
locDetl.setStoreMax(mat.getStoreMax());
@@ -321,7 +322,7 @@
long time = maxDate.getTime();
Date now = new Date();
long time1 = now.getTime();
- locDetl.setNowTime((int)((time1 - time)/(1000*60*60*24)));
+ locDetl.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
} catch (ParseException e) {
e.printStackTrace();
}
--
Gitblit v1.9.1