From 4d853e25a3e28c1a8c92d105729946dd9fd5a191 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 12:04:35 +0800
Subject: [PATCH] 创建生产计划
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 15 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 595db7e..994e8c0 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
+import com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto;
import com.ruoyi.productionPlan.mapper.ProductionPlanMapper;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
import com.ruoyi.productionPlan.service.ProductionPlanService;
@@ -30,9 +31,11 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.productionPlan.enums.DataSourceTypeEnum.PRODUCTION_FORECAST;
/**
* <br>
@@ -87,6 +90,7 @@
* 鍚堝苟鐢熶骇璁″垝
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean combine(ProductionPlanDto productionPlanDto) {
if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
return false;
@@ -115,17 +119,47 @@
.map(ProductionPlan::getVolume)
.filter(v -> v != null)
.reduce(BigDecimal.ZERO, BigDecimal::add);
+ // 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鏂规暟
+ if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalVolume) > 0) {
+ log.warn("鍚堝苟澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庢柟鏁�");
+ return false;
+ }
+
+ // 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
+ BigDecimal assignedVolume = BigDecimal.ZERO;
+ for (ProductionPlan plan : plans) {
+ BigDecimal volume = plan.getVolume();
+ if (volume == null) {
+ continue;
+ }
+
+ if (assignedVolume.add(volume).compareTo(productionPlanDto.getTotalAssignedQuantity()) >= 0) {
+ // 鏈�鍚庝竴涓鍒掞紝鍒嗛厤鍓╀綑鏂规暟
+ plan.setAssignedQuantity(productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume));
+ break;
+ }
+
+ // 鍒嗛厤褰撳墠璁″垝鏂规暟
+ plan.setAssignedQuantity(volume);
+ productionPlanMapper.updateById(plan);
+ assignedVolume = assignedVolume.add(volume);
+ }
// 鍒涘缓鐢熶骇璁㈠崟
ProductOrder productOrder = new ProductOrder();
- // 鍚堝苟鐢熶骇璁″垝ids
String combineIds = StringUtils.join(productionPlanDto.getIds(), ",");
productOrder.setCombineProductionPlanIds(combineIds);
- // 涓嬪彂鏁伴噺
productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
productOrderService.addProductOrder(productOrder);
+ return true;
+ }
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean add(ProductionPlanDto productionPlanDto) {
+ productionPlanDto.setDataSourceType(PRODUCTION_FORECAST.getCode());
+ productionPlanMapper.insert(productionPlanDto);
return true;
}
@@ -186,8 +220,8 @@
List<ProductionPlan> list = parseProductionPlans(dataArr, dataSyncType, totalCount);
if (!list.isEmpty()) {
// 澶勭悊鏇存柊鎴栨柊澧�
- processSaveOrUpdate(list);
- totalSynced += list.size();
+ int affected = processSaveOrUpdate(list);
+ totalSynced += affected;
}
// 鍒ゆ柇鏄惁杩樻湁涓嬩竴椤�
@@ -330,19 +364,48 @@
return list;
}
- private void processSaveOrUpdate(List<ProductionPlan> list) {
+ private int processSaveOrUpdate(List<ProductionPlan> list) {
+ if (list == null || list.isEmpty()) {
+ return 0;
+ }
+ int affected = 0;
+
+ // 鍘婚噸 formInstanceId
+ Set<String> formIds = list.stream()
+ .map(ProductionPlan::getFormInstanceId)
+ .collect(Collectors.toSet());
+
+ // 鏌ヨ鏁版嵁搴撳凡鏈夋暟鎹�
+ List<ProductionPlan> existList = this.list(new LambdaQueryWrapper<ProductionPlan>().in(ProductionPlan::getFormInstanceId, formIds));
+
+ // Map (formInstanceId + materialCode)
+ Map<String, ProductionPlan> existMap = new HashMap<>();
+ for (ProductionPlan p : existList) {
+ String key = p.getFormInstanceId() + "_" + p.getMaterialCode();
+ existMap.put(key, p);
+ }
+
+ // 閬嶅巻鍚屾鏁版嵁
for (ProductionPlan plan : list) {
- LambdaQueryWrapper<ProductionPlan> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ProductionPlan::getFormInstanceId, plan.getFormInstanceId())
- .eq(ProductionPlan::getMaterialCode, plan.getMaterialCode());
- ProductionPlan existing = this.getOne(queryWrapper);
- if (existing != null) {
- plan.setId(existing.getId());
- this.updateById(plan);
- } else {
+ String key = plan.getFormInstanceId() + "_" + plan.getMaterialCode();
+ ProductionPlan exist = existMap.get(key);
+ if (exist == null) {
+ // 鏂板
this.save(plan);
+ affected++;
+ log.info("鏂板鏁版嵁 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getMaterialCode());
+ } else {
+ // 鍒ゆ柇鏄惁闇�瑕佹洿鏂�
+ if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(plan.getFormModifiedTime())) {
+ plan.setId(exist.getId());
+ plan.setCreateTime(exist.getCreateTime());
+ this.updateById(plan);
+ affected++;
+ log.info("鏇存柊鏁版嵁 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getMaterialCode());
+ }
}
}
+ return affected;
}
private LocalDateTime parseUtcTime(String utcString) {
@@ -357,4 +420,9 @@
return null;
}
}
+
+ @Override
+ public List<ProductionPlanSummaryDto> summaryByProductType(ProductionPlanSummaryDto query) {
+ return baseMapper.selectSummaryByProductType(query);
+ }
}
--
Gitblit v1.9.3