From 476ae234c1f3aad9eaebbfa6011398cebafaaee4 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 10 Nov 2026 13:22:16 +0800
Subject: [PATCH] =?UTF-8?q?2026-11-10=20=E8=8E=B7=E5=8F=96=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E6=97=B6=E5=8E=BB=E6=8E=89site=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=94=E6=8C=89=E5=8E=9F=E5=80=BC=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=8E=BB=E6=8E=89=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spring/modules/code/vo/CodeDrawingVo.java |  3 ++
 .../mapper/code/CodeDrawingMapper.xml         | 29 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/spring/modules/code/vo/CodeDrawingVo.java b/src/main/java/com/spring/modules/code/vo/CodeDrawingVo.java
index 6e6dec94..c5165e6e 100644
--- a/src/main/java/com/spring/modules/code/vo/CodeDrawingVo.java
+++ b/src/main/java/com/spring/modules/code/vo/CodeDrawingVo.java
@@ -22,4 +22,7 @@ public class CodeDrawingVo extends CodeDrawing {
 
 
     private String erpPartDesc;
+
+    /** Y：获取编码回填，按 drawing_no 原值精确匹配且不区分 site */
+    private String exactFlag;
 }
diff --git a/src/main/resources/mapper/code/CodeDrawingMapper.xml b/src/main/resources/mapper/code/CodeDrawingMapper.xml
index 569f4bc6..242ffa4c 100644
--- a/src/main/resources/mapper/code/CodeDrawingMapper.xml
+++ b/src/main/resources/mapper/code/CodeDrawingMapper.xml
@@ -15,13 +15,18 @@
         from DC_partListDetail pd
                  left join DC_ItemDef d on pd.site = d.site and pd.item_no = d.item_no
         <where>
-            <if test="site != null and site != ''">
-                and pd.site = #{site}
+            <if test="exactFlag == null or exactFlag != 'Y'.toString()">
+                <if test="site != null and site != ''">
+                    and pd.site = #{site}
+                </if>
             </if>
             <if test="drawingNo != null and drawingNo != ''">
-                and drawing_no = #{drawingNo}
+                and pd.drawing_no = #{drawingNo}
             </if>
         </where>
+        <if test="exactFlag != null and exactFlag == 'Y'.toString()">
+            order by pd.site, pd.item_no
+        </if>
     </select>
 
     <select id="queryErpPart" resultType="com.spring.modules.part.entity.MasterPartInformationEntity">
@@ -45,11 +50,20 @@
         from DC_PartList p
                  left join part_catalog pc on p.erp_part_no = pc.part_no
         <where>
-            <if test="site != null and site != ''">
-                and p.site = #{site}
+            <if test="exactFlag == null or exactFlag != 'Y'.toString()">
+                <if test="site != null and site != ''">
+                    and p.site = #{site}
+                </if>
             </if>
             <if test="drawingNo != null and drawingNo != ''">
-                and p.drawing_no like #{drawingNo}
+                <choose>
+                    <when test="exactFlag != null and exactFlag == 'Y'.toString()">
+                        and p.drawing_no = #{drawingNo}
+                    </when>
+                    <otherwise>
+                        and p.drawing_no like #{drawingNo}
+                    </otherwise>
+                </choose>
             </if>
             <if test="drawingDesc != null and drawingDesc != ''">
                 and p.drawing_desc like #{drawingDesc}
@@ -73,6 +87,9 @@
                 and p.creator like #{creator}
             </if>
         </where>
+        <if test="exactFlag != null and exactFlag == 'Y'.toString()">
+            order by p.site, p.create_date
+        </if>
     </select>
 
     <select id="countGeneratedDrawingNo" resultType="int">