From eca8855b8ddea3036b7fed6b4531fd7369ed57ab Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Tue, 20 Oct 2026 16:20:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../price/oracle/CustomerKeywordResolver.java |  8 +++++
 .../price/CustomerCodeResolveMapper.xml       | 31 ++++++++++++++-----
 .../src/views/monitor/orderSource/index.vue   |  2 +-
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/bms-back/bms-system/src/main/java/com/bms/price/oracle/CustomerKeywordResolver.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/CustomerKeywordResolver.java
index cdbe1e2b..243f7a3b 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/oracle/CustomerKeywordResolver.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/CustomerKeywordResolver.java
@@ -61,6 +61,14 @@ public class CustomerKeywordResolver
                 }
             }
         }
+        // Pass-through raw keywords (covers codes not yet in ctr_customer)
+        for (String kw : keywords)
+        {
+            if (StringUtils.isNotEmpty(kw))
+            {
+                codes.add(kw.trim());
+            }
+        }
         query.setCustomerCodes(codes.isEmpty() ? null : new ArrayList<String>(codes));
         // 名称已全部解析为代码；Oracle 侧不保留跨列 OR 条件
         query.setCustomerKeywords(null);
diff --git a/bms-back/bms-system/src/main/resources/mapper/price/CustomerCodeResolveMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/CustomerCodeResolveMapper.xml
index 4b8ebed9..2cacd799 100644
--- a/bms-back/bms-system/src/main/resources/mapper/price/CustomerCodeResolveMapper.xml
+++ b/bms-back/bms-system/src/main/resources/mapper/price/CustomerCodeResolveMapper.xml
@@ -4,14 +4,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bms.price.mapper.CustomerCodeResolveMapper">
 
-    <!-- 客户主数据仅 200 余行，名称精确匹配在 MySQL 侧代价极低 -->
+    <!--
+      Resolve customer keywords to codes for Oracle TAB_ORDER.CUSTOMER_CODE IN (...).
+      Match: customer_code / customer_name / customer_code_dw (对外代码).
+      Return both internal code and outer code so either form on TAB_ORDER hits.
+    -->
     <select id="selectCustomerCodesByKeywords" resultType="java.lang.String">
-        SELECT customer_code
-          FROM ctr_customer
-         WHERE
-        <foreach collection="keywords" item="kw" separator=" OR ">
-            customer_code = #{kw} OR customer_name = #{kw}
-        </foreach>
+        SELECT DISTINCT code FROM (
+            SELECT customer_code AS code
+              FROM ctr_customer
+             WHERE customer_code IS NOT NULL AND customer_code &lt;&gt; ''
+               AND (
+            <foreach collection="keywords" item="kw" separator=" OR ">
+                customer_code = #{kw} OR customer_name = #{kw} OR customer_code_dw = #{kw}
+            </foreach>
+               )
+            UNION ALL
+            SELECT customer_code_dw AS code
+              FROM ctr_customer
+             WHERE customer_code_dw IS NOT NULL AND customer_code_dw &lt;&gt; ''
+               AND (
+            <foreach collection="keywords" item="kw" separator=" OR ">
+                customer_code = #{kw} OR customer_name = #{kw} OR customer_code_dw = #{kw}
+            </foreach>
+               )
+        ) t
     </select>
 
 </mapper>
diff --git a/bms-front/src/views/monitor/orderSource/index.vue b/bms-front/src/views/monitor/orderSource/index.vue
index 7420be00..6f8d8253 100644
--- a/bms-front/src/views/monitor/orderSource/index.vue
+++ b/bms-front/src/views/monitor/orderSource/index.vue
@@ -136,7 +136,7 @@ const searchColumns = [
     label: '客户',
     prop: 'customerKeywords',
     component: 'textarea',
-    placeholder: '客户名称/客户代码，一行一个',
+    placeholder: '客户名称/客户编码/对外代码，一行一个',
     props: {
       rows: 2,
       autosize: { minRows: 1, maxRows: 4 },