From 23d7909b52e22eb42900a506c7d8b72f58f28944 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 03 七月 2023 17:36:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 36261c9..cc1818e 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -11,7 +11,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.sun.org.apache.bcel.internal.generic.NEW;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocNormal;
import com.zy.asrs.entity.LocNormalLog;
import com.zy.asrs.entity.LocNormalReport;
@@ -73,6 +73,8 @@
allLike(LocNormal.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("appe_time", false);
}
if (Cools.isEmpty(param.get("state"))) {
wrapper.in("state", "1,2");
@@ -156,6 +158,18 @@
locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
+ /**
+ * 鎵归噺淇敼鐗╂枡鐘舵��
+ * @return
+ */
+ @RequestMapping(value = "/locNormal/getAllLocDetlData")
+ @ManagerAuth(memo = "鎵归噺淇敼鐗╂枡鐘舵��")
+ public R getAllLocDetlData(@RequestBody JSONObject param) {
+ List<LocNormal> list = JSONObject.parseArray(param.getJSONArray("list").toJSONString(), LocNormal.class);
+ Integer result = locNormalService.getAllLocDetlData(list);
+ return R.ok().add(result);
+ }
+
@RequestMapping(value = "/locNormal/removeLoc/auth")
@ManagerAuth
public void removeLoc(LocNormal param) {
@@ -172,6 +186,19 @@
LocNormalExcelListener listener = new LocNormalExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), LocNormalExcel.class, listener).sheet().doRead();
return R.ok("鎴愬姛瀵煎叆" + listener.getTotal() + "鏉＄墿鏂欎俊鎭�");
+ }
+
+ /* 瀵煎嚭 */
+ @RequestMapping(value = "/locNormal/export/auth")
+ @ManagerAuth(memo = "骞充粨绠＄悊瀵煎嚭")
+ public R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<LocNormal> wrapper = new EntityWrapper<LocNormal>();
+ wrapper.ne("state", "3");
+ Map<String, Object> map = excludeTrash(param.getJSONObject("exportData"));
+ convert(map, wrapper);
+ List<LocNormal> list = locNormalService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
}
/* 骞充粨鍏ュ簱 鎴愬搧 */
@@ -311,7 +338,7 @@
public R normalReportExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
@SuppressWarnings("unchecked")
- List<LocNormalReport> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), LocNormalReport.class);
+ List<LocNormalLog> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), LocNormalLog.class);
return R.ok(exportSupport(list, fields));
}
}
--
Gitblit v1.9.1