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/impl/ProductionPlanServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
index 7f8d5e1..994e8c0 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -35,6 +35,8 @@
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
+import static com.ruoyi.productionPlan.enums.DataSourceTypeEnum.PRODUCTION_FORECAST;
+
/**
* <br>
* 閿�鍞敓浜ч渶姹傛帴鍙ｅ疄鐜扮被
@@ -88,6 +90,7 @@
* 鍚堝苟鐢熶骇璁″垝
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean combine(ProductionPlanDto productionPlanDto) {
if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
return false;
@@ -152,6 +155,14 @@
return true;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean add(ProductionPlanDto productionPlanDto) {
+ productionPlanDto.setDataSourceType(PRODUCTION_FORECAST.getCode());
+ productionPlanMapper.insert(productionPlanDto);
+ return true;
+ }
+
/**
* 鍚屾鏁版嵁
*/
--
Gitblit v1.9.3