From e4de36d3f47834b686e769a3047206a5fd1dcd7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Fri, 17 Oct 2025 16:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/bas/BasProduct/domain/BasProduct.java |  2 ++
 .../service/impl/BasProductServiceImpl.java         | 13 ++++++++++---
 .../main/resources/mapper/bas/BasProductMapper.xml  |  3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
index a472695..383df92 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
@@ -215,5 +215,7 @@ public class BasProduct extends BaseEntity
 
     private Integer quantity;
 
+    private String updateId;
+
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java
index 4d15a89..1f707f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java
@@ -3,8 +3,10 @@ package com.ruoyi.bas.BasProduct.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import com.ruoyi.common.utils.SecurityUtils;
+import org.apache.commons.math3.stat.descriptive.summary.Product;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.bas.BasProduct.mapper.BasProductMapper;
@@ -91,10 +93,15 @@ public class BasProductServiceImpl implements IBasProductService
     @Override
     public int updateBasProduct(BasProduct basProduct)
     {
-        BasProduct basProduct1 = basProductMapper.selectBasProductByProductId(basProduct.getProductId());
-        if(basProduct1!=null){
-            return 0;
+        BasProduct basProduct1 = new BasProduct();
+        basProduct1.setProductId(basProduct.getProductId());
+        basProduct1.setUpdateId(basProduct.getProductGuid());
+        List<BasProduct> basProducts = basProductMapper.selectBasProductList(basProduct1);
+        if (CollUtil.isNotEmpty(basProducts)){
+            throw new RuntimeException("物料编号已存在");
         }
+
+
         return basProductMapper.updateBasProduct(basProduct);
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasProductMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasProductMapper.xml
index 8c572db..820000c 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasProductMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasProductMapper.xml
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBasProductList" parameterType="BasProduct" resultMap="BasProductResult">
         <include refid="selectBasProductVo"/>
         <where>  
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
             <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
             <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
             <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
@@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
             <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
             <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
+            <if test="updateId != null  and updateId != ''"> and product_guid != #{updateId}</if>
         </where>
     </select>