From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 3bed8e4..944a213 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -241,6 +241,31 @@
}
return R.ok(exportSupport(result, fields));
}
+ @RequestMapping(value = "/locDetl/export/auth/v2")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R exportV2(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ } else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
+ convert(map, wrapper);
+ if (!row.equals("")) {
+ wrapper.and()
+ .where("loc_no like '" + row + "%'");
+ }
+ List<LocDetl> list = locDetlService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
@RequestMapping(value = "/locDetlQuery/auth")
@ManagerAuth
@@ -419,14 +444,15 @@
if (!Cools.isEmpty(mat.getStoreMaxDate())) {
- if (Cools.isEmpty(locDetl.getBatch())) {
- continue;
- } else if (locDetl.getBatch().length() != 8) {
- continue;
- }
+// 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());
+// SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
+// Date maxDate = simple.parse(locDetl.getBatch());
+ Date maxDate = locDetl.getModiTime();
Calendar calendar = new GregorianCalendar();
calendar.setTime(maxDate);
// 鎶婃棩鏈熷線鍚庡鍔犱竴澶�,鏁存暟 寰�鍚庢帹,璐熸暟寰�鍓嶇Щ鍔�
@@ -443,7 +469,7 @@
abnormalLocDetlParam.setSpecs(mat.getSpecs());
abnormalLocDetlParam.setBatch(locDetl.getBatch());
if (now.compareTo(maxDate) > 0) {
- long difference = (now.getTime() - maxDate.getTime()) / (24 * 60 * 60 * 1000);
+ long difference = (now.getTime() - locDetl.getModiTime().getTime()) / (24 * 60 * 60 * 1000);
abnormalLocDetlParam.setNowTime(Integer.parseInt(String.valueOf(difference)));
result.add(abnormalLocDetlParam);
}
--
Gitblit v1.9.1