From a4440d7932b1c2e3eefd5f860d41d6bf47052070 Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Wed, 21 Oct 2026 11:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=9A=84=E4=BA=A7=E5=93=81=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../price/domain/vo/TabOrderMonitorQuery.java |  2 +-
 .../price/OracleUpstreamOrderMapper.xml       | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TabOrderMonitorQuery.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TabOrderMonitorQuery.java
index f66089d2..69f56d68 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TabOrderMonitorQuery.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TabOrderMonitorQuery.java
@@ -36,7 +36,7 @@ public class TabOrderMonitorQuery implements Serializable
      * 有单号时不再强制要求客户+提货时间。
      */
     private List<String> orderIdentifiers;
-    /** 上游产品代码 PRODUCT_CODE（产品比对点进订单号时使用） */
+    /** 上游产品代码 LINE_CODE（产品比对点进订单号时使用） */
     private String productCode;
     /** 分批同步计费每批条数 */
     private Integer batchSize;
diff --git a/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml
index 6d1d79b3..c7568477 100644
--- a/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml
+++ b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml
@@ -185,33 +185,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
-    <!-- Distinct product codes under the same filters (no pagination). -->
+    <!-- Distinct LINE_CODE under the same filters (product check; alias keeps Java keys stable). -->
     <select id="selectTabOrderProductCodes" resultType="java.util.HashMap">
         SELECT o.CUSTOMER_CODE AS CUSTOMER_CODE,
-               o.PRODUCT_CODE AS PRODUCT_CODE,
-               MAX(o.PRODUCT_NAME) AS PRODUCT_NAME,
+               o.LINE_CODE AS PRODUCT_CODE,
+               MAX(o.LINE_NAME) AS PRODUCT_NAME,
                COUNT(1) AS ORDER_COUNT
           FROM ${orderTable} o
          WHERE
         <include refid="tabOrderMonitorWhere"/>
-           AND o.PRODUCT_CODE IS NOT NULL
-         GROUP BY o.CUSTOMER_CODE, o.PRODUCT_CODE
-         ORDER BY o.CUSTOMER_CODE, o.PRODUCT_CODE
+           AND o.LINE_CODE IS NOT NULL
+         GROUP BY o.CUSTOMER_CODE, o.LINE_CODE
+         ORDER BY o.CUSTOMER_CODE, o.LINE_CODE
     </select>
 
-    <!-- Order numbers for one upstream product under the same filters. -->
+    <!-- Order numbers for one upstream LINE_CODE under the same filters. -->
     <select id="selectTabOrderIdsByProduct" resultType="java.util.HashMap">
         SELECT o.ORDER_ID AS ORDER_ID,
                o.ORG_ORDER_ID AS ORG_ORDER_ID,
                o.TRANSFER_ORDER_ID AS TRANSFER_ORDER_ID,
                o.CUSTOMER_CODE AS CUSTOMER_CODE,
-               o.PRODUCT_CODE AS PRODUCT_CODE,
-               o.PRODUCT_NAME AS PRODUCT_NAME,
+               o.LINE_CODE AS PRODUCT_CODE,
+               o.LINE_NAME AS PRODUCT_NAME,
                o.PICKUP_DATE AS PICKUP_DATE
           FROM ${orderTable} o
          WHERE
         <include refid="tabOrderMonitorWhere"/>
-           AND o.PRODUCT_CODE = #{query.productCode}
+           AND o.LINE_CODE = #{query.productCode}
          ORDER BY o.PICKUP_DATE DESC, o.ORDER_ID DESC
     </select>