From 8407e277e156a55fee38e7bb7b8930ec16a15f0e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 24 四月 2026 09:08:47 +0800
Subject: [PATCH] 库存上下限预警，物料高低频摆放
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 86 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 01bd62d..4de25a9 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -68,47 +68,59 @@
// excludeTrash(param);
param.put("curr", curr);
param.put("limit", limit);
- Page<LocDetl> groupLocDetl = locDetlService.getStockStatis2(toPage(1, 10000, param, LocDetl.class));
-// List<LocDetl> groupLocDetl = locDetlService.selectGroupPage(param, curr, limit);
- for (LocDetl locDetl : groupLocDetl.getRecords()) {
- AbnormalLocDetlParam abnormalLocDetlParam = new AbnormalLocDetlParam();
- Mat mat = matService.selectOne(new EntityWrapper<Mat>()
- .eq("matnr", locDetl.getMatnr()));
- if (Cools.isEmpty(mat)) {
- continue;
- }
+ Page<LocDetl> locDetlPage1 = toPage(curr, limit, param, LocDetl.class);
+ Map<String, Object> condition1 = locDetlPage1.getCondition();
- if (!Cools.isEmpty(mat.getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
- abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
- abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
- abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
- abnormalLocDetlParam.setAnfme(locDetl.getAnfme());
- abnormalLocDetlParam.setMaktx(mat.getMaktx());
- abnormalLocDetlParam.setMatnr(mat.getMatnr());
- abnormalLocDetlParam.setSpecs(mat.getSpecs());
- abnormalLocDetlParam.setBatch(locDetl.getBatch());
-
-// SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
-// Date maxDate = simple.parse(locDetl.getBatch());
-// long time = maxDate.getTime();
-// Date now = new Date();
-// long time1 = now.getTime();
-// abnormalLocDetlParam.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
-
- if (!Cools.isEmpty(mat.getStoreMax()) && locDetl.getAnfme() > mat.getStoreMax()) {
- result.add(abnormalLocDetlParam);
- } else if (!Cools.isEmpty(mat.getStoreMin()) && locDetl.getAnfme() < mat.getStoreMin()) {
- result.add(abnormalLocDetlParam);
- }
- }
- }
-
- Page<AbnormalLocDetlParam> locDetlPage = new Page<>();
- locDetlPage.setRecords(paging(result, curr, limit));
- locDetlPage.setTotal(result.size());
+ List<LocDetl> locDetlList = locDetlMapper.getStockList(condition1);
+ long locDetlListCount = locDetlMapper.getStockListCount(condition1);
+ Page<LocDetl> locDetlPage = new Page<>();
+ locDetlPage.setRecords(locDetlList);
+ locDetlPage.setTotal(locDetlListCount);
locDetlPage.setCurrent(curr);
locDetlPage.setSize(limit);
+
+// Page<LocDetl> groupLocDetl = locDetlService.getStockStatis2(toPage(1, 16, param, LocDetl.class));
+//// List<LocDetl> groupLocDetl = locDetlService.selectGroupPage(param, curr, limit);
+// for (LocDetl locDetl : groupLocDetl.getRecords()) {
+// AbnormalLocDetlParam abnormalLocDetlParam = new AbnormalLocDetlParam();
+// Mat mat = matService.selectOne(new EntityWrapper<Mat>()
+// .eq("matnr", locDetl.getMatnr()));
+// if (Cools.isEmpty(mat)) {
+// continue;
+// }
+//
+//
+// if (!Cools.isEmpty(mat.getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
+// abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
+// abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
+// abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
+// abnormalLocDetlParam.setAnfme(locDetl.getAnfme());
+// abnormalLocDetlParam.setMaktx(mat.getMaktx());
+// abnormalLocDetlParam.setMatnr(mat.getMatnr());
+// abnormalLocDetlParam.setSpecs(mat.getSpecs());
+// abnormalLocDetlParam.setBatch(locDetl.getBatch());
+//
+//// SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
+//// Date maxDate = simple.parse(locDetl.getBatch());
+//// long time = maxDate.getTime();
+//// Date now = new Date();
+//// long time1 = now.getTime();
+//// abnormalLocDetlParam.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
+//
+// if (!Cools.isEmpty(mat.getStoreMax()) && locDetl.getAnfme() > mat.getStoreMax()) {
+// result.add(abnormalLocDetlParam);
+// } else if (!Cools.isEmpty(mat.getStoreMin()) && locDetl.getAnfme() < mat.getStoreMin()) {
+// result.add(abnormalLocDetlParam);
+// }
+// }
+// }
+
+// Page<AbnormalLocDetlParam> locDetlPage = new Page<>();
+// locDetlPage.setRecords(paging(result, curr, limit));
+// locDetlPage.setTotal(result.size());
+// locDetlPage.setCurrent(curr);
+// locDetlPage.setSize(limit);
return R.ok(locDetlPage);
}
--
Gitblit v1.9.1