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 | 189 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 163 insertions(+), 26 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 bc10824..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
@@ -1,13 +1,12 @@
package com.fzzy.common;
import com.fzzy.common.manager.ExportManager;
-import com.fzzy.igds.ReportInDetailPR;
-import com.fzzy.igds.ReportOutDetailPR;
-import com.fzzy.igds.SuperInventoryReportPR;
-import com.fzzy.igds.data.ExportWordParam;
-import com.fzzy.igds.data.InoutParam;
-import com.fzzy.igds.data.SuperInventoryReportData;
-import com.fzzy.igds.data.SuperInventoryReportParam;
+import com.fzzy.igds.*;
+import com.fzzy.igds.constant.FoodVariety;
+import com.fzzy.igds.data.*;
+import com.fzzy.igds.domain.Company;
+import com.fzzy.igds.domain.Depot;
+import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.service.SysDeptService;
import com.fzzy.igds.utils.ContextUtil;
@@ -24,6 +23,9 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* @Description 鏁版嵁瀵煎嚭鍏ュ彛
@@ -40,11 +42,13 @@
@Resource
private SysDeptService sysDeptService;
@Resource
- private ReportInDetailPR reportInDetailPR;
+ private ReportInoutPR reportInoutPR;
@Resource
- private ReportOutDetailPR reportOutDetailPR;
+ private CompanyPR companyPR;
@Resource
- private SuperInventoryReportPR superInventoryReportPR;
+ private DeptPR deptPR;
+ @Resource
+ private DepotPR depotPR;
/**
* 瀵煎嚭word骞朵笅杞�
@@ -62,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);
}
/**
@@ -90,31 +105,153 @@
@RequestMapping("/inout-excel")
@ResponseBody
public AjaxResult inOutExcel(InoutParam param) {
- //璁剧疆鏍囬
+//璁剧疆鏍囬
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));
if (null != subDept) {
deptName = subDept.getDeptName();
}
+ //鍒涘缓鏀跺偍鍏徃ID鍒板悕绉扮殑鏄犲皠
+ Map<String, String> companyMap = Optional.ofNullable(companyPR.getData())
+ .orElse(new ArrayList<>())
+ .stream()
+ .collect(Collectors.toMap(Company::getId, Company::getDwmc, (key1, key2) -> key2));
+ //鍒涘缓鎵�鍦ㄥ簱鍖篒D鍒板悕绉扮殑鏄犲皠
+ Map<String, String> deptMap = Optional.ofNullable(deptPR.getAllData())
+ .orElse(new ArrayList<>())
+ .stream()
+ .collect(Collectors.toMap(Dept::getId, Dept::getKqmc, (key1, key2) -> key2));
+ // 鍒涘缓浠撳簱ID鍒板悕绉扮殑鏄犲皠
+ Map<String, String> depotMap = Optional.ofNullable(depotPR.getData(null))
+ .orElse(new ArrayList<>())
+ .stream()
+ .collect(Collectors.toMap(Depot::getId, Depot::getName, (key1, key2) -> key2));
- //瀵煎嚭
- ExcelUtil<InoutRecord> util = new ExcelUtil<InoutRecord>(InoutRecord.class);
- return util.exportExcel(list, sheetName, deptName);
+ //缁勮瀹為檯瀵煎嚭鏁版嵁
+ 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) {
+ export = new InoutRecordInExport();
+ export.setId(record.getId());
+ export.setPlateNum(record.getPlateNum());
+ // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
+ String depotNameValue = depotMap.get(record.getDepotId());
+ export.setDepotId(depotNameValue != null ? depotNameValue : "");
+ //绮鍝佺鏄犲皠
+ 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.setCompleteTime(record.getCompleteTime());
+ export.setDeOther(record.getDeOther());
+ export.setUpdateLog(record.getUpdateLog());
+ exportList.add(export);
+ }
+ ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
+ return util.exportExcel(exportList, sheetName, deptName);
+ }
+
+ if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
+ sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
+ list = reportInoutPR.listRecord(param);
+ List<InoutRecordOutExport> exportList = new ArrayList<>();
+ InoutRecordOutExport export;
+ for (InoutRecord record : list) {
+ export = new InoutRecordOutExport();
+ export.setId(record.getId());
+ export.setPlateNum(record.getPlateNum());
+ // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
+ String depotNameValue = depotMap.get(record.getDepotId());
+ export.setDepotId(depotNameValue != null ? depotNameValue : "");
+ //绮鍝佺鏄犲皠
+ 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.setCompleteTime(record.getCompleteTime());
+ export.setDeOther(record.getDeOther());
+ export.setUpdateLog(record.getUpdateLog());
+ exportList.add(export);
+ }
+ ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
+ return util.exportExcel(exportList, sheetName, deptName);
+ }
+
+ if (StringUtils.isNotEmpty(param.getType()) && "IN_DETAIL".equals(param.getType())) {
+ sheetName = "鍏ュ簱鏄庣粏鎶ヨ〃鏁版嵁";
+ list = reportInoutPR.listRecord(param);
+ List<InoutRecordDetailInExport> exportList = new ArrayList<>();
+ InoutRecordDetailInExport export;
+ for (InoutRecord record : list) {
+ export = new InoutRecordDetailInExport();
+ //鏀跺偍鍏徃鏄犲皠
+ String companyNameValue = companyMap.get(record.getCompanyId());
+ export.setCompanyId(companyNameValue != null ? companyNameValue : "");
+ //搴撳尯鏄犲皠
+ String deptNameValue = deptMap.get(record.getDeptId());
+ export.setDeptId(deptNameValue != null ? deptNameValue : "");
+ export.setId(record.getId());
+ export.setPlateNum(record.getPlateNum());
+ // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
+ String depotNameValue = depotMap.get(record.getDepotId());
+ export.setDepotId(depotNameValue != null ? depotNameValue : "");
+ //绮鍝佺鏄犲皠
+ String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
+ export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
+ 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);
+ return util.exportExcel(exportList, sheetName, deptName);
+ }
+
+ if (StringUtils.isNotEmpty(param.getType()) && "OUT_DETAIL".equals(param.getType())) {
+ sheetName = "鍑哄簱鏄庣粏鎶ヨ〃鏁版嵁";
+ list = reportInoutPR.listRecord(param);
+ List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
+ InoutRecordDetailOutExport export;
+ for (InoutRecord record : list) {
+ export = new InoutRecordDetailOutExport();
+ //鏀跺偍鍏徃鏄犲皠
+ String companyNameValue = companyMap.get(record.getCompanyId());
+ export.setCompanyId(companyNameValue != null ? companyNameValue : "");
+ //搴撳尯鏄犲皠
+ String deptNameValue = deptMap.get(record.getDeptId());
+ export.setDeptId(deptNameValue != null ? deptNameValue : "");
+ export.setId(record.getId());
+ export.setPlateNum(record.getPlateNum());
+ // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
+ String depotNameValue = depotMap.get(record.getDepotId());
+ export.setDepotId(depotNameValue != null ? depotNameValue : "");
+ //绮鍝佺鏄犲皠
+ String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
+ export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
+ 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);
+ return util.exportExcel(exportList, sheetName, deptName);
+ }
+ return AjaxResult.error("鍙傛暟閿欒");
}
/**
@@ -127,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