From 4807619ff7d8721f4286ad8d62369b70dc929cd4 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 08 七月 2021 13:01:05 +0800
Subject: [PATCH] 1.立库日出入库统计导出支持分页导出 2.平仓日入库查询支持分页导出
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 58da3c8..36261c9 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -12,10 +13,13 @@
import com.core.common.R;
import com.sun.org.apache.bcel.internal.generic.NEW;
import com.zy.asrs.entity.LocNormal;
+import com.zy.asrs.entity.LocNormalLog;
import com.zy.asrs.entity.LocNormalReport;
import com.zy.asrs.entity.param.LocNormalParam;
+import com.zy.asrs.service.LocNormalLogService;
import com.zy.asrs.service.LocNormalReportService;
import com.zy.asrs.service.LocNormalService;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.common.utils.excel.locNomal.LocNormalExcel;
@@ -23,6 +27,7 @@
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
@@ -42,6 +47,7 @@
import static jdk.nashorn.api.scripting.ScriptUtils.convert;
+@Slf4j
@RestController
public class LocNormalController extends BaseController {
@Autowired
@@ -50,6 +56,8 @@
private LocNormalReportService locNormalReportService;
@Autowired
private ErpSqlServer erpSqlServer;
+ @Autowired
+ private LocNormalLogService locNormalLogService;
@RequestMapping(value = "/locNomal/list/auth")
@ManagerAuth
@@ -127,6 +135,17 @@
ErpSql = MessageFormat.format(ErpSql, param.getMatnr(), erpCount);
erpSqlServer.update(ErpSql);
locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime, param.getId());
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, param);
+ locLog.setAnfme(erpCount.doubleValue());
+ locLog.setIoType(3); // 淇敼
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(modiUser);
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨淇敼搴撳瓨璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
}
@RequestMapping(value = "/locNormal/outLoc/auth")
@@ -257,15 +276,11 @@
@RequestParam(required = false) String condition,
@RequestParam Map<String, Object> param) {
excludeTrash(param);
- EntityWrapper<LocNormalReport> wrapper = new EntityWrapper<>();
- List<String> orderList = new ArrayList<>();
- orderList.add("time");
- wrapper.eq("state", param.get("state").toString()).orderDesc(orderList);
- String timeRange = "";
+ EntityWrapper<LocNormalLog> wrapper = new EntityWrapper<>();
String time1 = "";
String time2 = "";
if (!Cools.isEmpty(param.get("query_date"))) {
- timeRange = param.get("query_date").toString();
+ String timeRange = param.get("query_date").toString();
time1 = timeRange.substring(0, 19);
time2 = timeRange.substring(21, timeRange.length());
}
@@ -281,9 +296,22 @@
} catch (Exception e) {
e.printStackTrace();
}
- wrapper.ge("time", dateTime1).and().le("time", dateTime2);
+ wrapper.ge("create_time", dateTime1).and().le("create_time", dateTime2);
}
- allLike(LocNormalReport.class, param.keySet(), wrapper, condition);
- return R.ok(locNormalReportService.selectPage(new Page<>(curr, limit), wrapper));
+ List<String> oderCol = new ArrayList<>();
+ oderCol.add("create_time");
+ wrapper.orderDesc(oderCol);
+ allLike(LocNormalLog.class, param.keySet(), wrapper, condition);
+ return R.ok(locNormalLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ //excel瀵煎嚭
+ @RequestMapping("/locNomal/normalReportExport.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
+ 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);
+ return R.ok(exportSupport(list, fields));
}
}
--
Gitblit v1.9.1