From 8384104f76b6e6df077bdb3a22c4f3d9e93619d8 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 18:46:20 +0800
Subject: [PATCH] 细节调整3
---
fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
index 78b203e..ac171c2 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
@@ -42,11 +42,7 @@
@Resource
private SysDeptService sysDeptService;
@Resource
- private ReportInDetailPR reportInDetailPR;
- @Resource
- private ReportOutDetailPR reportOutDetailPR;
- @Resource
- private SuperInventoryReportPR superInventoryReportPR;
+ private ReportInoutPR reportInoutPR;
@Resource
private CompanyPR companyPR;
@Resource
@@ -127,7 +123,7 @@
//缁勮瀹為檯瀵煎嚭鏁版嵁
if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
- list = reportInDetailPR.listRecord(param);
+ list = reportInoutPR.listRecord(param);
List<InoutRecordInExport> exportList = new ArrayList<>();
for (InoutRecord record : list) {
InoutRecordInExport export = new InoutRecordInExport();
@@ -154,7 +150,7 @@
if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
- list = reportOutDetailPR.listRecord(param);
+ list = reportInoutPR.listRecord(param);
List<InoutRecordOutExport> exportList = new ArrayList<>();
for (InoutRecord record : list) {
InoutRecordOutExport export = new InoutRecordOutExport();
@@ -181,7 +177,7 @@
if (StringUtils.isNotEmpty(param.getType()) && "IN_DETAIL".equals(param.getType())) {
sheetName = "鍏ュ簱鏄庣粏鎶ヨ〃鏁版嵁";
- list = reportInDetailPR.listRecord(param);
+ list = reportInoutPR.listRecord(param);
List<InoutRecordDetailInExport> exportList = new ArrayList<>();
for (InoutRecord record : list) {
InoutRecordDetailInExport export = new InoutRecordDetailInExport();
@@ -210,7 +206,7 @@
if (StringUtils.isNotEmpty(param.getType()) && "OUT_DETAIL".equals(param.getType())) {
sheetName = "鍑哄簱鏄庣粏鎶ヨ〃鏁版嵁";
- list = reportOutDetailPR.listRecord(param);
+ list = reportInoutPR.listRecord(param);
List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
for (InoutRecord record : list) {
InoutRecordDetailOutExport export = new InoutRecordDetailOutExport();
@@ -249,7 +245,7 @@
//璁剧疆鏍囬
String sheetName = "搴撳瓨鎶ヨ〃鏁版嵁";
//鏌ヨ鏁版嵁
- List<SuperInventoryReportData> list = superInventoryReportPR.getReportData(param);
+ List<SuperInventoryReportData> list = reportInoutPR.getStoreData(param);
//鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
String deptName = "";
SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
--
Gitblit v1.9.3