fix(appointments): exclude pickup trips from delivery calendar

2026-10-19 12:21:57 +08:00
parent aa195cef66
commit fafcf75014
3 changed files with 11 additions and 3 deletions
@@ -7,12 +7,14 @@ import org.apache.ibatis.annotations.Select;

@Mapper
 public interface FleetTripMapper extends BaseMapper<FleetTripEntity> {
+    /** 预约日历只读海外仓出库派送，取货入仓车次不属于排车类型。 */
    @Select("""
        SELECT trip_no,status,warehouse_id,warehouse_code,warehouse_name,planned_departure_at,
          expected_driver_end_at,departed_at,completed_at,stops_json
        FROM ll_fleet_trip
-        WHERE (departed_at IS NOT NULL AND departed_at>=#{from} AND departed_at<#{to})
-           OR (departed_at IS NULL AND planned_departure_at>=#{from} AND planned_departure_at<#{to})
+        WHERE trip_purpose='DELIVERY' AND (
+          (departed_at IS NOT NULL AND departed_at>=#{from} AND departed_at<#{to})
+           OR (departed_at IS NULL AND planned_departure_at>=#{from} AND planned_departure_at<#{to}))
        ORDER BY COALESCE(departed_at,planned_departure_at),trip_no LIMIT 2001
        """)
    java.util.List<FleetTripEntity> calendar(@Param("from") java.time.LocalDateTime from,@Param("to") java.time.LocalDateTime to);