From 8c6aad555647fcecaddfaed99516d8b93db837c8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 01 四月 2026 11:18:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/IProductionSettlementBatchesService.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/IProductionSettlementBatchesService.java b/src/main/java/com/ruoyi/production/service/IProductionSettlementBatchesService.java
index 53c24b0..8fecd09 100644
--- a/src/main/java/com/ruoyi/production/service/IProductionSettlementBatchesService.java
+++ b/src/main/java/com/ruoyi/production/service/IProductionSettlementBatchesService.java
@@ -1,10 +1,14 @@
package com.ruoyi.production.service;
+import com.ruoyi.production.dto.ProductionSettlementDetailsDto;
+import com.ruoyi.production.dto.ProductionSettlementDto;
+import com.ruoyi.production.dto.ProductionSettlementTotalDto;
import com.ruoyi.production.pojo.ProductionSettlementBatches;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
-import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -16,6 +20,13 @@
*/
public interface IProductionSettlementBatchesService extends IService<ProductionSettlementBatches> {
- void importProductionSettlement(MultipartFile file, LocalDate periodTime, String batchName);
+ void importProductionSettlement(MultipartFile file, ProductionSettlementDto dto);
+ Map<String, List<ProductionSettlementDetailsDto>> getSettlement(ProductionSettlementDto dto);
+
+ List<String> getProductTypes(ProductionSettlementDto dto);
+
+ List<String> getSubjectNames(ProductionSettlementDto dto);
+
+ ProductionSettlementTotalDto getTotalCosts(ProductionSettlementDto dto);
}
--
Gitblit v1.9.3