From 1cd2e610fdbd581f609e002e738b0e5cea97ad40 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:10 +0800
Subject: [PATCH] 报表问题修改
---
fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 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 1f8ed16..4011932 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
@@ -21,6 +21,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -130,14 +131,15 @@
.orElse(new ArrayList<>())
.stream()
.collect(Collectors.toMap(Depot::getId, Depot::getName, (key1, key2) -> key2));
-
+ DecimalFormat df = new DecimalFormat("0.00");
//缁勮瀹為檯瀵煎嚭鏁版嵁
if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
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,13 +148,14 @@
//绮鍝佺鏄犲皠
String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setFullWeight(record.getFullWeight());
- export.setEmptyWeight(record.getEmptyWeight());
- export.setNetWeight(record.getNetWeight());
- export.setSettleWeight(record.getSettleWeight());
- export.setRecordWeight(record.getRecordWeight());
+ export.setFullWeight(df.format(record.getFullWeight())+"KG");
+ export.setEmptyWeight(df.format(record.getEmptyWeight())+"KG");
+ export.setNetWeight(df.format(record.getNetWeight())+"KG");
+ export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
+ export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
export.setCompleteTime(record.getCompleteTime());
- export.setDeOther(record.getDeOther());
+ export.setDeOther(df.format(record.getDeOther())+"KG");
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
@@ -163,8 +166,9 @@
sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
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,13 +177,14 @@
//绮鍝佺鏄犲皠
String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setFullWeight(record.getFullWeight());
- export.setEmptyWeight(record.getEmptyWeight());
- export.setNetWeight(record.getNetWeight());
- export.setSettleWeight(record.getSettleWeight());
- export.setRecordWeight(record.getRecordWeight());
+ export.setFullWeight(df.format(record.getFullWeight())+"KG");
+ export.setEmptyWeight(df.format(record.getEmptyWeight())+"KG");
+ export.setNetWeight(df.format(record.getNetWeight())+"KG");
+ export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
+ export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
export.setCompleteTime(record.getCompleteTime());
- export.setDeOther(record.getDeOther());
+ export.setDeOther(df.format(record.getDeOther())+"KG");
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
@@ -188,10 +193,12 @@
if (StringUtils.isNotEmpty(param.getType()) && "IN_DETAIL".equals(param.getType())) {
sheetName = "鍏ュ簱鏄庣粏鎶ヨ〃鏁版嵁";
+ param.setType("IN");
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 : "");
@@ -206,9 +213,10 @@
//绮鍝佺鏄犲皠
String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setSettleWeight(record.getSettleWeight());
- export.setRecordWeight(record.getRecordWeight());
+ export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
+ export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
export.setCompleteTime(record.getCompleteTime());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailInExport> util = new ExcelUtil<InoutRecordDetailInExport>(InoutRecordDetailInExport.class);
@@ -217,10 +225,12 @@
if (StringUtils.isNotEmpty(param.getType()) && "OUT_DETAIL".equals(param.getType())) {
sheetName = "鍑哄簱鏄庣粏鎶ヨ〃鏁版嵁";
+ param.setType("OUT");
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 : "");
@@ -235,9 +245,10 @@
//绮鍝佺鏄犲皠
String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setSettleWeight(record.getSettleWeight());
- export.setRecordWeight(record.getRecordWeight());
+ export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
+ export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
export.setCompleteTime(record.getCompleteTime());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailOutExport> util = new ExcelUtil<InoutRecordDetailOutExport>(InoutRecordDetailOutExport.class);
@@ -263,10 +274,27 @@
if (null != subDept) {
deptName = subDept.getDeptName();
}
+ List<SuperInventoryReportExport> exportList = new ArrayList<>();
+ DecimalFormat df = new DecimalFormat("0.00");
+
+ for (SuperInventoryReportData data :list) {
+ SuperInventoryReportExport export = new SuperInventoryReportExport();
+ export.setCustomerName(data.getCustomerName());
+ export.setDeptName(data.getDeptName());
+ export.setDepotName(data.getDepotName());
+ export.setInitialWeight(df.format(data.getInitialWeight())+"KG");
+ export.setRecordInWeight(df.format(data.getRecordInWeight())+"KG");
+ export.setChangeInWeight(df.format(data.getChangeInWeight())+"KG");
+ export.setRecordOutWeight(df.format(data.getRecordOutWeight())+"KG");
+ export.setChangeOutWeight(df.format(data.getChangeOutWeight())+"KG");
+ export.setLossWeight(df.format(data.getLossWeight())+"KG");
+ export.setFinalWeight(df.format(data.getFinalWeight())+"KG");
+ exportList.add(export);
+ }
//瀵煎嚭
- ExcelUtil<SuperInventoryReportData> util = new ExcelUtil<SuperInventoryReportData>(SuperInventoryReportData.class);
- return util.exportExcel(list, sheetName, deptName);
+ ExcelUtil<SuperInventoryReportExport> util = new ExcelUtil<SuperInventoryReportExport>(SuperInventoryReportExport.class);
+ return util.exportExcel(exportList, sheetName, deptName);
}
}
--
Gitblit v1.9.3