From 94dba00dbc6f351f5835d6f4a98d3126cedd9e80 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 01 十一月 2022 17:05:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 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..04ffd45 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -14,6 +14,7 @@
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.param.AbnormalLocDetlParam;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
@@ -294,17 +295,16 @@
@RequestParam(required = false) String condition,
@RequestParam Map<String, Object> param) {
- List<LocDetl> result = new ArrayList<>();
+// List<LocDetl> result = new ArrayList<>();
+ List<AbnormalLocDetlParam> result = new ArrayList<>();
// 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());
- locDetl.setStoreMaxDate(mat.getStoreMaxDate());
- locDetl.setStoreMin(mat.getStoreMin());
if (Cools.isEmpty(mat)
|| Cools.isEmpty(mat.getStoreMax())
|| Cools.isEmpty(mat.getStoreMaxDate())
@@ -315,21 +315,30 @@
} else if (locDetl.getBatch().length() != 8) {
continue;
}
+ AbnormalLocDetlParam abnormalLocDetlParam = new AbnormalLocDetlParam();
+ 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());
try {
SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
Date maxDate = simple.parse(locDetl.getBatch());
long time = maxDate.getTime();
Date now = new Date();
long time1 = now.getTime();
- locDetl.setNowTime((int)((time1 - time)/(1000*60*60*24)));
+ abnormalLocDetlParam.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
} catch (ParseException e) {
e.printStackTrace();
}
if (locDetl.getAnfme() > mat.getStoreMax()) {
- result.add(locDetl);
+ result.add(abnormalLocDetlParam);
continue;
} else if (locDetl.getAnfme() < mat.getStoreMin()) {
- result.add(locDetl);
+ result.add(abnormalLocDetlParam);
continue;
}
@@ -344,14 +353,14 @@
maxDate = calendar.getTime();
Date now = new Date();
if (now.compareTo(maxDate) > 0) {
- result.add(locDetl);
+ result.add(abnormalLocDetlParam);
}
} catch (Exception e) {
continue;
}
}
- Page<LocDetl> locDetlPage = new Page<>();
+ Page<AbnormalLocDetlParam> locDetlPage = new Page<>();
locDetlPage.setRecords(paging(result, curr, limit));
locDetlPage.setTotal(result.size());
locDetlPage.setCurrent(curr);
@@ -359,8 +368,8 @@
return R.ok(locDetlPage);
}
- private List<LocDetl> paging(List<LocDetl> result, Integer curr, Integer limit) {
- List<LocDetl> pageRecord = new ArrayList<LocDetl>();
+ private List<AbnormalLocDetlParam> paging(List<AbnormalLocDetlParam> result, Integer curr, Integer limit) {
+ List<AbnormalLocDetlParam> pageRecord = new ArrayList<AbnormalLocDetlParam>();
int minIndex = (curr - 1) * limit;
int maxIndex = (curr * limit) - 1;
if (result.size() < maxIndex) {
--
Gitblit v1.9.1