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/impl/ProductionPlanServiceImpl.java |   61 ++++++++++++++++++++++++------
 1 files changed, 48 insertions(+), 13 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..f2e238c 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,9 @@
 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;
 
 /**
  * <br>
@@ -186,8 +187,8 @@
                 List<ProductionPlan> list = parseProductionPlans(dataArr, dataSyncType, totalCount);
                 if (!list.isEmpty()) {
                     //  澶勭悊鏇存柊鎴栨柊澧�
-                    processSaveOrUpdate(list);
-                    totalSynced += list.size();
+                    int affected = processSaveOrUpdate(list);
+                    totalSynced += affected;
                 }
 
                 //  鍒ゆ柇鏄惁杩樻湁涓嬩竴椤�
@@ -330,19 +331,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 +387,9 @@
             return null;
         }
     }
+
+    @Override
+    public List<ProductionPlanSummaryDto> summaryByProductType(ProductionPlanSummaryDto query) {
+        return baseMapper.selectSummaryByProductType(query);
+    }
 }

--
Gitblit v1.9.3