From c3b81ea987501dc2f5dc3c8db23038eeb8f290e9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 12 三月 2026 17:56:16 +0800
Subject: [PATCH] fix: 产品保存时唯一性导致数据丢失

---
 src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
index bd32f1f..41aa10f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
@@ -302,10 +302,17 @@
 
         for (ProductMaterialSku sku : list) {
 
-            ProductMaterialSku exist =
-                    productMaterialSkuService.getOne(new LambdaQueryWrapper<ProductMaterialSku>()
-                            .eq(ProductMaterialSku::getMaterialId, sku.getMaterialId())
-                            .eq(ProductMaterialSku::getSpecification, sku.getSpecification()));
+            LambdaQueryWrapper<ProductMaterialSku> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(ProductMaterialSku::getMaterialId, sku.getMaterialId())
+                    .eq(ProductMaterialSku::getSpecification, sku.getSpecification());
+
+            if (StringUtils.isNotEmpty(sku.getMaterialCode())) {
+                wrapper.eq(ProductMaterialSku::getMaterialCode, sku.getMaterialCode());
+            } else {
+                wrapper.isNull(ProductMaterialSku::getMaterialCode);
+            }
+
+            ProductMaterialSku exist = productMaterialSkuService.getOne(wrapper);
             if (exist == null) {
                 productMaterialSkuService.save(sku);
                 affected++;

--
Gitblit v1.9.3