订单比对加上状态

bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml

@@ -163,14 +163,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
         <!--
-      订单比对专用 SQL（异步分页）：仅返回转单号，
+      订单比对专用 SQL（异步分页）：返回转单号 + 订单状态，
       筛选与列表相同；排除空转单号。
     -->
     <select id="selectTabOrderCompareKeyPage" resultType="java.util.HashMap">
-        SELECT TRANSFER_ORDER_ID FROM (
-            SELECT inner_q.TRANSFER_ORDER_ID AS TRANSFER_ORDER_ID, ROWNUM AS rn
+        SELECT TRANSFER_ORDER_ID, ORDER_STATUS FROM (
+            SELECT inner_q.TRANSFER_ORDER_ID AS TRANSFER_ORDER_ID,
+                   inner_q.ORDER_STATUS AS ORDER_STATUS,
+                   ROWNUM AS rn
               FROM (
-                SELECT o.TRANSFER_ORDER_ID, o.PICKUP_DATE, o.ORDER_ID
+                SELECT o.TRANSFER_ORDER_ID, o.ORDER_STATUS, o.PICKUP_DATE, o.ORDER_ID
                   FROM ${orderTable} o
                  WHERE
                 <include refid="tabOrderMonitorWhere"/>

bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml

@@ -220,6 +220,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            AND p.transfer_no IS NOT NULL AND p.transfer_no != ''
     </select>
 
+    <!-- 订单比对：本地转单号 + 订单状态（用于状态一致性比对） -->
+    <select id="selectTransferOrderStatuses" resultType="java.util.HashMap">
+        SELECT p.transfer_no AS transferNo, p.order_status AS orderStatus
+          FROM prc_order_bill p
+         WHERE p.transfer_no IN
+        <foreach collection="transferNos" item="tn" open="(" separator="," close=")">
+            #{tn}
+        </foreach>
+        <if test="customerCodes != null and customerCodes.size() > 0">
+           AND p.customer_code IN
+            <foreach collection="customerCodes" item="ccode" open="(" separator="," close=")">
+                #{ccode}
+            </foreach>
+        </if>
+           AND p.transfer_no IS NOT NULL AND p.transfer_no != ''
+    </select>
+
     <!-- 订单比对：上游单号中已落库本地的 order_no/tracking_no/transfer_no -->
     <select id="selectExistingOrderIdentifiers" resultType="String">
         SELECT DISTINCT hit.idn