From a0c9dc592d0e1487e10af272a612777df3a7cc40 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 20 Oct 2025 09:45:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/factory/dao/PartAttributeMapper.java  | 3 ++-
 .../service/impl/IfsInventoryInitServiceImpl.java        | 2 +-
 .../resources/mapper/factory/PartAttributeMapper.xml     | 9 ++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/factory/dao/PartAttributeMapper.java b/src/main/java/com/gaotao/modules/factory/dao/PartAttributeMapper.java
index 46e4661..639145f 100644
--- a/src/main/java/com/gaotao/modules/factory/dao/PartAttributeMapper.java
+++ b/src/main/java/com/gaotao/modules/factory/dao/PartAttributeMapper.java
@@ -35,5 +35,6 @@ public interface PartAttributeMapper extends BaseMapper<PartAttribute> {
     /**
      * 根据站点和料号查询料件属性
      */
-    PartAttribute getPartAttributeByKey(@Param("site") String site, @Param("partNo") String partNo, @Param("height") BigDecimal height);
+    PartAttribute getPartAttributeByHeight(@Param("site") String site, @Param("partNo") String partNo, @Param("height") BigDecimal height);
+
 }
diff --git a/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java b/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java
index b86d69f..3ae79d9 100644
--- a/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/warehouse/service/impl/IfsInventoryInitServiceImpl.java
@@ -826,7 +826,7 @@ public class IfsInventoryInitServiceImpl implements IfsInventoryInitService {
     private boolean insertPartAttributeIfNotExists(PartAttribute partAttribute) {
         try {
             // 检查是否已存在
-            PartAttribute existing = partAttributeMapper.getPartAttributeByKey(
+            PartAttribute existing = partAttributeMapper.getPartAttributeByHeight(
                 partAttribute.getSite(), partAttribute.getPartNo(), partAttribute.getHeight());
 
             if (existing != null) {
diff --git a/src/main/resources/mapper/factory/PartAttributeMapper.xml b/src/main/resources/mapper/factory/PartAttributeMapper.xml
index 0929c97..25150aa 100644
--- a/src/main/resources/mapper/factory/PartAttributeMapper.xml
+++ b/src/main/resources/mapper/factory/PartAttributeMapper.xml
@@ -55,7 +55,14 @@
     <!-- 根据站点和料号查询料件属性 -->
     <select id="getPartAttributeByKey" resultMap="PartAttributeResult">
         <include refid="selectPartAttributeVo"/>
-        WHERE site = #{site} AND part_no = #{partNo} and height=#{height}
+        WHERE site = #{site} AND part_no = #{partNo}
     </select>
 
+    <select id="getPartAttributeByHeight" resultMap="PartAttributeResult">
+        <include refid="selectPartAttributeVo"/>
+        WHERE site = #{site} AND part_no = #{partNo}
+        <if test="height != null and height != ''">
+            AND height = #{height}
+        </if>
+    </select>
 </mapper>