From f68f5bf6ae56c18561eb8ccba9fb9693f128551c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 11 二月 2026 09:36:07 +0800
Subject: [PATCH] 客户问题优化调整9
---
fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 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..3baa207 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
@@ -70,6 +66,17 @@
param.setBizId(bizId);
param.setEntityName(entityName);
exportManager.renderWordDownload(param, response);
+ }
+
+ /**
+ * 瀵煎嚭word骞朵笅杞�
+ *
+ * @param response
+ */
+ @RequestMapping("/download-inout-excel")
+ public void downloadInoutExcel(HttpServletResponse response) {
+
+ exportManager.downloadInoutExcel(response);
}
/**
@@ -127,10 +134,11 @@
//缁勮瀹為檯瀵煎嚭鏁版嵁
if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
- list = reportInDetailPR.listRecord(param);
+ list = reportInoutPR.listRecord(param);
List<InoutRecordInExport> exportList = new ArrayList<>();
+ InoutRecordInExport export;
for (InoutRecord record : list) {
- InoutRecordInExport export = new InoutRecordInExport();
+ export = new InoutRecordInExport();
export.setId(record.getId());
export.setPlateNum(record.getPlateNum());
// 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
@@ -146,6 +154,7 @@
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
export.setDeOther(record.getDeOther());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
@@ -154,10 +163,11 @@
if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
- list = reportOutDetailPR.listRecord(param);
+ list = reportInoutPR.listRecord(param);
List<InoutRecordOutExport> exportList = new ArrayList<>();
+ InoutRecordOutExport export;
for (InoutRecord record : list) {
- InoutRecordOutExport export = new InoutRecordOutExport();
+ export = new InoutRecordOutExport();
export.setId(record.getId());
export.setPlateNum(record.getPlateNum());
// 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
@@ -173,6 +183,7 @@
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
export.setDeOther(record.getDeOther());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
@@ -181,10 +192,11 @@
if (StringUtils.isNotEmpty(param.getType()) && "IN_DETAIL".equals(param.getType())) {
sheetName = "鍏ュ簱鏄庣粏鎶ヨ〃鏁版嵁";
- list = reportInDetailPR.listRecord(param);
+ list = reportInoutPR.listRecord(param);
List<InoutRecordDetailInExport> exportList = new ArrayList<>();
+ InoutRecordDetailInExport export;
for (InoutRecord record : list) {
- InoutRecordDetailInExport export = new InoutRecordDetailInExport();
+ export = new InoutRecordDetailInExport();
//鏀跺偍鍏徃鏄犲皠
String companyNameValue = companyMap.get(record.getCompanyId());
export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -202,6 +214,7 @@
export.setSettleWeight(record.getSettleWeight());
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailInExport> util = new ExcelUtil<InoutRecordDetailInExport>(InoutRecordDetailInExport.class);
@@ -210,10 +223,11 @@
if (StringUtils.isNotEmpty(param.getType()) && "OUT_DETAIL".equals(param.getType())) {
sheetName = "鍑哄簱鏄庣粏鎶ヨ〃鏁版嵁";
- list = reportOutDetailPR.listRecord(param);
+ list = reportInoutPR.listRecord(param);
List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
+ InoutRecordDetailOutExport export;
for (InoutRecord record : list) {
- InoutRecordDetailOutExport export = new InoutRecordDetailOutExport();
+ export = new InoutRecordDetailOutExport();
//鏀跺偍鍏徃鏄犲皠
String companyNameValue = companyMap.get(record.getCompanyId());
export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -231,6 +245,7 @@
export.setSettleWeight(record.getSettleWeight());
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailOutExport> util = new ExcelUtil<InoutRecordDetailOutExport>(InoutRecordDetailOutExport.class);
@@ -249,7 +264,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