From 2f4d2035c95ee2315f0a2de3d07bfae32a8d4d85 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 10 Sep 2026 13:48:04 +0800
Subject: [PATCH] =?UTF-8?q?2026-09-10=20=E4=BF=9D=E5=AD=98=E2=80=9D?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E2=80=9C=E6=97=B6=E6=A0=A1=E9=AA=8C=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E6=98=AF=E5=90=A6=E5=B7=B2=E7=94=9F=E6=88=90=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E9=A6=96=E5=AD=97=E6=AF=8DF=E5=92=8CR?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code/mapper/CodeDrawingMapper.java        |  3 +++
 .../impl/PartInformationServiceImpl.java      | 27 +++++++++++++++++++
 .../mapper/code/CodeDrawingMapper.xml         | 12 +++++++++
 3 files changed, 42 insertions(+)

diff --git a/src/main/java/com/spring/modules/code/mapper/CodeDrawingMapper.java b/src/main/java/com/spring/modules/code/mapper/CodeDrawingMapper.java
index fc563e7d..ae01d384 100644
--- a/src/main/java/com/spring/modules/code/mapper/CodeDrawingMapper.java
+++ b/src/main/java/com/spring/modules/code/mapper/CodeDrawingMapper.java
@@ -6,6 +6,7 @@ import com.spring.modules.code.entity.CodeDrawingDetail;
 import com.spring.modules.code.vo.CodeDrawingVo;
 import com.spring.modules.part.entity.MasterPartInformationEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,4 +17,6 @@ public interface CodeDrawingMapper extends BaseMapper<CodeDrawing> {
     MasterPartInformationEntity queryErpPart(CodeDrawing codeDrawing);
 
     List<CodeDrawingVo> queryCodeDrawingList(CodeDrawingVo codeDrawing);
+
+    int countGeneratedDrawingNo(@Param("site") String site, @Param("normalizedDrawingNo") String normalizedDrawingNo);
 }
diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 7ee330c6..d36e197d 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -35,6 +35,7 @@ import com.spring.modules.change.entity.TechnicalSpecificationData;
 import com.spring.modules.change.mapper.ChangeManagementMapper;
 import com.spring.modules.change.vo.ChangeRequestDetailVo;
 import com.spring.modules.change.vo.ChangeRequestVo;
+import com.spring.modules.code.mapper.CodeDrawingMapper;
 import com.spring.modules.customer.entity.CustomerGroupInformationEntity;
 import com.spring.modules.oss.dao.SysOssDao;
 import com.spring.modules.oss.entity.SysOssEntity;
@@ -117,6 +118,9 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
     @Autowired
     private PartInformationMapper partInformationMapper;
 
+    @Autowired
+    private CodeDrawingMapper codeDrawingMapper;
+
     @Autowired
     private UmInformationMapper umInformationMapper;
 
@@ -1281,6 +1285,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         if (!StringUtils.hasText(drawingNo) || "NA".equalsIgnoreCase(drawingNo)) {
             throw new RuntimeException("编码为空，无法自动保存！");
         }
+        assertDrawingNoGenerated(site, drawingNo);
         PartInformationEntity partData = partInformationMapper.selectOne(
                 new QueryWrapper<PartInformationEntity>()
                         .eq("site", site)
@@ -1356,6 +1361,28 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         }
     }
 
+    private void assertDrawingNoGenerated(String site, String drawingNo) {
+        String normalizedDrawingNo = stripLeadingFrPrefix(drawingNo);
+        if (!StringUtils.hasText(normalizedDrawingNo)) {
+            throw new RuntimeException("该编码尚未生成，不能保存");
+        }
+        Integer count = codeDrawingMapper.countGeneratedDrawingNo(site, normalizedDrawingNo);
+        if (count == null || count <= 0) {
+            throw new RuntimeException("该编码尚未生成，不能保存");
+        }
+    }
+
+    private String stripLeadingFrPrefix(String drawingNo) {
+        String text = normalizePartAndDrawingText(drawingNo);
+        if (text.length() > 1) {
+            char first = Character.toUpperCase(text.charAt(0));
+            if (first == 'F' || first == 'R') {
+                return text.substring(1);
+            }
+        }
+        return text;
+    }
+
     private String normalizePartAndDrawingText(String text) {
         if (text == null) {
             return "";
diff --git a/src/main/resources/mapper/code/CodeDrawingMapper.xml b/src/main/resources/mapper/code/CodeDrawingMapper.xml
index 8873b256..84bc411d 100644
--- a/src/main/resources/mapper/code/CodeDrawingMapper.xml
+++ b/src/main/resources/mapper/code/CodeDrawingMapper.xml
@@ -74,4 +74,16 @@
             </if>
         </where>
     </select>
+
+    <select id="countGeneratedDrawingNo" resultType="int">
+        select count(1)
+        from DC_PartList
+        where site = #{site}
+          and UPPER(
+                case
+                    when UPPER(LEFT(drawing_no, 1)) in ('F', 'R') then SUBSTRING(drawing_no, 2, LEN(drawing_no))
+                    else drawing_no
+                end
+            ) = UPPER(#{normalizedDrawingNo})
+    </select>
 </mapper>