From e992aa74b2a75653f007ab12a83cfc28aee7d7a6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 28 四月 2026 17:33:03 +0800
Subject: [PATCH] fix: 报工台账导出修改
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 2b069af..151eccb 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -18,7 +18,9 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.production.dto.ProductionProductMainDetailExportDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
+import com.ruoyi.production.dto.ProductionProductMainSummaryExportDto;
import com.ruoyi.production.dto.ProductionReportDailySummaryDto;
import com.ruoyi.production.dto.ProductionReportStateDto;
import com.ruoyi.production.enums.ProductProcessEnum;
@@ -103,6 +105,58 @@
return result;
}
+ @Override
+ public List<ProductionProductMainSummaryExportDto> listSummaryExportData(ProductionProductMainDto productionProductMainDto) {
+ return listPageProductionProductMainDto(new Page<>(1, -1), productionProductMainDto)
+ .getRecords()
+ .stream()
+ .map(item -> {
+ ProductionProductMainSummaryExportDto exportDto = new ProductionProductMainSummaryExportDto();
+ exportDto.setProcess(item.getProcess());
+ exportDto.setWorkOrderNo(item.getWorkOrderNo());
+ exportDto.setSalesContractNo(item.getSalesContractNo());
+ exportDto.setProductOrderNpsNo(item.getProductOrderNpsNo());
+ exportDto.setProductName(item.getProductName());
+ exportDto.setProductModelName(item.getProductModelName());
+ exportDto.setUnit(item.getUnit());
+ exportDto.setProjectTotalHours(item.getProjectTotalHours());
+ exportDto.setProcessStandardHours(item.getProcessStandardHours());
+ exportDto.setActualReportHours(item.getActualReportHours());
+ exportDto.setDailyPersonHours(item.getDailyPersonHours());
+ exportDto.setOutputTotalQuantity(item.getOutputTotalQuantity());
+ exportDto.setScrapTotalQuantity(item.getScrapTotalQuantity());
+ return exportDto;
+ })
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public List<ProductionProductMainDetailExportDto> listDetailExportData(ProductionProductMainDto productionProductMainDto) {
+ return listPageProductionProductMainDetailDto(new Page<>(1, -1), productionProductMainDto)
+ .getRecords()
+ .stream()
+ .map(item -> {
+ ProductionProductMainDetailExportDto exportDto = new ProductionProductMainDetailExportDto();
+ exportDto.setProductNo(item.getProductNo());
+ exportDto.setNickName(item.getNickName());
+ exportDto.setProcess(item.getProcess());
+ exportDto.setWorkOrderNo(item.getWorkOrderNo());
+ exportDto.setSalesContractNo(item.getSalesContractNo());
+ exportDto.setProductOrderNpsNo(item.getProductOrderNpsNo());
+ exportDto.setProductName(item.getProductName());
+ exportDto.setProductModelName(item.getProductModelName());
+ exportDto.setQuantity(item.getQuantity());
+ exportDto.setScrapQty(item.getScrapQty());
+ exportDto.setUnit(item.getUnit());
+ exportDto.setProcessStandardHours(item.getProcessStandardHours());
+ exportDto.setActualReportHours(item.getActualReportHours());
+ exportDto.setDailyPersonHours(item.getDailyPersonHours());
+ exportDto.setCreateTime(item.getCreateTime());
+ return exportDto;
+ })
+ .collect(Collectors.toList());
+ }
+
private void fillHourDefaults(List<ProductionProductMainDto> records) {
if (records == null || records.isEmpty()) {
return;
--
Gitblit v1.9.3