From 84759c579add1daea7b3dca92dcadf17c9318ec9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 12 十二月 2024 13:28:34 +0800
Subject: [PATCH] 库存上下限预警
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 6eba1f6..04d4bb5 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,11 +13,10 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.ManLocDetl;
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.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +44,77 @@
return R.error();
}
return R.ok();
+ }
+
+ @RequestMapping(value = "/locDetl/groupLocList/auth")
+ @ManagerAuth
+ public R groupLocList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+
+// List<LocDetl> result = new ArrayList<>();
+ List<AbnormalLocDetlParam> result = new ArrayList<>();
+// 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;
+ }
+
+
+ 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);
+ }
+
+ 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) {
+ maxIndex = result.size();
+ }
+ for (int i = minIndex; i < maxIndex; i++) {
+ pageRecord.add(result.get(i));
+ }
+ return pageRecord;
}
@RequestMapping(value = "/locDetl/{id}/auth")
@@ -187,18 +257,52 @@
if (chooseRow.length() == 1) {
row = "0" + chooseRow;
map.remove("row");
- }else {
+ } else {
row = chooseRow;
map.remove("row");
}
}
convert(map, wrapper);
- if (!row.equals("")){
+ if (!row.equals("")) {
wrapper.and()
- .where("loc_no like '" +row +"%'");
+ .where("loc_no like '" + row + "%'");
}
List<LocDetl> list = locDetlService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
+ List<AbnormalLocDetlParam> result = new ArrayList<>();
+
+ Page<LocDetl> groupLocDetl = locDetlService.getStockStatis2(toPage(1, 10000, param, LocDetl.class));
+ 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);
+ }
+ }
+ }
+ return R.ok(exportSupport(result, fields));
}
@RequestMapping(value = "/locDetlQuery/auth")
--
Gitblit v1.9.1