From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/java/com/ruoyi/home/service/HomeService.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/HomeService.java b/src/main/java/com/ruoyi/home/service/HomeService.java
index 1902488..2c3c89b 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -1,13 +1,12 @@
package com.ruoyi.home.service;
import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.home.dto.AnalysisCustomerContractAmountsDto;
-import com.ruoyi.home.dto.HomeBusinessDto;
-import com.ruoyi.home.dto.QualityStatisticsDto;
-import com.ruoyi.home.dto.StatisticsReceivablePayableDto;
+import com.ruoyi.dto.MapDto;
+import com.ruoyi.home.dto.*;
import java.text.ParseException;
import java.util.List;
+import java.util.Map;
/**
* @author :yys
@@ -26,4 +25,74 @@
List<ApproveProcess> todos() throws ParseException;
StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type);
+
+ Map<String, Object> approveAndDeviceTodos();
+
+ Long noticesCount();
+
+ ProductionProgressDto productionProgress();
+
+ ProductionTurnoverDto workInProcessTurnover();
+
+ DeptStaffDistributionDto deptStaffDistribution();
+
+ HomeSummaryDto summaryStatistics();
+
+ List<SupplierPurchaseRankingDto> supplierPurchaseRanking(Integer type);
+
+ CustomerRevenueAnalysisDto customerRevenueAnalysis(Long customerId, Integer type);
+
+ ProductCategoryDistributionDto productCategoryDistribution();
+
+ List<CustomerContributionRankingDto> customerContributionRanking(Integer type);
+
+ List<MapDto> productSalesAnalysis();
+
+ List<MapDto> rawMaterialPurchaseAmountRatio();
+
+ List<MapDto> salesPurchaseStorageProductCount();
+
+ List<Map<String, Object>> productInOutAnalysis(Integer type);
+
+ List<MapDto> productTurnoverDays();
+
+ List<Map<String, Object>> incomeExpenseAnalysis(Integer type);
+
+ List<MapDto> profitTrendAnalysis();
+
+ List<MapDto> expenseCompositionAnalysis(Integer type);
+
+ MonthlyIncomeDto monthlyIncome();
+
+ MonthlyExpenditureDto monthlyExpenditure();
+
+ List<InputOutputAnalysisDto> inputOutputAnalysis(Integer type);
+
+ List<MapDto> processOutputAnalysis(Integer type);
+
+ List<WorkOrderEfficiencyDto> workOrderEfficiencyAnalysis(Integer type);
+
+ List<ProductionAccountingDto> productionAccountingAnalysis(Integer type);
+
+ List<MapDto> orderCount();
+
+ QualityQualifiedAnalysisDto rawMaterialDetection(Integer type);
+
+ QualityQualifiedAnalysisDto processDetection(Integer type);
+
+ QualityQualifiedAnalysisDto factoryDetection(Integer type);
+
+ QualityInspectionCountDto qualityInspectionCount();
+
+ NonComplianceWarningDto nonComplianceWarning();
+
+ List<CompletedInspectionCountDto> completedInspectionCount();
+
+ List<UnqualifiedProductRankDto> unqualifiedProductRanking();
+
+ List<MapDto> unqualifiedProductProcessingAnalysis();
+
+ QualityStatisticsDto qualityInspectionStatistics(Integer type);
+
+ List<processDataProductionStatisticsDto> processDataProductionStatistics(Integer type, List<Long> processIds);
}
--
Gitblit v1.9.3