From 905ae94b3e198aeab924375bc504f0afe6ac8cc4 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 22 十二月 2022 10:24:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 103 ++++++++++++++++++++++++++++-----------------------
1 files changed, 56 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 04ffd45..c60c814 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -303,60 +303,69 @@
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)
- || Cools.isEmpty(mat.getStoreMax())
- || Cools.isEmpty(mat.getStoreMaxDate())
- || Cools.isEmpty(mat.getStoreMin())) {
- continue;
- } else if (Cools.isEmpty(locDetl.getBatch())) {
- continue;
- } 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();
- abnormalLocDetlParam.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- if (locDetl.getAnfme() > mat.getStoreMax()) {
- result.add(abnormalLocDetlParam);
- continue;
- } else if (locDetl.getAnfme() < mat.getStoreMin()) {
- result.add(abnormalLocDetlParam);
+ if (Cools.isEmpty(mat)) {
continue;
}
- try {
- SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
- Date maxDate = simple.parse(locDetl.getBatch());
- Calendar calendar = new GregorianCalendar();
- calendar.setTime(maxDate);
- // 鎶婃棩鏈熷線鍚庡鍔犱竴澶�,鏁存暟 寰�鍚庢帹,璐熸暟寰�鍓嶇Щ鍔�
- calendar.add(Calendar.DATE, mat.getStoreMaxDate());
- // 杩欎釜鏃堕棿灏辨槸鏃ユ湡寰�鍚庢帹涓�澶╃殑缁撴灉
- maxDate = calendar.getTime();
- Date now = new Date();
- if (now.compareTo(maxDate) > 0) {
+
+ 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);
+ continue;
+ } else if (!Cools.isEmpty(mat.getStoreMin()) && locDetl.getAnfme() < mat.getStoreMin()) {
+ result.add(abnormalLocDetlParam);
+ continue;
}
- } catch (Exception e) {
- continue;
+ } else if (!Cools.isEmpty(mat.getStoreMaxDate())) {
+ if (Cools.isEmpty(locDetl.getBatch())) {
+ continue;
+ } else if (locDetl.getBatch().length() != 8) {
+ continue;
+ }
+ try {
+ SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
+ Date maxDate = simple.parse(locDetl.getBatch());
+ Calendar calendar = new GregorianCalendar();
+ calendar.setTime(maxDate);
+ // 鎶婃棩鏈熷線鍚庡鍔犱竴澶�,鏁存暟 寰�鍚庢帹,璐熸暟寰�鍓嶇Щ鍔�
+ calendar.add(Calendar.DATE, mat.getStoreMaxDate());
+ // 杩欎釜鏃堕棿灏辨槸鏃ユ湡寰�鍚庢帹涓�澶╃殑缁撴灉
+ maxDate = calendar.getTime();
+ Date now = new Date();
+ 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());
+ if (now.compareTo(maxDate) > 0) {
+ result.add(abnormalLocDetlParam);
+ }
+ } catch (Exception e) {
+ continue;
+ }
}
}
--
Gitblit v1.9.1