提交

lastleg-service/src/main/java/com/baiyue/lastleg/mapper/CustomerOrderProgressMapper.java

@@ -4,62 +4,23 @@ import com.baiyue.lastleg.dto.CustomerOrderProgress;
 import org.apache.ibatis.annotations.*;
 import java.util.List;
 
-/** Batch read of every actual source, never the representative MIN(order_id) on a shared pallet. */
+/** 按客户及不可变来源明细读取进度，不使用混托的代表订单。 */
 @Mapper
 public interface CustomerOrderProgressMapper {
-    /** 本客户明细决定归属，真实主阶段和实际发车时间决定待排及在途数量。 */
+    /** 已排车只统计有效待出库单的来源数量，与平台出库单节点一致；在途仍要求实际发车。 */
     @Select("""
         <script>
         WITH scheduled AS (
-          SELECT line.order_id,SUM(a.planned_package_count) AS packages
-          FROM ll_dispatch_order d
-          JOIN ll_dispatch_item i ON i.dispatch_order_id=d.id
-          JOIN ll_inbound_plan_pallet_allocation a ON a.pallet_id=i.plan_pallet_id
-          JOIN ll_inbound_plan_line line ON line.id=a.line_id AND line.customer_id=i.customer_id
+          SELECT i.source_order_id AS order_id,SUM(i.package_count) AS packages
+          FROM ll_outbound_order b
+          JOIN ll_outbound_pallet_item i ON i.outbound_order_id=b.id AND i.customer_id=b.customer_id
           <if test="orderIds != null">
-          JOIN ll_order planned_source ON planned_source.id=line.order_id AND planned_source.customer_id=#{customerId}
-            AND planned_source.source_order_id IN <foreach collection="orderIds" item="id" open="(" separator="," close=")">#{id}</foreach>
+          JOIN ll_order outbound_source ON outbound_source.id=i.source_order_id AND outbound_source.customer_id=#{customerId}
+            AND outbound_source.source_order_id IN <foreach collection="orderIds" item="id" open="(" separator="," close=")">#{id}</foreach>
           </if>
-          WHERE i.customer_id=#{customerId} AND d.status='ACTIVE'
-            AND d.stage IN ('BEFORE_LOADING','LOADING','AFTER_LOADING')
-            AND i.warehouse_pallet_id IS NULL
-          GROUP BY line.order_id
-          UNION ALL
-          SELECT b.inbound_order_id AS order_id,SUM(p.available_packages+COALESCE(pk.packages,0)) AS packages
-          FROM ll_dispatch_order d
-          JOIN ll_dispatch_item i ON i.dispatch_order_id=d.id
-          JOIN ll_inventory_position p ON p.customer_id=i.customer_id AND p.pallet_id=i.warehouse_pallet_id
-            AND p.overseas_warehouse_id=i.overseas_warehouse_id
-          JOIN ll_inventory_balance b ON b.id=p.balance_id AND b.customer_id=i.customer_id
-          <if test="orderIds != null">
-          JOIN ll_order stock_source ON stock_source.id=b.inbound_order_id AND stock_source.customer_id=#{customerId}
-            AND stock_source.source_order_id IN <foreach collection="orderIds" item="id" open="(" separator="," close=")">#{id}</foreach>
-          </if>
-          LEFT JOIN (SELECT pick.dispatch_item_id,pick.inventory_position_id,SUM(pick.packages) AS packages
-            FROM ll_dispatch_pda_pick pick
-            <if test="orderIds != null">
-            JOIN ll_inventory_position scoped_position ON scoped_position.id=pick.inventory_position_id
-              AND scoped_position.customer_id=pick.customer_id
-            JOIN ll_inventory_balance scoped_balance ON scoped_balance.id=scoped_position.balance_id
-              AND scoped_balance.customer_id=pick.customer_id
-            JOIN ll_order scoped_order ON scoped_order.id=scoped_balance.inbound_order_id
-              AND scoped_order.customer_id=pick.customer_id
-              AND scoped_order.source_order_id IN <foreach collection="orderIds" item="id" open="(" separator="," close=")">#{id}</foreach>
-            </if>
-            WHERE pick.customer_id=#{customerId}
-            GROUP BY pick.dispatch_item_id,pick.inventory_position_id) pk
-            ON pk.dispatch_item_id=i.id AND pk.inventory_position_id=p.id
-          WHERE i.customer_id=#{customerId} AND d.status='ACTIVE'
-            AND d.stage IN ('BEFORE_LOADING','LOADING','AFTER_LOADING')
-            AND (i.plan_pallet_id IS NULL OR EXISTS (
-              SELECT 1 FROM ll_inbound_plan_pallet_allocation a
-              JOIN ll_inbound_plan_line line ON line.id=a.line_id AND line.customer_id=i.customer_id
-          <if test="orderIds != null">
-          JOIN ll_order planned_source ON planned_source.id=line.order_id AND planned_source.customer_id=#{customerId}
-            AND planned_source.source_order_id IN <foreach collection="orderIds" item="id" open="(" separator="," close=")">#{id}</foreach>
-          </if>
-              WHERE a.pallet_id=i.plan_pallet_id AND line.order_id=b.inbound_order_id))
-          GROUP BY b.inbound_order_id
+          WHERE i.customer_id=#{customerId}
+            AND b.status NOT IN ('CANCELLED','CANCELED','OUTBOUNDED')
+          GROUP BY i.source_order_id
         ), departed AS (
           SELECT a.order_id,SUM(a.packages) AS packages
           FROM ll_dispatch_pda_pick_order a