From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java b/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
index eed04e8..7375c5d 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
@@ -6,7 +6,9 @@
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -32,8 +34,37 @@
void syncProdDataJob();
/**
+ * 鍚堝苟鐢熶骇璁″垝
+ */
+ boolean combine(ProductionPlanDto productionPlanDto);
+
+ /**
+ * 鍒涘缓鐢熶骇璁″垝
+ */
+ boolean add(ProductionPlanDto productionPlanDto);
+
+ /**
+ * 鏇存柊鐢熶骇璁″垝
+ */
+ boolean update(ProductionPlanDto productionPlanDto);
+
+ /**
+ * 鍒犻櫎鐢熶骇璁″垝
+ */
+ boolean delete(List<Long> ids);
+
+ /**
* 鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺
*/
List<ProductionPlanSummaryDto> summaryByProductType(ProductionPlanSummaryDto query);
+ /**
+ * 瀵煎叆鏁版嵁
+ */
+ void importProdData(MultipartFile file);
+
+ /**
+ * 瀵煎嚭鏁版嵁
+ */
+ void exportProdData(HttpServletResponse response, List<Long> ids);
}
--
Gitblit v1.9.3