From 931beabfe37a733b6d2fb92119dab3aabe869c98 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 11:08:34 +0800
Subject: [PATCH] Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java | 6 +++++-
1 files changed, 5 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 eed04e8..b90f165 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
@@ -31,9 +31,13 @@
*/
void syncProdDataJob();
+ /**
+ * 鍚堝苟鐢熶骇璁″垝
+ */
+ boolean combine(ProductionPlanDto productionPlanDto);
+
/**
* 鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺
*/
List<ProductionPlanSummaryDto> summaryByProductType(ProductionPlanSummaryDto query);
-
}
--
Gitblit v1.9.3