From beb66826d7ca7faae90d03b5e0d21c882f5c9750 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 三月 2026 13:03:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java b/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
index 0638f1b..069c0c3 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
+import com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
-import com.ruoyi.staff.dto.StaffLeaveDto;
+
+import java.util.List;
/**
* <br>
@@ -18,4 +20,29 @@
*/
public interface ProductionPlanService extends IService<ProductionPlan> {
IPage<ProductionPlanDto> listPage(Page page, ProductionPlanDto productionPlanDto);
+
+ /**
+ * 鎵嬪姩鍚屾
+ */
+ void loadProdData();
+
+ /**
+ * 瀹氭椂鍚屾
+ */
+ void syncProdDataJob();
+
+ /**
+ * 鍚堝苟鐢熶骇璁″垝
+ */
+ boolean combine(ProductionPlanDto productionPlanDto);
+
+ /**
+ * 鍒涘缓鐢熶骇璁″垝
+ */
+ boolean add(ProductionPlanDto productionPlanDto);
+
+ /**
+ * 鎸夌収浜у搧绫诲埆姹囨�荤粺璁¢渶姹傞噺
+ */
+ List<ProductionPlanSummaryDto> summaryByProductType(ProductionPlanSummaryDto query);
}
--
Gitblit v1.9.3