From 68fae8cc33d80553355997554b06f5ac1395ef2c Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 25 十二月 2025 11:39:37 +0800
Subject: [PATCH] 出库报表列宽调整，映射调整，查询调整，导出实现
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java
index 88f67e1..c3704b5 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java
@@ -2,14 +2,15 @@
import com.fzzy.igds.ReportInDetailPR;
+import com.fzzy.igds.ReportOutDetailPR;
import com.fzzy.igds.data.InoutParam;
-import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.service.InoutRecordService;
import com.fzzy.igds.service.SysDeptService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -17,6 +18,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
@@ -25,7 +27,6 @@
*
* @author sgj
* @date 2025/12/24
-
*/
@Controller
@RequestMapping("export")
@@ -41,20 +42,33 @@
@Autowired
private ReportInDetailPR reportInDetailPR;
+ @Autowired
+ private ReportOutDetailPR reportOutDetailPR;
+
/**
* 鍑哄叆搴撴姤琛ㄥ鍑�
* @return
*/
- @RequestMapping("/inReport-excel")
+ @RequestMapping("/inOutReport-excel")
@ResponseBody
- public AjaxResult inReportExcel(InoutParam param) {
- //鏌ヨ鏁版嵁
- List<InoutRecord> list = reportInDetailPR.listRecord(param);
-
+ public AjaxResult inOutReport(InoutParam param) {
//璁剧疆鏍囬
- String sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
+ String sheetName = "鎶ヨ〃鏁版嵁";
+ //鏌ヨ鏁版嵁
+ List<InoutRecord> list = new ArrayList<>();
+
+ if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
+ sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
+ list = reportInDetailPR.listRecord(param);
+ }
+
+ if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
+ sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
+ list = reportOutDetailPR.listRecord(param);
+ }
+
//鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
String deptName = "";
SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
--
Gitblit v1.9.3