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-view/src/main/java/com/fzzy/igds/ReportInoutPR.java | 44 +++++-----
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 12 --
fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java | 58 +++++++++----
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java | 4
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java | 12 +-
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportExport.java | 72 ++++++++++++++++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java | 12 +-
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml | 12 --
9 files changed, 151 insertions(+), 79 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java
index 446dbc1..244f588 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java
@@ -35,10 +35,10 @@
private String foodVariety;
@Excel(name = "缁撶畻閲嶉噺",sort = 7)
- private Double settleWeight = 0.0;
+ private String settleWeight = "0.0";
@Excel(name = "鍏ュ簱閲嶉噺",sort = 8)
- private Double recordWeight = 0.0;
+ private String recordWeight = "0.0";
@Excel(name = "绂诲簱鏃堕棿",sort = 9,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java
index 5a06015..901c569 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java
@@ -35,10 +35,10 @@
private String foodVariety;
@Excel(name = "缁撶畻閲嶉噺",sort = 7)
- private Double settleWeight = 0.0;
+ private String settleWeight = "0.0";
@Excel(name = "鍑哄簱閲嶉噺",sort = 8)
- private Double recordWeight = 0.0;
+ private String recordWeight = "0.0";
@Excel(name = "绂诲簱鏃堕棿",sort = 9,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java
index 43957ec..e2e3b84 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java
@@ -30,22 +30,22 @@
private String foodVariety;
@Excel(name = "姣涢噸",sort = 5)
- private Double fullWeight = 0.0;
+ private String fullWeight = "0.0";
@Excel(name = "鐨噸",sort = 6)
- private Double emptyWeight = 0.0;
+ private String emptyWeight= "0.0";
@Excel(name = "鍑�閲�",sort = 7)
- private Double netWeight = 0.0;
+ private String netWeight = "0.0";
@Excel(name = "鎵ｉ噸",sort = 8)
- private Double deOther = 0.0;
+ private String deOther = "0.0";
@Excel(name = "缁撶畻閲嶉噺",sort = 9)
- private Double settleWeight = 0.0;
+ private String settleWeight = "0.0";
@Excel(name = "鍏ュ簱閲嶉噺",sort = 10)
- private Double recordWeight = 0.0;
+ private String recordWeight = "0.0";
@Excel(name = "绂诲簱鏃堕棿",sort = 11,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java
index 6a19648..7edf282 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java
@@ -30,22 +30,22 @@
private String foodVariety;
@Excel(name = "姣涢噸",sort = 5)
- private Double fullWeight = 0.0;
+ private String fullWeight = "0.0";
@Excel(name = "鐨噸",sort = 6)
- private Double emptyWeight = 0.0;
+ private String emptyWeight = "0.0";
@Excel(name = "鍑�閲�",sort = 7)
- private Double netWeight = 0.0;
+ private String netWeight = "0.0";
@Excel(name = "鎵ｉ噸",sort = 8)
- private Double deOther = 0.0;
+ private String deOther = "0.0";
@Excel(name = "缁撶畻閲嶉噺",sort = 9)
- private Double settleWeight = 0.0;
+ private String settleWeight = "0.0";
@Excel(name = "鍑哄簱閲嶉噺",sort = 10)
- private Double recordWeight = 0.0;
+ private String recordWeight = "0.0";
@Excel(name = "绂诲簱鏃堕棿",sort = 11,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportExport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportExport.java
new file mode 100644
index 0000000..f075a46
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/SuperInventoryReportExport.java
@@ -0,0 +1,72 @@
+package com.fzzy.igds.data;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 鐩戠搴撳瓨鎶ヨ〃鏁版嵁
+ *
+ * @author sgj
+ * @date 2025/12/19
+ */
+@Data
+public class SuperInventoryReportExport implements Serializable {
+
+ @Excel(name = "鏀跺偍鍏徃", sort = 1)
+ private String customerName;
+
+
+ @Excel(name = "鎵�灞炲簱鍖�", sort = 2)
+ private String deptName;
+
+
+
+ @Excel(name = "鎵�灞炰粨搴�", sort = 3)
+ private String depotName;
+
+
+ /**
+ * 鏈熷垵鏁伴噺(鍗曚綅KG)
+ */
+ @Excel(name = "鏈熷垵鏁伴噺(鍗曚綅KG)", sort = 4)
+ private String initialWeight = "0.0";
+
+ /**
+ * 鍏ュ簱鏁伴噺(鍗曚綅KG)
+ */
+ @Excel(name = "鍏ュ簱鏁伴噺(鍗曚綅KG)", sort = 5)
+ private String recordInWeight = "0.0";
+
+ /**
+ * 鍊掑叆鏁伴噺(鍗曚綅KG)
+ */
+ @Excel(name = "鍊掑叆鏁伴噺(鍗曚綅KG)", sort = 6)
+ private String changeInWeight = "0.0";
+
+ /**
+ * 鍑哄簱鏁伴噺(鍗曚綅KG)
+ */
+ @Excel(name = "鍑哄簱鏁伴噺(鍗曚綅KG)", sort = 7)
+ private String recordOutWeight = "0.0";
+
+ /**
+ * 鍊掑嚭鏁伴噺(鍗曚綅KG)
+ */
+ @Excel(name = "鍊掑嚭鏁伴噺(鍗曚綅KG)", sort = 8)
+ private String changeOutWeight = "0.0";
+
+ /**
+ * 鎹熻�楁暟閲�(鍗曚綅KG)
+ */
+ @Excel(name = "鎹熻�楁暟閲�(鍗曚綅KG)", sort = 9)
+ private String lossWeight = "0.0";
+
+ /**
+ * 鏈熸湯鏁伴噺(鍗曚綅KG)
+ */
+ @Excel(name = "鏈熸湯鏁伴噺(鍗曚綅KG)", sort = 10)
+ private String finalWeight = "0.0";
+
+}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index 328379a..44064bf 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
@@ -403,14 +403,12 @@
if(ViewType==1){
view.get("#form1").set("visible",true);
view.get("#dataGridMain1").set("visible",true);
- view.get("#tool").set("visible",true);

}

if(ViewType==2){
view.get("#form2").set("visible",true);
view.get("#dataGridMain2").set("visible",true);
- view.get("#tool").set("visible",true);
}

var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
@@ -722,6 +720,7 @@
<RowSelectorColumn/>
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
+ <Property name="width">30</Property>
</RowNumColumn>
<DataColumn>
<Property name="property">companyId</Property>
@@ -783,15 +782,6 @@
<Editor/>
</DataColumn>
</DataGrid>
- <ToolBar id="tool" layoutConstraint="bottom">
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <Fill/>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
- </ToolBar>
</Container>
<Dialog id="dialogImg">
<Property name="width">55%</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
index 9f8b018..b287bea 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
@@ -15,11 +15,13 @@
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
+import java.text.DecimalFormat;
import java.util.*;
/**
- * @Description 鍑哄叆搴撶浉鍏虫姤琛�
+ * @Description 鍑哄叆搴撶浉鍏虫姤琛�
* @Author CZT
* @Date 2025/12/29 10:32
*/
@@ -51,20 +53,20 @@
result.put("deptId", deptId);
//鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- if (null != subDept) {
- deptName = subDept.getDeptName();
- }
+// String deptName = "";
+// SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
+// if (null != subDept) {
+// deptName = subDept.getDeptName();
+// }
String title = "姹囨�昏〃";
if ("IN".equals(type)) {
- title= deptName + "鍏ュ簱鏄庣粏姹囨��";
+ title = "鍏ュ簱鏄庣粏姹囨��";
}
if ("OUT".equals(type)) {
- title= deptName + "鍑哄簱鏄庣粏姹囨��";
+ title = "鍑哄簱鏄庣粏姹囨��";
}
if ("STORE".equals(type)) {
- title= deptName + "搴撳瓨姹囨�昏〃";
+ title = "搴撳瓨姹囨�昏〃";
}
result.put("end", new Date());
@@ -78,7 +80,6 @@
result.put("createTime", new Date());
result.put("title", title);
result.put("type", type);
-
return result;
}
@@ -98,12 +99,12 @@
result.put("deptId", deptId);
//鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- if (null != subDept) {
- deptName = subDept.getDeptName();
- }
- String title = deptName + "搴撳瓨姹囨�昏〃";
+// String deptName = "";
+// SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
+// if (null != subDept) {
+// deptName = subDept.getDeptName();
+// }
+ String title = "搴撳瓨姹囨�昏〃";
result.put("end", new Date());
Date start = DateUtil.getNewByDay(new Date(), -30);
@@ -115,7 +116,6 @@
result.put("createUser", ContextUtil.getLoginUserName());
result.put("createTime", new Date());
result.put("title", title);
-
return result;
}
@@ -139,13 +139,13 @@
//澶氬弬鏁板垎椤垫煡璇�
com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutRecord> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(0, 10000);
//鏀跺偍鍏徃鏌ヨ澶勭悊
- if(StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())){
+ if (StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())) {
String substring = param.getDeptId().substring(0, (param.getDeptId().length() - 3));
- if (!substring.equals(param.getCompanyId())){
+ if (!substring.equals(param.getCompanyId())) {
return new ArrayList<InoutRecord>();
}
}
- if(StringUtils.isEmpty(param.getDeptId())){
+ if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(param.getCompanyId());
}
@@ -162,8 +162,8 @@
int index = 1;
List<InoutRecord> list = new ArrayList<>();
for (InoutRecord record : result) {
- if(StringUtils.isNotBlank(record.getDeptId())){
- record.setCompanyId(record.getDeptId().substring(0,(record.getDeptId().length()-3)));
+ if (StringUtils.isNotBlank(record.getDeptId())) {
+ record.setCompanyId(record.getDeptId().substring(0, (record.getDeptId().length() - 3)));
}
list.add(record);
record.setRemarks(String.valueOf(index));
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 696bc3e..9e53b97 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -403,13 +403,11 @@
if(ViewType==1){
view.get("#form1").set("visible",true);
view.get("#dataGridMain1").set("visible",true);
- view.get("#tool").set("visible",true);
}

if(ViewType==2){
view.get("#form2").set("visible",true);
view.get("#dataGridMain2").set("visible",true);
- view.get("#tool").set("visible",true);
}

var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
@@ -714,6 +712,7 @@
<RowSelectorColumn/>
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
+ <Property name="width">30</Property>
</RowNumColumn>
<DataColumn>
<Property name="property">companyId</Property>
@@ -774,15 +773,6 @@
<Editor/>
</DataColumn>
</DataGrid>
- <ToolBar id="tool" layoutConstraint="bottom">
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <Fill/>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
- </ToolBar>
</Container>
<Dialog id="dialogImg">
<Property name="width">55%</Property>
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 3baa207..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,7 +131,7 @@
.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 = "鍏ュ簱鎶ヨ〃鏁版嵁";
@@ -147,13 +148,13 @@
//绮鍝佺鏄犲皠
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);
}
@@ -176,13 +177,13 @@
//绮鍝佺鏄犲皠
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);
}
@@ -192,6 +193,7 @@
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;
@@ -211,8 +213,8 @@
//绮鍝佺鏄犲皠
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);
@@ -223,6 +225,7 @@
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;
@@ -242,8 +245,8 @@
//绮鍝佺鏄犲皠
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);
@@ -271,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