From 58e4c87fb61b54c3b84f692c84fef096f8e03a1b Mon Sep 17 00:00:00 2001
From: egg <egg@localhost>
Date: Mon, 23 Feb 2026 07:08:27 +0800
Subject: [PATCH] feat(reject-history): two-phase query architecture with
 cached views
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace per-interaction Oracle queries with a two-phase model:
- POST /query: single Oracle hit, cache full LOT-level DataFrame (L1+L2)
- GET /view: read cache, apply supplementary/interactive filters via pandas

Add container query mode (LOT/工單/WAFER LOT with wildcard support),
supplementary filters (Package/WC GROUP/Reason) from cached data,
PB_* series exclusion (was PB_Diode only), and query loading spinner.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 environment.yml                               |    1 +
 frontend/src/core/reject-history-filters.js   |   50 +
 frontend/src/reject-history/App.vue           | 1142 ++++++++---------
 .../reject-history/components/FilterPanel.vue |  241 +++-
 frontend/src/reject-history/style.css         |   81 +-
 requirements.txt                              |    1 +
 .../routes/reject_history_routes.py           |  141 ++
 .../services/reject_dataset_cache.py          |  689 ++++++++++
 .../services/reject_history_service.py        |   12 +-
 .../sql/reject_history/performance_daily.sql  |    3 +-
 .../reject_history/performance_daily_lot.sql  |    3 +-
 11 files changed, 1707 insertions(+), 657 deletions(-)
 create mode 100644 src/mes_dashboard/services/reject_dataset_cache.py

diff --git a/environment.yml b/environment.yml
index f14bd12..b3ca7b2 100644
--- a/environment.yml
+++ b/environment.yml
@@ -27,6 +27,7 @@ dependencies:
 
       # Data Processing
       - pandas==2.3.3   # Pin DBAPI2-compatible release for current pd.read_sql flow
+      - pyarrow>=17.0.0,<20.0.0   # Parquet serialization for Redis DataFrame cache
       - openpyxl>=3.0.0
 
       # Cache (Redis)
diff --git a/frontend/src/core/reject-history-filters.js b/frontend/src/core/reject-history-filters.js
index fde98d2..de7b49f 100644
--- a/frontend/src/core/reject-history-filters.js
+++ b/frontend/src/core/reject-history-filters.js
@@ -149,3 +149,53 @@ export function buildRejectCommonQueryParams(filters = {}, { reason = '' } = {})
   }
   return params;
 }
+
+export function parseMultiLineInput(text) {
+  if (!text) return [];
+  const tokens = String(text)
+    .split(/[\n,]+/)
+    .map((s) => s.trim())
+    .filter(Boolean)
+    .map((s) => s.replace(/\*/g, '%'));
+  const seen = new Set();
+  const result = [];
+  for (const token of tokens) {
+    if (!seen.has(token)) {
+      seen.add(token);
+      result.push(token);
+    }
+  }
+  return result;
+}
+
+export function buildViewParams(queryId, {
+  supplementaryFilters = {},
+  metricFilter = 'all',
+  trendDates = [],
+  detailReason = '',
+  page = 1,
+  perPage = 50,
+} = {}) {
+  const params = { query_id: queryId };
+  if (supplementaryFilters.packages?.length > 0) {
+    params.packages = supplementaryFilters.packages;
+  }
+  if (supplementaryFilters.workcenterGroups?.length > 0) {
+    params.workcenter_groups = supplementaryFilters.workcenterGroups;
+  }
+  if (supplementaryFilters.reason) {
+    params.reason = supplementaryFilters.reason;
+  }
+  if (metricFilter && metricFilter !== 'all') {
+    params.metric_filter = metricFilter;
+  }
+  if (trendDates?.length > 0) {
+    params.trend_dates = trendDates;
+  }
+  if (detailReason) {
+    params.detail_reason = detailReason;
+  }
+  params.page = page || 1;
+  params.per_page = perPage || 50;
+  return params;
+}
diff --git a/frontend/src/reject-history/App.vue b/frontend/src/reject-history/App.vue
index c69b26f..da079e3 100644
--- a/frontend/src/reject-history/App.vue
+++ b/frontend/src/reject-history/App.vue
@@ -1,11 +1,10 @@
 <script setup>
-import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
+import { computed, onMounted, reactive, ref } from 'vue';
 
-import { apiGet } from '../core/api.js';
+import { apiGet, apiPost } from '../core/api.js';
 import {
-  buildRejectCommonQueryParams,
-  buildRejectOptionsRequestParams,
-  pruneRejectFilterSelections,
+  buildViewParams,
+  parseMultiLineInput,
   toRejectFilterSnapshot,
 } from '../core/reject-history-filters.js';
 import { replaceRuntimeHistory } from '../core/shell-navigation.js';
@@ -18,31 +17,53 @@ import TrendChart from './components/TrendChart.vue';
 
 const API_TIMEOUT = 60000;
 const DEFAULT_PER_PAGE = 50;
-const OPTIONS_DEBOUNCE_MS = 300;
 
-function createDefaultFilters() {
-  return toRejectFilterSnapshot({
-    includeExcludedScrap: false,
-    excludeMaterialScrap: true,
-    excludePbDiode: true,
-    paretoTop80: true,
-  });
-}
+// ---- Primary query form state ----
+const queryMode = ref('date_range');
+const containerInputType = ref('lot');
+const containerInput = ref('');
 
-const draftFilters = reactive(createDefaultFilters());
-const committedFilters = reactive(createDefaultFilters());
+const draftFilters = reactive({
+  startDate: '',
+  endDate: '',
+  includeExcludedScrap: false,
+  excludeMaterialScrap: true,
+  excludePbDiode: true,
+  paretoTop80: true,
+});
 
+// ---- Committed primary params (for URL + chips) ----
+const committedPrimary = reactive({
+  mode: 'date_range',
+  startDate: '',
+  endDate: '',
+  containerInputType: 'lot',
+  containerValues: [],
+  includeExcludedScrap: false,
+  excludeMaterialScrap: true,
+  excludePbDiode: true,
+  paretoTop80: true,
+});
+
+// ---- Query result state ----
+const queryId = ref('');
+const resolutionInfo = ref(null);
+const availableFilters = ref({ workcenterGroups: [], packages: [], reasons: [] });
+
+// ---- Supplementary filters (post-query, applied via /view) ----
+const supplementaryFilters = reactive({
+  packages: [],
+  workcenterGroups: [],
+  reason: '',
+});
+
+// ---- Interactive state ----
 const page = ref(1);
 const detailReason = ref('');
 const selectedTrendDates = ref([]);
 const trendLegendSelected = ref({ '扣帳報廢量': true, '不扣帳報廢量': true });
 
-const options = reactive({
-  workcenterGroups: [],
-  packages: [],
-  reasons: [],
-});
-
+// ---- Data state ----
 const summary = ref({
   MOVEIN_QTY: 0,
   REJECT_TOTAL_QTY: 0,
@@ -53,8 +74,6 @@ const summary = ref({
   AFFECTED_LOT_COUNT: 0,
   AFFECTED_WORKORDER_COUNT: 0,
 });
-
-const trend = ref({ items: [], granularity: 'day' });
 const analyticsRawItems = ref([]);
 const detail = ref({
   items: [],
@@ -66,49 +85,29 @@ const detail = ref({
   },
 });
 
+// ---- Loading / error state ----
 const loading = reactive({
-  initial: true,
+  initial: false,
   querying: false,
-  options: false,
   list: false,
   exporting: false,
 });
-
 const errorMessage = ref('');
-const autoPruneHint = ref('');
 const lastQueryAt = ref('');
-const lastPolicyMeta = ref({
-  include_excluded_scrap: false,
-  exclusion_applied: false,
-  excluded_reason_count: 0,
-});
 
-const draftWatchReady = ref(false);
+// ---- Request staleness tracking ----
+let activeRequestId = 0;
 
-let activeDataRequestId = 0;
-let activeOptionsRequestId = 0;
-let optionsDebounceHandle = null;
-let suppressDraftOptionReload = false;
-let lastLoadedOptionsSignature = '';
-
-function nextDataRequestId() {
-  activeDataRequestId += 1;
-  return activeDataRequestId;
+function nextRequestId() {
+  activeRequestId += 1;
+  return activeRequestId;
 }
 
-function isStaleDataRequest(requestId) {
-  return requestId !== activeDataRequestId;
-}
-
-function nextOptionsRequestId() {
-  activeOptionsRequestId += 1;
-  return activeOptionsRequestId;
-}
-
-function isStaleOptionsRequest(requestId) {
-  return requestId !== activeOptionsRequestId;
+function isStaleRequest(id) {
+  return id !== activeRequestId;
 }
 
+// ---- Helpers ----
 function toDateString(value) {
   const y = value.getFullYear();
   const m = String(value.getMonth() + 1).padStart(2, '0');
@@ -116,142 +115,20 @@ function toDateString(value) {
   return `${y}-${m}-${d}`;
 }
 
-function setDefaultDateRange(target) {
+function setDefaultDateRange() {
   const today = new Date();
   const end = new Date(today);
   end.setDate(end.getDate() - 1);
   const start = new Date(end);
   start.setDate(start.getDate() - 29);
-  target.startDate = toDateString(start);
-  target.endDate = toDateString(end);
+  draftFilters.startDate = toDateString(start);
+  draftFilters.endDate = toDateString(end);
 }
 
-function assignFilterState(target, source) {
-  const snapshot = toRejectFilterSnapshot(source);
-  target.startDate = snapshot.startDate;
-  target.endDate = snapshot.endDate;
-  target.workcenterGroups = [...snapshot.workcenterGroups];
-  target.packages = [...snapshot.packages];
-  target.reason = snapshot.reason;
-  target.includeExcludedScrap = snapshot.includeExcludedScrap;
-  target.excludeMaterialScrap = snapshot.excludeMaterialScrap;
-  target.excludePbDiode = snapshot.excludePbDiode;
-  target.paretoTop80 = snapshot.paretoTop80;
-}
-
-function resetToDefaultFilters(target) {
-  const defaults = createDefaultFilters();
-  setDefaultDateRange(defaults);
-  assignFilterState(target, defaults);
-}
-
-function runWithDraftReloadSuppressed(callback) {
-  suppressDraftOptionReload = true;
-  try {
-    callback();
-  } finally {
-    suppressDraftOptionReload = false;
-  }
-}
-
-function readArrayParam(params, key) {
-  const repeated = params.getAll(key).map((value) => String(value || '').trim()).filter(Boolean);
-  if (repeated.length > 0) {
-    return repeated;
-  }
-  return String(params.get(key) || '')
-    .split(',')
-    .map((value) => value.trim())
-    .filter(Boolean);
-}
-
-function readBooleanParam(params, key, defaultValue = false) {
-  const value = String(params.get(key) || '').trim().toLowerCase();
-  if (!value) {
-    return defaultValue;
-  }
-  return ['1', 'true', 'yes', 'y', 'on'].includes(value);
-}
-
-function restoreCommittedFiltersFromUrl() {
-  const params = new URLSearchParams(window.location.search);
-  const startDate = String(params.get('start_date') || '').trim();
-  const endDate = String(params.get('end_date') || '').trim();
-
-  if (startDate && endDate) {
-    committedFilters.startDate = startDate;
-    committedFilters.endDate = endDate;
-  }
-
-  const wcGroups = readArrayParam(params, 'workcenter_groups');
-  if (wcGroups.length > 0) {
-    committedFilters.workcenterGroups = wcGroups;
-  }
-
-  const packages = readArrayParam(params, 'packages');
-  if (packages.length > 0) {
-    committedFilters.packages = packages;
-  }
-
-  const reason = String(params.get('reason') || '').trim();
-  if (reason) {
-    committedFilters.reason = reason;
-  }
-  const detailReasonFromUrl = String(params.get('detail_reason') || '').trim();
-  if (detailReasonFromUrl) {
-    detailReason.value = detailReasonFromUrl;
-  }
-  const trendDates = readArrayParam(params, 'trend_dates');
-  if (trendDates.length > 0) {
-    selectedTrendDates.value = trendDates;
-  }
-
-  committedFilters.includeExcludedScrap = readBooleanParam(params, 'include_excluded_scrap', false);
-  committedFilters.excludeMaterialScrap = readBooleanParam(params, 'exclude_material_scrap', true);
-  committedFilters.excludePbDiode = readBooleanParam(params, 'exclude_pb_diode', true);
-  committedFilters.paretoTop80 = !readBooleanParam(params, 'pareto_scope_all', false);
-
-  const parsedPage = Number(params.get('page') || '1');
-  page.value = Number.isFinite(parsedPage) && parsedPage > 0 ? parsedPage : 1;
-}
-
-function appendArrayParams(params, key, values) {
-  for (const value of values || []) {
-    params.append(key, value);
-  }
-}
-
-function updateUrlState() {
-  const params = new URLSearchParams();
-
-  params.set('start_date', committedFilters.startDate);
-  params.set('end_date', committedFilters.endDate);
-  appendArrayParams(params, 'workcenter_groups', committedFilters.workcenterGroups);
-  appendArrayParams(params, 'packages', committedFilters.packages);
-
-  if (committedFilters.reason) {
-    params.set('reason', committedFilters.reason);
-  }
-  if (detailReason.value) {
-    params.set('detail_reason', detailReason.value);
-  }
-  appendArrayParams(params, 'trend_dates', selectedTrendDates.value);
-
-  if (committedFilters.includeExcludedScrap) {
-    params.set('include_excluded_scrap', 'true');
-  }
-  params.set('exclude_material_scrap', String(committedFilters.excludeMaterialScrap));
-  params.set('exclude_pb_diode', String(committedFilters.excludePbDiode));
-
-  if (!committedFilters.paretoTop80) {
-    params.set('pareto_scope_all', 'true');
-  }
-
-  if (page.value > 1) {
-    params.set('page', String(page.value));
-  }
-
-  replaceRuntimeHistory(`/reject-history?${params.toString()}`);
+function metricFilterParam() {
+  const mode = paretoMetricMode.value;
+  if (mode === 'reject' || mode === 'defect') return mode;
+  return 'all';
 }
 
 function unwrapApiResult(result, fallbackMessage) {
@@ -264,285 +141,146 @@ function unwrapApiResult(result, fallbackMessage) {
   return result;
 }
 
-function buildCommonParams({ reason = committedFilters.reason } = {}) {
-  return buildRejectCommonQueryParams(committedFilters, { reason });
-}
-
-function metricFilterParam() {
-  const mode = paretoMetricMode.value;
-  if (mode === 'reject' || mode === 'defect') return mode;
-  return 'all';
-}
-
-function buildListParams() {
-  const effectiveReason = detailReason.value || committedFilters.reason;
-  const params = {
-    ...buildCommonParams({ reason: effectiveReason }),
-    page: page.value,
-    per_page: DEFAULT_PER_PAGE,
-    metric_filter: metricFilterParam(),
-  };
-  if (selectedTrendDates.value.length > 0) {
-    const sorted = [...selectedTrendDates.value].sort();
-    params.start_date = sorted[0];
-    params.end_date = sorted[sorted.length - 1];
-  }
-  return params;
-}
-
-async function fetchDraftOptions() {
-  const response = await apiGet('/api/reject-history/options', {
-    params: buildRejectOptionsRequestParams(draftFilters),
-    timeout: API_TIMEOUT,
-  });
-  const payload = unwrapApiResult(response, '載入篩選選項失敗');
-  return payload.data || {};
-}
-
-async function fetchAnalytics() {
-  const response = await apiGet('/api/reject-history/analytics', {
-    params: {
-      ...buildCommonParams(),
-      metric_mode: 'reject_total',
-    },
-    timeout: API_TIMEOUT,
-  });
-  const payload = unwrapApiResult(response, '載入分析資料失敗');
-  return payload;
-}
-
-async function fetchList() {
-  const response = await apiGet('/api/reject-history/list', {
-    params: buildListParams(),
-    timeout: API_TIMEOUT,
-  });
-  const payload = unwrapApiResult(response, '載入明細資料失敗');
-  return payload;
-}
-
-function mergePolicyMeta(meta) {
-  lastPolicyMeta.value = {
-    include_excluded_scrap: Boolean(meta?.include_excluded_scrap),
-    exclusion_applied: Boolean(meta?.exclusion_applied),
-    excluded_reason_count: Number(meta?.excluded_reason_count || 0),
-  };
-}
-
-function applyOptionsPayload(payload) {
-  options.workcenterGroups = Array.isArray(payload?.workcenter_groups)
-    ? payload.workcenter_groups
-    : [];
-  options.reasons = Array.isArray(payload?.reasons)
-    ? payload.reasons
-    : [];
-  options.packages = Array.isArray(payload?.packages)
-    ? payload.packages
-    : [];
-}
-
-function formatPruneHint(removed) {
-  const parts = [];
-  if (removed.workcenterGroups.length > 0) {
-    parts.push(`WORKCENTER GROUP: ${removed.workcenterGroups.join(', ')}`);
-  }
-  if (removed.packages.length > 0) {
-    parts.push(`Package: ${removed.packages.join(', ')}`);
-  }
-  if (removed.reason) {
-    parts.push(`原因: ${removed.reason}`);
-  }
-  if (parts.length === 0) {
-    return '';
-  }
-  return `已自動清除失效篩選：${parts.join('；')}`;
-}
-
-function pruneDraftByCurrentOptions({ showHint = true } = {}) {
-  const result = pruneRejectFilterSelections(draftFilters, options);
-  if (result.removedCount > 0) {
-    runWithDraftReloadSuppressed(() => {
-      assignFilterState(draftFilters, result.filters);
-    });
-    if (showHint) {
-      autoPruneHint.value = formatPruneHint(result.removed);
-    }
-  }
-  return result;
-}
-
-function commitDraftFilters() {
-  const result = pruneDraftByCurrentOptions({ showHint: true });
-  assignFilterState(committedFilters, draftFilters);
-  return result;
-}
-
-function clearOptionsDebounce() {
-  if (optionsDebounceHandle) {
-    clearTimeout(optionsDebounceHandle);
-    optionsDebounceHandle = null;
-  }
-}
-
-async function reloadDraftOptions() {
-  if (!draftFilters.startDate || !draftFilters.endDate) {
-    return;
-  }
-  const signature = draftOptionsSignature.value;
-  const requestId = nextOptionsRequestId();
-  loading.options = true;
-
-  try {
-    const payload = await fetchDraftOptions();
-    if (isStaleOptionsRequest(requestId)) {
-      return;
-    }
-
-    applyOptionsPayload(payload);
-    lastLoadedOptionsSignature = signature;
-    const pruneResult = pruneDraftByCurrentOptions({ showHint: true });
-    if (pruneResult.removedCount > 0) {
-      scheduleOptionsReload();
-    }
-  } catch (error) {
-    if (isStaleOptionsRequest(requestId)) {
-      return;
-    }
-    errorMessage.value = error?.message || '載入篩選選項失敗';
-  } finally {
-    if (isStaleOptionsRequest(requestId)) {
-      return;
-    }
-    loading.options = false;
-  }
-}
-
-function scheduleOptionsReload() {
-  if (!draftWatchReady.value || suppressDraftOptionReload) {
-    return;
-  }
-  clearOptionsDebounce();
-  optionsDebounceHandle = setTimeout(() => {
-    optionsDebounceHandle = null;
-    void reloadDraftOptions();
-  }, OPTIONS_DEBOUNCE_MS);
-}
-
-const draftOptionsSignature = computed(() => {
-  return JSON.stringify({
-    startDate: draftFilters.startDate,
-    endDate: draftFilters.endDate,
-    workcenterGroups: draftFilters.workcenterGroups,
-    packages: draftFilters.packages,
-    reason: draftFilters.reason,
-    includeExcludedScrap: draftFilters.includeExcludedScrap,
-    excludeMaterialScrap: draftFilters.excludeMaterialScrap,
-    excludePbDiode: draftFilters.excludePbDiode,
-  });
-});
-
-watch(draftOptionsSignature, () => {
-  scheduleOptionsReload();
-});
-
-async function ensureDraftOptionsFresh() {
-  clearOptionsDebounce();
-  const signature = draftOptionsSignature.value;
-  if (signature !== lastLoadedOptionsSignature) {
-    await reloadDraftOptions();
-    return;
-  }
-  pruneDraftByCurrentOptions({ showHint: true });
-}
-
-async function loadDataSections() {
-  const requestId = nextDataRequestId();
-
+// ---- Primary query (POST /query → Oracle → cache) ----
+async function executePrimaryQuery() {
+  const requestId = nextRequestId();
   loading.querying = true;
   loading.list = true;
   errorMessage.value = '';
 
   try {
-    const [analyticsResp, listResp] = await Promise.all([fetchAnalytics(), fetchList()]);
-    if (isStaleDataRequest(requestId)) {
-      return;
+    const body = { mode: queryMode.value };
+
+    if (queryMode.value === 'date_range') {
+      body.start_date = draftFilters.startDate;
+      body.end_date = draftFilters.endDate;
+    } else {
+      body.container_input_type = containerInputType.value;
+      body.container_values = parseMultiLineInput(containerInput.value);
     }
 
-    const analyticsData = analyticsResp.data || {};
-    summary.value = analyticsData.summary || summary.value;
-    trend.value = analyticsData.trend || trend.value;
-    analyticsRawItems.value = Array.isArray(analyticsData.raw_items) ? analyticsData.raw_items : [];
-    detail.value = listResp.data || detail.value;
+    body.include_excluded_scrap = draftFilters.includeExcludedScrap;
+    body.exclude_material_scrap = draftFilters.excludeMaterialScrap;
+    body.exclude_pb_diode = draftFilters.excludePbDiode;
 
-    const meta = {
-      ...(analyticsResp.meta || {}),
-      ...(listResp.meta || {}),
+    const resp = await apiPost('/api/reject-history/query', body, { timeout: API_TIMEOUT });
+    if (isStaleRequest(requestId)) return;
+
+    const result = unwrapApiResult(resp, '主查詢執行失敗');
+
+    // Commit primary params for URL state and chips
+    committedPrimary.mode = queryMode.value;
+    committedPrimary.startDate = draftFilters.startDate;
+    committedPrimary.endDate = draftFilters.endDate;
+    committedPrimary.containerInputType = containerInputType.value;
+    committedPrimary.containerValues =
+      queryMode.value === 'container' ? parseMultiLineInput(containerInput.value) : [];
+    committedPrimary.includeExcludedScrap = draftFilters.includeExcludedScrap;
+    committedPrimary.excludeMaterialScrap = draftFilters.excludeMaterialScrap;
+    committedPrimary.excludePbDiode = draftFilters.excludePbDiode;
+    committedPrimary.paretoTop80 = draftFilters.paretoTop80;
+
+    // Store query result
+    queryId.value = result.query_id;
+    resolutionInfo.value = result.resolution_info || null;
+    const af = result.available_filters || {};
+    availableFilters.value = {
+      workcenterGroups: af.workcenter_groups || af.workcenterGroups || [],
+      packages: af.packages || [],
+      reasons: af.reasons || [],
     };
-    mergePolicyMeta(meta);
+
+    // Reset supplementary + interactive
+    supplementaryFilters.packages = [];
+    supplementaryFilters.workcenterGroups = [];
+    supplementaryFilters.reason = '';
+    page.value = 1;
+    detailReason.value = '';
+    selectedTrendDates.value = [];
+
+    // Apply initial data
+    analyticsRawItems.value = Array.isArray(result.analytics_raw)
+      ? result.analytics_raw
+      : [];
+    summary.value = result.summary || summary.value;
+    detail.value = result.detail || detail.value;
 
     lastQueryAt.value = new Date().toLocaleString('zh-TW');
     updateUrlState();
   } catch (error) {
-    if (isStaleDataRequest(requestId)) {
-      return;
-    }
-    errorMessage.value = error?.message || '載入資料失敗';
+    if (isStaleRequest(requestId)) return;
+    errorMessage.value = error?.message || '主查詢執行失敗';
   } finally {
-    if (isStaleDataRequest(requestId)) {
-      return;
-    }
-    loading.initial = false;
+    if (isStaleRequest(requestId)) return;
     loading.querying = false;
     loading.list = false;
   }
 }
 
-async function loadListOnly() {
-  const requestId = nextDataRequestId();
+// ---- View refresh (GET /view → read cache → filter) ----
+async function refreshView() {
+  if (!queryId.value) return;
+
+  const requestId = nextRequestId();
   loading.list = true;
   errorMessage.value = '';
 
   try {
-    const listResp = await fetchList();
-    if (isStaleDataRequest(requestId)) {
+    const params = buildViewParams(queryId.value, {
+      supplementaryFilters,
+      metricFilter: metricFilterParam(),
+      trendDates: selectedTrendDates.value,
+      detailReason: detailReason.value,
+      page: page.value,
+      perPage: DEFAULT_PER_PAGE,
+    });
+
+    const resp = await apiGet('/api/reject-history/view', {
+      params,
+      timeout: API_TIMEOUT,
+    });
+    if (isStaleRequest(requestId)) return;
+
+    // Handle cache expired → auto re-execute primary query
+    if (resp?.success === false && resp?.error === 'cache_expired') {
+      await executePrimaryQuery();
       return;
     }
-    detail.value = listResp.data || detail.value;
-    mergePolicyMeta(listResp.meta || {});
+
+    const result = unwrapApiResult(resp, '視圖查詢失敗');
+    const data = result.data || result;
+
+    analyticsRawItems.value = Array.isArray(data.analytics_raw)
+      ? data.analytics_raw
+      : analyticsRawItems.value;
+    summary.value = data.summary || summary.value;
+    detail.value = data.detail || detail.value;
+
     updateUrlState();
   } catch (error) {
-    if (isStaleDataRequest(requestId)) {
-      return;
-    }
-    errorMessage.value = error?.message || '載入明細資料失敗';
+    if (isStaleRequest(requestId)) return;
+    errorMessage.value = error?.message || '視圖查詢失敗';
   } finally {
-    if (isStaleDataRequest(requestId)) {
-      return;
-    }
+    if (isStaleRequest(requestId)) return;
     loading.list = false;
   }
 }
 
-async function applyFilters() {
-  page.value = 1;
-  detailReason.value = '';
-  selectedTrendDates.value = [];
-  await ensureDraftOptionsFresh();
-  commitDraftFilters();
-  await loadDataSections();
+// ---- Event handlers ----
+function applyFilters() {
+  void executePrimaryQuery();
 }
 
-async function clearFilters() {
-  runWithDraftReloadSuppressed(() => {
-    resetToDefaultFilters(draftFilters);
-  });
-  autoPruneHint.value = '';
-  detailReason.value = '';
-  selectedTrendDates.value = [];
-  page.value = 1;
-  lastLoadedOptionsSignature = '';
-  await ensureDraftOptionsFresh();
-  commitDraftFilters();
-  await loadDataSections();
+function clearFilters() {
+  queryMode.value = 'date_range';
+  containerInputType.value = 'lot';
+  containerInput.value = '';
+  setDefaultDateRange();
+  draftFilters.includeExcludedScrap = false;
+  draftFilters.excludeMaterialScrap = true;
+  draftFilters.excludePbDiode = true;
+  draftFilters.paretoTop80 = true;
+  void executePrimaryQuery();
 }
 
 function goToPage(nextPage) {
@@ -550,13 +288,11 @@ function goToPage(nextPage) {
     return;
   }
   page.value = nextPage;
-  void loadListOnly();
+  void refreshView();
 }
 
 function onTrendDateClick(dateStr) {
-  if (!dateStr) {
-    return;
-  }
+  if (!dateStr) return;
   const idx = selectedTrendDates.value.indexOf(dateStr);
   if (idx >= 0) {
     selectedTrendDates.value = selectedTrendDates.value.filter((d) => d !== dateStr);
@@ -564,107 +300,113 @@ function onTrendDateClick(dateStr) {
     selectedTrendDates.value = [...selectedTrendDates.value, dateStr];
   }
   page.value = 1;
-  void loadListOnly();
+  void refreshView();
 }
 
 function onTrendLegendChange(selected) {
-  // Spread to create a new object — ECharts reuses the same internal reference,
-  // and Vue's ref setter skips trigger when Object.is(old, new) is true.
   trendLegendSelected.value = { ...selected };
   page.value = 1;
   updateUrlState();
-  void loadListOnly();
+  void refreshView();
 }
 
 function onParetoClick(reason) {
-  if (!reason) {
-    return;
-  }
+  if (!reason) return;
   detailReason.value = detailReason.value === reason ? '' : reason;
   page.value = 1;
-  void loadListOnly();
+  void refreshView();
 }
 
 function handleParetoScopeToggle(checked) {
-  const value = Boolean(checked);
-  runWithDraftReloadSuppressed(() => {
-    draftFilters.paretoTop80 = value;
-  });
-  committedFilters.paretoTop80 = value;
+  draftFilters.paretoTop80 = Boolean(checked);
+  committedPrimary.paretoTop80 = Boolean(checked);
   updateUrlState();
 }
 
-async function removeFilterChip(chip) {
-  if (!chip?.removable) {
-    return;
-  }
+function onSupplementaryChange(filters) {
+  supplementaryFilters.packages = filters.packages || [];
+  supplementaryFilters.workcenterGroups = filters.workcenterGroups || [];
+  supplementaryFilters.reason = filters.reason || '';
+  page.value = 1;
+  detailReason.value = '';
+  selectedTrendDates.value = [];
+  void refreshView();
+}
+
+function removeFilterChip(chip) {
+  if (!chip?.removable) return;
 
   if (chip.type === 'detail-reason') {
     detailReason.value = '';
     page.value = 1;
-    await loadListOnly();
+    void refreshView();
     return;
   }
 
   if (chip.type === 'trend-dates') {
     selectedTrendDates.value = [];
     page.value = 1;
-    await loadListOnly();
+    void refreshView();
     return;
   }
 
-  const nextFilters = toRejectFilterSnapshot(committedFilters);
   if (chip.type === 'reason') {
-    nextFilters.reason = '';
-    detailReason.value = '';
-  } else if (chip.type === 'workcenter') {
-    nextFilters.workcenterGroups = nextFilters.workcenterGroups.filter((item) => item !== chip.value);
-  } else if (chip.type === 'package') {
-    nextFilters.packages = nextFilters.packages.filter((item) => item !== chip.value);
-  } else {
+    supplementaryFilters.reason = '';
+    page.value = 1;
+    void refreshView();
     return;
   }
 
-  runWithDraftReloadSuppressed(() => {
-    assignFilterState(draftFilters, nextFilters);
-  });
-  assignFilterState(committedFilters, nextFilters);
+  if (chip.type === 'workcenter') {
+    supplementaryFilters.workcenterGroups = supplementaryFilters.workcenterGroups.filter(
+      (g) => g !== chip.value,
+    );
+    page.value = 1;
+    void refreshView();
+    return;
+  }
 
-  page.value = 1;
-  lastLoadedOptionsSignature = '';
-  await ensureDraftOptionsFresh();
-  commitDraftFilters();
-  await loadDataSections();
+  if (chip.type === 'package') {
+    supplementaryFilters.packages = supplementaryFilters.packages.filter(
+      (p) => p !== chip.value,
+    );
+    page.value = 1;
+    void refreshView();
+    return;
+  }
 }
 
+// ---- CSV export (from cache) ----
 async function exportCsv() {
-  if (loading.exporting) return;
-
-  const effectiveReason = detailReason.value || committedFilters.reason;
-  const queryParams = buildRejectCommonQueryParams(committedFilters, { reason: effectiveReason });
-  const params = new URLSearchParams();
-
-  params.set('start_date', queryParams.start_date);
-  params.set('end_date', queryParams.end_date);
-  params.set('include_excluded_scrap', String(queryParams.include_excluded_scrap));
-  params.set('exclude_material_scrap', String(queryParams.exclude_material_scrap));
-  params.set('exclude_pb_diode', String(queryParams.exclude_pb_diode));
-  appendArrayParams(params, 'workcenter_groups', queryParams.workcenter_groups || []);
-  appendArrayParams(params, 'packages', queryParams.packages || []);
-  appendArrayParams(params, 'reasons', queryParams.reasons || []);
-  params.set('metric_filter', metricFilterParam());
+  if (loading.exporting || !queryId.value) return;
 
   loading.exporting = true;
   errorMessage.value = '';
+
   try {
-    const response = await fetch(`/api/reject-history/export?${params.toString()}`);
+    const params = new URLSearchParams();
+    params.set('query_id', queryId.value);
+    for (const pkg of supplementaryFilters.packages) params.append('packages', pkg);
+    for (const wc of supplementaryFilters.workcenterGroups) params.append('workcenter_groups', wc);
+    if (supplementaryFilters.reason) params.set('reason', supplementaryFilters.reason);
+    params.set('metric_filter', metricFilterParam());
+    for (const date of selectedTrendDates.value) params.append('trend_dates', date);
+    if (detailReason.value) params.set('detail_reason', detailReason.value);
+
+    const response = await fetch(`/api/reject-history/export-cached?${params.toString()}`);
+
+    if (response.status === 410) {
+      errorMessage.value = '快取已過期，請重新查詢後再匯出';
+      return;
+    }
     if (!response.ok) {
       throw new Error('匯出 CSV 失敗');
     }
+
     const blob = await response.blob();
     const disposition = response.headers.get('Content-Disposition') || '';
     const filenameMatch = disposition.match(/filename=(.+?)(?:;|$)/);
-    const filename = filenameMatch ? filenameMatch[1] : `reject_history_${queryParams.start_date}_to_${queryParams.end_date}.csv`;
+    const filename = filenameMatch ? filenameMatch[1] : 'reject_history_export.csv';
 
     const url = URL.createObjectURL(blob);
     const link = document.createElement('a');
@@ -681,6 +423,42 @@ async function exportCsv() {
   }
 }
 
+// ---- Computed: trend items (derived from analytics_raw) ----
+const trendItems = computed(() => {
+  const raw = analyticsRawItems.value;
+  if (!raw || raw.length === 0) return [];
+
+  const byDate = {};
+  for (const item of raw) {
+    const d = item.bucket_date;
+    if (!byDate[d]) {
+      byDate[d] = { MOVEIN_QTY: 0, REJECT_TOTAL_QTY: 0, DEFECT_QTY: 0 };
+    }
+    byDate[d].MOVEIN_QTY += Number(item.MOVEIN_QTY || 0);
+    byDate[d].REJECT_TOTAL_QTY += Number(item.REJECT_TOTAL_QTY || 0);
+    byDate[d].DEFECT_QTY += Number(item.DEFECT_QTY || 0);
+  }
+
+  return Object.keys(byDate)
+    .sort()
+    .map((dateStr) => {
+      const v = byDate[dateStr];
+      const movein = v.MOVEIN_QTY;
+      return {
+        bucket_date: dateStr,
+        MOVEIN_QTY: movein,
+        REJECT_TOTAL_QTY: v.REJECT_TOTAL_QTY,
+        DEFECT_QTY: v.DEFECT_QTY,
+        REJECT_RATE_PCT: movein
+          ? Number(((v.REJECT_TOTAL_QTY / movein) * 100).toFixed(4))
+          : 0,
+        DEFECT_RATE_PCT: movein
+          ? Number(((v.DEFECT_QTY / movein) * 100).toFixed(4))
+          : 0,
+      };
+    });
+});
+
 const totalScrapQty = computed(() => {
   return Number(summary.value.REJECT_TOTAL_QTY || 0) + Number(summary.value.DEFECT_QTY || 0);
 });
@@ -697,10 +475,14 @@ const paretoMetricMode = computed(() => {
 
 const paretoMetricLabel = computed(() => {
   switch (paretoMetricMode.value) {
-    case 'reject': return '扣帳報廢量';
-    case 'defect': return '不扣帳報廢量';
-    case 'none': return '報廢量';
-    default: return '全部報廢量';
+    case 'reject':
+      return '扣帳報廢量';
+    case 'defect':
+      return '不扣帳報廢量';
+    case 'none':
+      return '報廢量';
+    default:
+      return '全部報廢量';
   }
 });
 
@@ -711,7 +493,8 @@ const allParetoItems = computed(() => {
   const mode = paretoMetricMode.value;
   if (mode === 'none') return [];
 
-  const dateSet = selectedTrendDates.value.length > 0 ? new Set(selectedTrendDates.value) : null;
+  const dateSet =
+    selectedTrendDates.value.length > 0 ? new Set(selectedTrendDates.value) : null;
   const filtered = dateSet ? raw.filter((r) => dateSet.has(r.bucket_date)) : raw;
   if (filtered.length === 0) return [];
 
@@ -719,7 +502,13 @@ const allParetoItems = computed(() => {
   for (const item of filtered) {
     const key = item.reason;
     if (!map.has(key)) {
-      map.set(key, { reason: key, MOVEIN_QTY: 0, REJECT_TOTAL_QTY: 0, DEFECT_QTY: 0, AFFECTED_LOT_COUNT: 0 });
+      map.set(key, {
+        reason: key,
+        MOVEIN_QTY: 0,
+        REJECT_TOTAL_QTY: 0,
+        DEFECT_QTY: 0,
+        AFFECTED_LOT_COUNT: 0,
+      });
     }
     const acc = map.get(key);
     acc.MOVEIN_QTY += Number(item.MOVEIN_QTY || 0);
@@ -736,7 +525,9 @@ const allParetoItems = computed(() => {
     return { ...row, metric_value: mv };
   });
 
-  const sorted = withMetric.filter((r) => r.metric_value > 0).sort((a, b) => b.metric_value - a.metric_value);
+  const sorted = withMetric
+    .filter((r) => r.metric_value > 0)
+    .sort((a, b) => b.metric_value - a.metric_value);
   const total = sorted.reduce((sum, r) => sum + r.metric_value, 0);
   let cum = 0;
   return sorted.map((row) => {
@@ -757,82 +548,77 @@ const allParetoItems = computed(() => {
 
 const filteredParetoItems = computed(() => {
   const items = allParetoItems.value || [];
-  if (!committedFilters.paretoTop80 || items.length === 0) {
+  if (!committedPrimary.paretoTop80 || items.length === 0) {
     return items;
   }
-  // Include items up to AND including the one that crosses 80%,
-  // but always show at least 5 items so the chart stays informative
-  // when one reason dominates (e.g. defect-only mode).
   const cutIdx = items.findIndex((item) => Number(item.cumPct || 0) >= 80);
   const top80Count = cutIdx >= 0 ? cutIdx + 1 : items.length;
   return items.slice(0, Math.max(top80Count, Math.min(5, items.length)));
 });
 
 const activeFilterChips = computed(() => {
-  const chips = [
-    {
+  const chips = [];
+
+  // Primary query info
+  if (committedPrimary.mode === 'date_range') {
+    chips.push({
       key: 'date-range',
-      label: `日期: ${committedFilters.startDate || '-'} ~ ${committedFilters.endDate || '-'}`,
+      label: `日期: ${committedPrimary.startDate || '-'} ~ ${committedPrimary.endDate || '-'}`,
       removable: false,
       type: 'date',
       value: '',
-    },
-    {
-      key: 'policy-mode',
-      label: committedFilters.includeExcludedScrap ? '政策: 納入不計良率報廢' : '政策: 排除不計良率報廢',
-      removable: false,
-      type: 'policy',
-      value: '',
-    },
-    {
-      key: 'material-policy-mode',
-      label: committedFilters.excludeMaterialScrap ? '原物料: 已排除' : '原物料: 已納入',
-      removable: false,
-      type: 'policy',
-      value: '',
-    },
-    {
-      key: 'pb-diode-policy',
-      label: committedFilters.excludePbDiode ? 'PB_Diode: 已排除' : 'PB_Diode: 已納入',
-      removable: false,
-      type: 'policy',
-      value: '',
-    },
-  ];
-
-  if (committedFilters.reason) {
+    });
+  } else {
+    const inputLabel =
+      { lot: 'LOT', work_order: '工單', wafer_lot: 'WAFER LOT' }[
+        committedPrimary.containerInputType
+      ] || 'LOT';
     chips.push({
-      key: `reason:${committedFilters.reason}`,
-      label: `原因: ${committedFilters.reason}`,
+      key: 'container-mode',
+      label: `${inputLabel}: ${committedPrimary.containerValues.length} 筆`,
+      removable: false,
+      type: 'container',
+      value: '',
+    });
+  }
+
+  // Policy chips
+  chips.push({
+    key: 'policy-mode',
+    label: committedPrimary.includeExcludedScrap
+      ? '政策: 納入不計良率報廢'
+      : '政策: 排除不計良率報廢',
+    removable: false,
+    type: 'policy',
+    value: '',
+  });
+  chips.push({
+    key: 'material-policy-mode',
+    label: committedPrimary.excludeMaterialScrap ? '原物料: 已排除' : '原物料: 已納入',
+    removable: false,
+    type: 'policy',
+    value: '',
+  });
+  chips.push({
+    key: 'pb-diode-policy',
+    label: committedPrimary.excludePbDiode ? 'PB_* 系列: 已排除' : 'PB_* 系列: 已納入',
+    removable: false,
+    type: 'policy',
+    value: '',
+  });
+
+  // Supplementary chips (removable)
+  if (supplementaryFilters.reason) {
+    chips.push({
+      key: `reason:${supplementaryFilters.reason}`,
+      label: `原因: ${supplementaryFilters.reason}`,
       removable: true,
       type: 'reason',
-      value: committedFilters.reason,
-    });
-  }
-  if (selectedTrendDates.value.length > 0) {
-    const dates = selectedTrendDates.value;
-    const label = dates.length === 1
-      ? `趨勢日期: ${dates[0]}`
-      : `趨勢日期: ${dates.length} 日`;
-    chips.push({
-      key: 'trend-dates',
-      label,
-      removable: true,
-      type: 'trend-dates',
-      value: '',
-    });
-  }
-  if (detailReason.value) {
-    chips.push({
-      key: `detail-reason:${detailReason.value}`,
-      label: `明細原因: ${detailReason.value}`,
-      removable: true,
-      type: 'detail-reason',
-      value: detailReason.value,
+      value: supplementaryFilters.reason,
     });
   }
 
-  committedFilters.workcenterGroups.forEach((group) => {
+  supplementaryFilters.workcenterGroups.forEach((group) => {
     chips.push({
       key: `workcenter:${group}`,
       label: `WC: ${group}`,
@@ -842,7 +628,7 @@ const activeFilterChips = computed(() => {
     });
   });
 
-  committedFilters.packages.forEach((pkg) => {
+  supplementaryFilters.packages.forEach((pkg) => {
     chips.push({
       key: `package:${pkg}`,
       label: `Package: ${pkg}`,
@@ -852,6 +638,30 @@ const activeFilterChips = computed(() => {
     });
   });
 
+  // Interactive chips (removable)
+  if (selectedTrendDates.value.length > 0) {
+    const dates = selectedTrendDates.value;
+    const label =
+      dates.length === 1 ? `趨勢日期: ${dates[0]}` : `趨勢日期: ${dates.length} 日`;
+    chips.push({
+      key: 'trend-dates',
+      label,
+      removable: true,
+      type: 'trend-dates',
+      value: '',
+    });
+  }
+
+  if (detailReason.value) {
+    chips.push({
+      key: `detail-reason:${detailReason.value}`,
+      label: `明細原因: ${detailReason.value}`,
+      removable: true,
+      type: 'detail-reason',
+      value: detailReason.value,
+    });
+  }
+
   return chips;
 });
 
@@ -866,29 +676,143 @@ const kpiCards = computed(() => {
   ];
 });
 
-const pagination = computed(() => detail.value?.pagination || {
-  page: 1,
-  perPage: DEFAULT_PER_PAGE,
-  total: 0,
-  totalPages: 1,
-});
+const pagination = computed(
+  () =>
+    detail.value?.pagination || {
+      page: 1,
+      perPage: DEFAULT_PER_PAGE,
+      total: 0,
+      totalPages: 1,
+    },
+);
 
-onMounted(async () => {
-  resetToDefaultFilters(committedFilters);
-  restoreCommittedFiltersFromUrl();
-  runWithDraftReloadSuppressed(() => {
-    assignFilterState(draftFilters, committedFilters);
-  });
+// ---- URL state ----
+function appendArrayParams(params, key, values) {
+  for (const value of values || []) {
+    params.append(key, value);
+  }
+}
 
-  lastLoadedOptionsSignature = '';
-  await reloadDraftOptions();
-  commitDraftFilters();
-  draftWatchReady.value = true;
-  await loadDataSections();
-});
+function updateUrlState() {
+  const params = new URLSearchParams();
 
-onBeforeUnmount(() => {
-  clearOptionsDebounce();
+  params.set('mode', committedPrimary.mode);
+  if (committedPrimary.mode === 'date_range') {
+    params.set('start_date', committedPrimary.startDate);
+    params.set('end_date', committedPrimary.endDate);
+  } else {
+    params.set('container_input_type', committedPrimary.containerInputType);
+  }
+
+  if (committedPrimary.includeExcludedScrap) {
+    params.set('include_excluded_scrap', 'true');
+  }
+  params.set('exclude_material_scrap', String(committedPrimary.excludeMaterialScrap));
+  params.set('exclude_pb_diode', String(committedPrimary.excludePbDiode));
+
+  // Supplementary
+  appendArrayParams(params, 'packages', supplementaryFilters.packages);
+  appendArrayParams(params, 'workcenter_groups', supplementaryFilters.workcenterGroups);
+  if (supplementaryFilters.reason) {
+    params.set('reason', supplementaryFilters.reason);
+  }
+
+  // Interactive
+  appendArrayParams(params, 'trend_dates', selectedTrendDates.value);
+  if (detailReason.value) {
+    params.set('detail_reason', detailReason.value);
+  }
+  if (!committedPrimary.paretoTop80) {
+    params.set('pareto_scope_all', 'true');
+  }
+  if (page.value > 1) {
+    params.set('page', String(page.value));
+  }
+
+  replaceRuntimeHistory(`/reject-history?${params.toString()}`);
+}
+
+// ---- URL restore ----
+function readArrayParam(params, key) {
+  const repeated = params
+    .getAll(key)
+    .map((value) => String(value || '').trim())
+    .filter(Boolean);
+  if (repeated.length > 0) {
+    return repeated;
+  }
+  return String(params.get(key) || '')
+    .split(',')
+    .map((value) => value.trim())
+    .filter(Boolean);
+}
+
+function readBooleanParam(params, key, defaultValue = false) {
+  const value = String(params.get(key) || '').trim().toLowerCase();
+  if (!value) {
+    return defaultValue;
+  }
+  return ['1', 'true', 'yes', 'y', 'on'].includes(value);
+}
+
+function restoreFromUrl() {
+  const params = new URLSearchParams(window.location.search);
+
+  // Mode
+  const mode = String(params.get('mode') || '').trim();
+  if (mode === 'container') {
+    queryMode.value = 'container';
+    containerInputType.value = String(
+      params.get('container_input_type') || 'lot',
+    ).trim();
+  } else {
+    queryMode.value = 'date_range';
+    const startDate = String(params.get('start_date') || '').trim();
+    const endDate = String(params.get('end_date') || '').trim();
+    if (startDate && endDate) {
+      draftFilters.startDate = startDate;
+      draftFilters.endDate = endDate;
+    }
+  }
+
+  // Policy
+  draftFilters.includeExcludedScrap = readBooleanParam(
+    params,
+    'include_excluded_scrap',
+    false,
+  );
+  draftFilters.excludeMaterialScrap = readBooleanParam(
+    params,
+    'exclude_material_scrap',
+    true,
+  );
+  draftFilters.excludePbDiode = readBooleanParam(params, 'exclude_pb_diode', true);
+  draftFilters.paretoTop80 = !readBooleanParam(params, 'pareto_scope_all', false);
+
+  // Supplementary (will be applied after primary query)
+  const urlPackages = readArrayParam(params, 'packages');
+  const urlWcGroups = readArrayParam(params, 'workcenter_groups');
+  const urlReason = String(params.get('reason') || '').trim();
+
+  // Interactive
+  const urlTrendDates = readArrayParam(params, 'trend_dates');
+  const urlDetailReason = String(params.get('detail_reason') || '').trim();
+  const parsedPage = Number(params.get('page') || '1');
+
+  return {
+    packages: urlPackages,
+    workcenterGroups: urlWcGroups,
+    reason: urlReason,
+    trendDates: urlTrendDates,
+    detailReason: urlDetailReason,
+    page: Number.isFinite(parsedPage) && parsedPage > 0 ? parsedPage : 1,
+  };
+}
+
+// ---- Mount ----
+onMounted(() => {
+  setDefaultDateRange();
+  restoreFromUrl();
 });
 </script>
 
@@ -900,16 +824,28 @@ onBeforeUnmount(() => {
       </div>
       <div class="header-right">
         <div class="last-update" v-if="lastQueryAt">更新時間：{{ lastQueryAt }}</div>
-        <button type="button" class="btn btn-light" :disabled="loading.querying || loading.options" @click="applyFilters">重新整理</button>
+        <button
+          type="button"
+          class="btn btn-light"
+          :disabled="loading.querying"
+          @click="applyFilters"
+        >
+          重新整理
+        </button>
       </div>
     </header>
 
     <div v-if="errorMessage" class="error-banner">{{ errorMessage }}</div>
-    <div v-if="autoPruneHint" class="filter-indicator">{{ autoPruneHint }}</div>
 
     <FilterPanel
       :filters="draftFilters"
-      :options="options"
+      :query-mode="queryMode"
+      :container-input-type="containerInputType"
+      :container-input="containerInput"
+      :available-filters="availableFilters"
+      :supplementary-filters="supplementaryFilters"
+      :query-id="queryId"
+      :resolution-info="resolutionInfo"
       :loading="loading"
       :active-filter-chips="activeFilterChips"
       @apply="applyFilters"
@@ -917,38 +853,40 @@ onBeforeUnmount(() => {
       @export-csv="exportCsv"
       @remove-chip="removeFilterChip"
       @pareto-scope-toggle="handleParetoScopeToggle"
+      @update:query-mode="queryMode = $event"
+      @update:container-input-type="containerInputType = $event"
+      @update:container-input="containerInput = $event"
+      @supplementary-change="onSupplementaryChange"
     />
 
-    <SummaryCards :cards="kpiCards" />
+    <template v-if="queryId">
+      <SummaryCards :cards="kpiCards" />
 
-    <TrendChart
-      :items="trend.items"
-      :selected-dates="selectedTrendDates"
-      :loading="loading.querying"
-      @date-click="onTrendDateClick"
-      @legend-change="onTrendLegendChange"
-    />
+      <TrendChart
+        :items="trendItems"
+        :selected-dates="selectedTrendDates"
+        :loading="loading.querying"
+        @date-click="onTrendDateClick"
+        @legend-change="onTrendLegendChange"
+      />
 
-    <ParetoSection
-      :items="filteredParetoItems"
-      :detail-reason="detailReason"
-      :selected-dates="selectedTrendDates"
-      :metric-label="paretoMetricLabel"
-      :loading="loading.querying"
-      @reason-click="onParetoClick"
-    />
+      <ParetoSection
+        :items="filteredParetoItems"
+        :detail-reason="detailReason"
+        :selected-dates="selectedTrendDates"
+        :metric-label="paretoMetricLabel"
+        :loading="loading.querying"
+        @reason-click="onParetoClick"
+      />
 
-    <DetailTable
-      :items="detail.items"
-      :pagination="pagination"
-      :loading="loading.list"
-      :detail-reason="detailReason"
-      @go-to-page="goToPage"
-      @clear-reason="onParetoClick(detailReason)"
-    />
-  </div>
-
-  <div v-if="loading.initial" class="loading-overlay">
-    <span class="loading-spinner"></span>
+      <DetailTable
+        :items="detail.items"
+        :pagination="pagination"
+        :loading="loading.list"
+        :detail-reason="detailReason"
+        @go-to-page="goToPage"
+        @clear-reason="onParetoClick(detailReason)"
+      />
+    </template>
   </div>
 </template>
diff --git a/frontend/src/reject-history/components/FilterPanel.vue b/frontend/src/reject-history/components/FilterPanel.vue
index 878f339..e5b4e6b 100644
--- a/frontend/src/reject-history/components/FilterPanel.vue
+++ b/frontend/src/reject-history/components/FilterPanel.vue
@@ -1,14 +1,39 @@
 <script setup>
 import MultiSelect from '../../resource-shared/components/MultiSelect.vue';
 
-defineProps({
+const props = defineProps({
   filters: { type: Object, required: true },
-  options: { type: Object, required: true },
+  queryMode: { type: String, default: 'date_range' },
+  containerInputType: { type: String, default: 'lot' },
+  containerInput: { type: String, default: '' },
+  availableFilters: { type: Object, default: () => ({}) },
+  supplementaryFilters: { type: Object, default: () => ({}) },
+  queryId: { type: String, default: '' },
+  resolutionInfo: { type: Object, default: null },
   loading: { type: Object, required: true },
   activeFilterChips: { type: Array, default: () => [] },
 });
 
-defineEmits(['apply', 'clear', 'export-csv', 'remove-chip', 'pareto-scope-toggle']);
+const emit = defineEmits([
+  'apply',
+  'clear',
+  'export-csv',
+  'remove-chip',
+  'pareto-scope-toggle',
+  'update:queryMode',
+  'update:containerInputType',
+  'update:containerInput',
+  'supplementary-change',
+]);
+
+function emitSupplementary(patch) {
+  emit('supplementary-change', {
+    packages: props.supplementaryFilters.packages || [],
+    workcenterGroups: props.supplementaryFilters.workcenterGroups || [],
+    reason: props.supplementaryFilters.reason || '',
+    ...patch,
+  });
+}
 </script>
 
 <template>
@@ -17,46 +42,75 @@ defineEmits(['apply', 'clear', 'export-csv', 'remove-chip', 'pareto-scope-toggle
       <div class="card-title">查詢條件</div>
     </div>
     <div class="card-body filter-panel">
-      <div class="filter-group">
-        <label class="filter-label" for="start-date">開始日期</label>
-        <input id="start-date" v-model="filters.startDate" type="date" class="filter-input" />
-      </div>
-      <div class="filter-group">
-        <label class="filter-label" for="end-date">結束日期</label>
-        <input id="end-date" v-model="filters.endDate" type="date" class="filter-input" />
+      <!-- Mode toggle tabs -->
+      <div class="filter-group-full mode-tab-row">
+        <button
+          type="button"
+          :class="['mode-tab', { active: queryMode === 'date_range' }]"
+          @click="$emit('update:queryMode', 'date_range')"
+        >
+          日期區間
+        </button>
+        <button
+          type="button"
+          :class="['mode-tab', { active: queryMode === 'container' }]"
+          @click="$emit('update:queryMode', 'container')"
+        >
+          LOT / 工單 / WAFER
+        </button>
       </div>
 
-      <div class="filter-group">
-        <label class="filter-label">Package</label>
-        <MultiSelect
-          :model-value="filters.packages"
-          :options="options.packages"
-          placeholder="全部 Package"
-          searchable
-          @update:model-value="filters.packages = $event"
-        />
-      </div>
+      <!-- Date range mode -->
+      <template v-if="queryMode === 'date_range'">
+        <div class="filter-group">
+          <label class="filter-label" for="start-date">開始日期</label>
+          <input
+            id="start-date"
+            v-model="filters.startDate"
+            type="date"
+            class="filter-input"
+          />
+        </div>
+        <div class="filter-group">
+          <label class="filter-label" for="end-date">結束日期</label>
+          <input
+            id="end-date"
+            v-model="filters.endDate"
+            type="date"
+            class="filter-input"
+          />
+        </div>
+      </template>
 
-      <div class="filter-group">
-        <label class="filter-label" for="reason">報廢原因</label>
-        <select id="reason" v-model="filters.reason" class="filter-input">
-          <option value="">全部原因</option>
-          <option v-for="reason in options.reasons" :key="reason" :value="reason">
-            {{ reason }}
-          </option>
-        </select>
-      </div>
-
-      <div class="filter-group filter-group-full">
-        <label class="filter-label">WORKCENTER GROUP</label>
-        <MultiSelect
-          :model-value="filters.workcenterGroups"
-          :options="options.workcenterGroups"
-          placeholder="全部工作中心群組"
-          searchable
-          @update:model-value="filters.workcenterGroups = $event"
-        />
-      </div>
+      <!-- Container mode -->
+      <template v-else>
+        <div class="filter-group">
+          <label class="filter-label" for="container-type">輸入類型</label>
+          <select
+            id="container-type"
+            class="filter-input"
+            :value="containerInputType"
+            @change="$emit('update:containerInputType', $event.target.value)"
+          >
+            <option value="lot">LOT</option>
+            <option value="work_order">工單</option>
+            <option value="wafer_lot">WAFER LOT</option>
+          </select>
+        </div>
+        <div class="filter-group filter-group-wide">
+          <label class="filter-label" for="container-input"
+            >輸入值 (每行一個，支援 * 或 % wildcard)</label
+          >
+          <textarea
+            id="container-input"
+            class="filter-input filter-textarea"
+            rows="3"
+            :value="containerInput"
+            @input="$emit('update:containerInput', $event.target.value)"
+            placeholder="GA26020001-A00-001&#10;GA260200%&#10;..."
+          ></textarea>
+        </div>
+      </template>
 
       <div class="filter-toolbar">
         <div class="checkbox-row">
@@ -70,7 +124,7 @@ defineEmits(['apply', 'clear', 'export-csv', 'remove-chip', 'pareto-scope-toggle
           </label>
           <label class="checkbox-pill">
             <input v-model="filters.excludePbDiode" type="checkbox" />
-            排除 PB_Diode
+            排除 PB_* 系列
           </label>
           <label class="checkbox-pill">
             <input
@@ -82,19 +136,110 @@ defineEmits(['apply', 'clear', 'export-csv', 'remove-chip', 'pareto-scope-toggle
           </label>
         </div>
         <div class="filter-actions">
-          <button class="btn btn-primary" :disabled="loading.querying" @click="$emit('apply')">查詢</button>
-          <button class="btn btn-secondary" :disabled="loading.querying" @click="$emit('clear')">清除條件</button>
-          <button class="btn btn-light btn-export" :disabled="loading.querying || loading.exporting" @click="$emit('export-csv')">
-            <template v-if="loading.exporting"><span class="btn-spinner"></span>匯出中...</template>
+          <button
+            class="btn btn-primary"
+            :disabled="loading.querying"
+            @click="$emit('apply')"
+          >
+            <template v-if="loading.querying"
+              ><span class="btn-spinner"></span>查詢中...</template
+            >
+            <template v-else>查詢</template>
+          </button>
+          <button
+            class="btn btn-secondary"
+            :disabled="loading.querying"
+            @click="$emit('clear')"
+          >
+            清除條件
+          </button>
+          <button
+            class="btn btn-light btn-export"
+            :disabled="loading.querying || loading.exporting"
+            @click="$emit('export-csv')"
+          >
+            <template v-if="loading.exporting"
+              ><span class="btn-spinner"></span>匯出中...</template
+            >
             <template v-else>匯出 CSV</template>
           </button>
         </div>
       </div>
     </div>
-    <div class="card-body active-filter-chip-row" v-if="activeFilterChips.length > 0">
+
+    <!-- Resolution info (container mode) -->
+    <div
+      v-if="resolutionInfo && queryMode === 'container'"
+      class="card-body resolution-info"
+    >
+      已解析 {{ resolutionInfo.resolved_count }} 筆容器
+      <template v-if="resolutionInfo.not_found?.length > 0">
+        <span class="resolution-warn">
+          ({{ resolutionInfo.not_found.length }} 筆未找到:
+          {{ resolutionInfo.not_found.slice(0, 10).join(', ')
+          }}{{ resolutionInfo.not_found.length > 10 ? '...' : '' }})
+        </span>
+      </template>
+    </div>
+
+    <!-- Supplementary filters (only after primary query) -->
+    <div v-if="queryId" class="supplementary-panel">
+      <div class="supplementary-header">補充篩選 (快取內篩選)</div>
+      <div class="supplementary-row">
+        <div class="filter-group">
+          <label class="filter-label">WORKCENTER GROUP</label>
+          <MultiSelect
+            :model-value="supplementaryFilters.workcenterGroups"
+            :options="availableFilters.workcenterGroups || []"
+            placeholder="全部工作中心群組"
+            searchable
+            @update:model-value="emitSupplementary({ workcenterGroups: $event })"
+          />
+        </div>
+
+        <div class="filter-group">
+          <label class="filter-label">Package</label>
+          <MultiSelect
+            :model-value="supplementaryFilters.packages"
+            :options="availableFilters.packages || []"
+            placeholder="全部 Package"
+            searchable
+            @update:model-value="emitSupplementary({ packages: $event })"
+          />
+        </div>
+
+        <div class="filter-group">
+          <label class="filter-label" for="supp-reason">報廢原因</label>
+          <select
+            id="supp-reason"
+            class="filter-input"
+            :value="supplementaryFilters.reason"
+            @change="emitSupplementary({ reason: $event.target.value })"
+          >
+            <option value="">全部原因</option>
+            <option
+              v-for="r in availableFilters.reasons || []"
+              :key="r"
+              :value="r"
+            >
+              {{ r }}
+            </option>
+          </select>
+        </div>
+      </div>
+    </div>
+
+    <div
+      class="card-body active-filter-chip-row"
+      v-if="activeFilterChips.length > 0"
+    >
       <div class="filter-label">套用中篩選</div>
       <div class="chip-list">
-        <div v-for="chip in activeFilterChips" :key="chip.key" class="filter-chip">
+        <div
+          v-for="chip in activeFilterChips"
+          :key="chip.key"
+          class="filter-chip"
+        >
           <span>{{ chip.label }}</span>
           <button
             v-if="chip.removable"
@@ -102,7 +247,7 @@ defineEmits(['apply', 'clear', 'export-csv', 'remove-chip', 'pareto-scope-toggle
             class="chip-remove"
             @click="$emit('remove-chip', chip)"
           >
-            ×
+            &times;
           </button>
         </div>
       </div>
diff --git a/frontend/src/reject-history/style.css b/frontend/src/reject-history/style.css
index 8d0848f..23e2035 100644
--- a/frontend/src/reject-history/style.css
+++ b/frontend/src/reject-history/style.css
@@ -2,11 +2,81 @@
   background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
 }
 
+.mode-tab-row {
+  display: flex;
+  gap: 0;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  overflow: hidden;
+  width: fit-content;
+}
+
+.mode-tab {
+  padding: 7px 16px;
+  border: none;
+  background: #f8fafc;
+  font-size: 13px;
+  font-weight: 600;
+  color: #475569;
+  cursor: pointer;
+  transition: background 0.15s, color 0.15s;
+}
+
+.mode-tab:not(:last-child) {
+  border-right: 1px solid var(--border);
+}
+
+.mode-tab.active {
+  background: #2563eb;
+  color: #fff;
+}
+
+.mode-tab:hover:not(.active) {
+  background: #eef2f7;
+}
+
+.filter-textarea {
+  resize: vertical;
+  font-family: monospace;
+  line-height: 1.5;
+}
+
+.supplementary-panel {
+  border-top: 1px solid var(--border);
+  padding: 16px 18px;
+}
+
+.supplementary-header {
+  font-size: 12px;
+  font-weight: 700;
+  color: #64748b;
+  margin-bottom: 12px;
+}
+
+.supplementary-row {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 18px;
+  align-items: end;
+}
+
+.resolution-info {
+  border-top: 1px solid var(--border);
+  font-size: 13px;
+  color: #0f766e;
+  font-weight: 600;
+}
+
+.resolution-warn {
+  color: #b45309;
+  font-weight: 400;
+}
+
 .card {
   background: var(--card-bg);
   border-radius: 10px;
   box-shadow: var(--shadow);
-  overflow: hidden;
+  overflow: visible;
   margin-bottom: 14px;
 }
 
@@ -14,6 +84,7 @@
   padding: 14px 18px;
   border-bottom: 1px solid var(--border);
   background: #f8fafc;
+  border-radius: 10px 10px 0 0;
 }
 
 .card-title {
@@ -515,6 +586,10 @@
     grid-column: span 2;
   }
 
+  .supplementary-row {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+
   .pareto-layout {
     grid-template-columns: 1fr;
   }
@@ -533,6 +608,10 @@
     grid-column: span 1;
   }
 
+  .supplementary-row {
+    grid-template-columns: 1fr;
+  }
+
   .filter-toolbar {
     flex-direction: column;
     align-items: flex-start;
diff --git a/requirements.txt b/requirements.txt
index 614d054..d6071b3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,6 +16,7 @@ sqlalchemy>=2.0.0,<3.0.0
 
 # Data Processing
 pandas==2.3.3       # pandas 3.x removed DBAPI2 flow used by current pd.read_sql + SQLAlchemy usage
+pyarrow>=17.0.0,<20.0.0   # Parquet serialization for Redis DataFrame cache
 openpyxl>=3.0.0            # Excel file support
 
 # Cache (Redis)
diff --git a/src/mes_dashboard/routes/reject_history_routes.py b/src/mes_dashboard/routes/reject_history_routes.py
index 80a3b1e..7e94563 100644
--- a/src/mes_dashboard/routes/reject_history_routes.py
+++ b/src/mes_dashboard/routes/reject_history_routes.py
@@ -11,7 +11,13 @@ from flask import Blueprint, Response, jsonify, request
 
 from mes_dashboard.core.cache import cache_get, cache_set, make_cache_key
 from mes_dashboard.core.rate_limit import configured_rate_limit
+from mes_dashboard.services.reject_dataset_cache import (
+    apply_view,
+    execute_primary_query,
+    export_csv_from_cache,
+)
 from mes_dashboard.services.reject_history_service import (
+    _list_to_csv,
     export_csv,
     get_filter_options,
     query_analytics,
@@ -438,3 +444,138 @@ def api_reject_history_analytics():
         return jsonify({"success": False, "error": str(exc)}), 400
     except Exception:
         return jsonify({"success": False, "error": "查詢分析資料失敗"}), 500
+
+
+# ============================================================
+# Two-phase query endpoints (POST /query, GET /view)
+# ============================================================
+
+
+@reject_history_bp.route("/api/reject-history/query", methods=["POST"])
+def api_reject_history_query():
+    """Primary query: execute Oracle → cache DataFrame → return results."""
+    body = request.get_json(silent=True) or {}
+
+    mode = str(body.get("mode", "")).strip()
+    if mode not in ("date_range", "container"):
+        return jsonify({"success": False, "error": "mode 必須為 date_range 或 container"}), 400
+
+    include_excluded_scrap = bool(body.get("include_excluded_scrap", False))
+    exclude_material_scrap = bool(body.get("exclude_material_scrap", True))
+    exclude_pb_diode = bool(body.get("exclude_pb_diode", True))
+
+    try:
+        kwargs = {
+            "mode": mode,
+            "include_excluded_scrap": include_excluded_scrap,
+            "exclude_material_scrap": exclude_material_scrap,
+            "exclude_pb_diode": exclude_pb_diode,
+        }
+
+        if mode == "date_range":
+            kwargs["start_date"] = str(body.get("start_date", "")).strip()
+            kwargs["end_date"] = str(body.get("end_date", "")).strip()
+            if not kwargs["start_date"] or not kwargs["end_date"]:
+                return jsonify({"success": False, "error": "date_range mode 需要 start_date 和 end_date"}), 400
+        else:
+            kwargs["container_input_type"] = str(body.get("container_input_type", "lot")).strip()
+            container_values = body.get("container_values", [])
+            if not isinstance(container_values, list) or not container_values:
+                return jsonify({"success": False, "error": "container mode 需要 container_values 陣列"}), 400
+            kwargs["container_values"] = [str(v).strip() for v in container_values if str(v).strip()]
+
+        result = execute_primary_query(**kwargs)
+        return jsonify({"success": True, **result})
+
+    except ValueError as exc:
+        return jsonify({"success": False, "error": str(exc)}), 400
+    except Exception:
+        import traceback
+        traceback.print_exc()
+        return jsonify({"success": False, "error": "主查詢執行失敗"}), 500
+
+
+@reject_history_bp.route("/api/reject-history/view", methods=["GET"])
+def api_reject_history_view():
+    """Supplementary view: read cache → filter → return derived data."""
+    query_id = request.args.get("query_id", "").strip()
+    if not query_id:
+        return jsonify({"success": False, "error": "缺少必要參數: query_id"}), 400
+
+    page = request.args.get("page", 1, type=int) or 1
+    per_page = request.args.get("per_page", 50, type=int) or 50
+    metric_filter = request.args.get("metric_filter", "all").strip().lower() or "all"
+    reason = request.args.get("reason", "").strip() or None
+    detail_reason = request.args.get("detail_reason", "").strip() or None
+
+    try:
+        result = apply_view(
+            query_id=query_id,
+            packages=_parse_multi_param("packages") or None,
+            workcenter_groups=_parse_multi_param("workcenter_groups") or None,
+            reason=reason,
+            metric_filter=metric_filter,
+            trend_dates=_parse_multi_param("trend_dates") or None,
+            detail_reason=detail_reason,
+            page=page,
+            per_page=per_page,
+        )
+
+        if result is None:
+            return jsonify({"success": False, "error": "cache_expired"}), 410
+
+        return jsonify({"success": True, "data": result})
+
+    except ValueError as exc:
+        return jsonify({"success": False, "error": str(exc)}), 400
+    except Exception:
+        import traceback
+        traceback.print_exc()
+        return jsonify({"success": False, "error": "視圖查詢失敗"}), 500
+
+
+@reject_history_bp.route("/api/reject-history/export-cached", methods=["GET"])
+def api_reject_history_export_cached():
+    """Export CSV from cached dataset."""
+    query_id = request.args.get("query_id", "").strip()
+    if not query_id:
+        return jsonify({"success": False, "error": "缺少必要參數: query_id"}), 400
+
+    metric_filter = request.args.get("metric_filter", "all").strip().lower() or "all"
+    reason = request.args.get("reason", "").strip() or None
+    detail_reason = request.args.get("detail_reason", "").strip() or None
+
+    try:
+        rows = export_csv_from_cache(
+            query_id=query_id,
+            packages=_parse_multi_param("packages") or None,
+            workcenter_groups=_parse_multi_param("workcenter_groups") or None,
+            reason=reason,
+            metric_filter=metric_filter,
+            trend_dates=_parse_multi_param("trend_dates") or None,
+            detail_reason=detail_reason,
+        )
+
+        if rows is None:
+            return jsonify({"success": False, "error": "cache_expired"}), 410
+
+        headers = [
+            "LOT", "WORKCENTER", "WORKCENTER_GROUP", "Package", "FUNCTION",
+            "TYPE", "PRODUCT", "原因", "EQUIPMENT", "COMMENT", "SPEC",
+            "REJECT_QTY", "STANDBY_QTY", "QTYTOPROCESS_QTY", "INPROCESS_QTY",
+            "PROCESSED_QTY", "扣帳報廢量", "不扣帳報廢量", "MOVEIN_QTY",
+            "報廢時間", "日期",
+        ]
+        return Response(
+            _list_to_csv(rows, headers=headers),
+            mimetype="text/csv",
+            headers={
+                "Content-Disposition": "attachment; filename=reject_history_export.csv",
+                "Content-Type": "text/csv; charset=utf-8-sig",
+            },
+        )
+
+    except ValueError as exc:
+        return jsonify({"success": False, "error": str(exc)}), 400
+    except Exception:
+        return jsonify({"success": False, "error": "匯出 CSV 失敗"}), 500
diff --git a/src/mes_dashboard/services/reject_dataset_cache.py b/src/mes_dashboard/services/reject_dataset_cache.py
new file mode 100644
index 0000000..3373906
--- /dev/null
+++ b/src/mes_dashboard/services/reject_dataset_cache.py
@@ -0,0 +1,689 @@
+# -*- coding: utf-8 -*-
+"""Two-phase reject-history dataset cache.
+
+Primary query (POST /query) → Oracle → cache full LOT-level DataFrame.
+Supplementary view (GET /view) → read cache → pandas filter/derive.
+
+Cache layers:
+  L1: ProcessLevelCache (in-process, per-worker)
+  L2: Redis (cross-worker, parquet bytes encoded as base64 string)
+"""
+
+from __future__ import annotations
+
+import base64
+import hashlib
+import io
+import json
+import logging
+from typing import Any, Dict, List, Optional
+
+import pandas as pd
+
+from mes_dashboard.core.cache import ProcessLevelCache
+from mes_dashboard.core.database import read_sql_df
+from mes_dashboard.core.redis_client import (
+    REDIS_ENABLED,
+    get_key,
+    get_redis_client,
+)
+from mes_dashboard.services.filter_cache import get_specs_for_groups
+from mes_dashboard.services.reject_history_service import (
+    _as_float,
+    _as_int,
+    _build_where_clause,
+    _derive_summary,
+    _extract_distinct_text_values,
+    _extract_workcenter_group_options,
+    _normalize_text,
+    _prepare_sql,
+    _to_date_str,
+    _to_datetime_str,
+    _validate_range,
+)
+from mes_dashboard.services.query_tool_service import (
+    _resolve_by_lot_id,
+    _resolve_by_wafer_lot,
+    _resolve_by_work_order,
+)
+from mes_dashboard.sql import QueryBuilder
+
+logger = logging.getLogger("mes_dashboard.reject_dataset_cache")
+
+_CACHE_TTL = 900  # 15 minutes
+_CACHE_MAX_SIZE = 8
+_REDIS_NAMESPACE = "reject_dataset"
+
+_dataset_cache = ProcessLevelCache(ttl_seconds=_CACHE_TTL, max_size=_CACHE_MAX_SIZE)
+
+
+# ============================================================
+# Query ID
+# ============================================================
+
+
+def _make_query_id(params: dict) -> str:
+    """Deterministic hash from primary query params + policy toggles."""
+    canonical = json.dumps(params, sort_keys=True, ensure_ascii=False, default=str)
+    return hashlib.sha256(canonical.encode("utf-8")).hexdigest()[:16]
+
+
+# ============================================================
+# Redis L2 helpers (parquet ↔ base64 string)
+# ============================================================
+
+
+def _redis_key(query_id: str) -> str:
+    return get_key(f"{_REDIS_NAMESPACE}:{query_id}")
+
+
+def _redis_store_df(query_id: str, df: pd.DataFrame) -> None:
+    if not REDIS_ENABLED:
+        return
+    client = get_redis_client()
+    if client is None:
+        return
+    try:
+        buf = io.BytesIO()
+        df.to_parquet(buf, engine="pyarrow", index=False)
+        encoded = base64.b64encode(buf.getvalue()).decode("ascii")
+        client.setex(_redis_key(query_id), _CACHE_TTL, encoded)
+    except Exception as exc:
+        logger.warning("Failed to store DataFrame in Redis: %s", exc)
+
+
+def _redis_load_df(query_id: str) -> Optional[pd.DataFrame]:
+    if not REDIS_ENABLED:
+        return None
+    client = get_redis_client()
+    if client is None:
+        return None
+    try:
+        encoded = client.get(_redis_key(query_id))
+        if encoded is None:
+            return None
+        raw = base64.b64decode(encoded)
+        return pd.read_parquet(io.BytesIO(raw), engine="pyarrow")
+    except Exception as exc:
+        logger.warning("Failed to load DataFrame from Redis: %s", exc)
+        return None
+
+
+# ============================================================
+# Cache read (L1 → L2 → None)
+# ============================================================
+
+
+def _get_cached_df(query_id: str) -> Optional[pd.DataFrame]:
+    """Read cache: L1 hit → return, L1 miss → L2 → write L1 → return."""
+    df = _dataset_cache.get(query_id)
+    if df is not None:
+        return df
+    df = _redis_load_df(query_id)
+    if df is not None:
+        _dataset_cache.set(query_id, df)
+    return df
+
+
+def _store_df(query_id: str, df: pd.DataFrame) -> None:
+    """Write to L1 and L2."""
+    _dataset_cache.set(query_id, df)
+    _redis_store_df(query_id, df)
+
+
+# ============================================================
+# Container resolution (reuse query_tool_service resolvers)
+# ============================================================
+
+
+_RESOLVERS = {
+    "lot": _resolve_by_lot_id,
+    "work_order": _resolve_by_work_order,
+    "wafer_lot": _resolve_by_wafer_lot,
+}
+
+
+def resolve_containers(
+    input_type: str, values: List[str]
+) -> Dict[str, Any]:
+    """Dispatch to existing resolver → return container IDs + resolution info."""
+    resolver = _RESOLVERS.get(input_type)
+    if resolver is None:
+        raise ValueError(f"不支援的輸入類型: {input_type}")
+
+    result = resolver(values)
+    if "error" in result:
+        raise ValueError(result["error"])
+
+    container_ids = []
+    for row in result.get("data", []):
+        cid = row.get("container_id")
+        if cid:
+            container_ids.append(cid)
+
+    return {
+        "container_ids": container_ids,
+        "resolution_info": {
+            "input_count": result.get("input_count", len(values)),
+            "resolved_count": len(container_ids),
+            "not_found": result.get("not_found", []),
+        },
+    }
+
+
+# ============================================================
+# Primary query
+# ============================================================
+
+
+def execute_primary_query(
+    *,
+    mode: str,
+    start_date: Optional[str] = None,
+    end_date: Optional[str] = None,
+    container_input_type: Optional[str] = None,
+    container_values: Optional[List[str]] = None,
+    include_excluded_scrap: bool = False,
+    exclude_material_scrap: bool = True,
+    exclude_pb_diode: bool = True,
+) -> Dict[str, Any]:
+    """Execute Oracle query → cache DataFrame → return structured result."""
+
+    # ---- Build base_where + params for the primary filter ----
+    base_where_parts: List[str] = []
+    base_params: Dict[str, Any] = {}
+    resolution_info: Optional[Dict[str, Any]] = None
+
+    if mode == "date_range":
+        if not start_date or not end_date:
+            raise ValueError("date_range mode 需要 start_date 和 end_date")
+        _validate_range(start_date, end_date)
+        base_where_parts.append(
+            "r.TXNDATE >= TO_DATE(:start_date, 'YYYY-MM-DD')"
+            " AND r.TXNDATE < TO_DATE(:end_date, 'YYYY-MM-DD') + 1"
+        )
+        base_params["start_date"] = start_date
+        base_params["end_date"] = end_date
+
+    elif mode == "container":
+        if not container_values:
+            raise ValueError("container mode 需要至少一個容器值")
+        resolved = resolve_containers(
+            container_input_type or "lot", container_values
+        )
+        resolution_info = resolved["resolution_info"]
+        container_ids = resolved["container_ids"]
+        if not container_ids:
+            raise ValueError("未找到任何對應的容器")
+
+        builder = QueryBuilder()
+        builder.add_in_condition("r.CONTAINERID", container_ids)
+        cid_where, cid_params = builder.build_where_only()
+        # build_where_only returns "WHERE ..." — strip "WHERE " prefix
+        cid_condition = cid_where.strip()
+        if cid_condition.upper().startswith("WHERE "):
+            cid_condition = cid_condition[6:].strip()
+        base_where_parts.append(cid_condition)
+        base_params.update(cid_params)
+
+    else:
+        raise ValueError(f"不支援的查詢模式: {mode}")
+
+    base_where = " AND ".join(base_where_parts)
+
+    # ---- Build policy WHERE (only toggles, no supplementary filters) ----
+    policy_where, policy_params, meta = _build_where_clause(
+        include_excluded_scrap=include_excluded_scrap,
+        exclude_material_scrap=exclude_material_scrap,
+        exclude_pb_diode=exclude_pb_diode,
+    )
+
+    # ---- Compute query_id from all primary params ----
+    query_id_input = {
+        "mode": mode,
+        "start_date": start_date,
+        "end_date": end_date,
+        "container_input_type": container_input_type,
+        "container_values": sorted(container_values or []),
+        "include_excluded_scrap": include_excluded_scrap,
+        "exclude_material_scrap": exclude_material_scrap,
+        "exclude_pb_diode": exclude_pb_diode,
+    }
+    query_id = _make_query_id(query_id_input)
+
+    # ---- Check cache first ----
+    cached_df = _get_cached_df(query_id)
+    if cached_df is not None:
+        logger.info("Dataset cache hit for query_id=%s", query_id)
+        return _build_primary_response(
+            query_id, cached_df, meta, resolution_info
+        )
+
+    # ---- Execute Oracle query ----
+    logger.info("Dataset cache miss for query_id=%s, querying Oracle", query_id)
+    sql = _prepare_sql(
+        "list",
+        where_clause=policy_where,
+        base_variant="lot",
+        base_where=base_where,
+    )
+    all_params = {**base_params, **policy_params, "offset": 0, "limit": 999999999}
+    df = read_sql_df(sql, all_params)
+    if df is None:
+        df = pd.DataFrame()
+
+    # ---- Cache and return ----
+    if not df.empty:
+        _store_df(query_id, df)
+
+    return _build_primary_response(query_id, df, meta, resolution_info)
+
+
+def _build_primary_response(
+    query_id: str,
+    df: pd.DataFrame,
+    meta: Dict[str, Any],
+    resolution_info: Optional[Dict[str, Any]],
+) -> Dict[str, Any]:
+    """Build the full response from a LOT-level DataFrame."""
+    analytics_raw = _derive_analytics_raw(df)
+    summary = _derive_summary_from_analytics(analytics_raw)
+    trend_items = _derive_trend_from_analytics(analytics_raw)
+    first_page = _paginate_detail(df, page=1, per_page=50)
+    available = _extract_available_filters(df)
+
+    result: Dict[str, Any] = {
+        "query_id": query_id,
+        "analytics_raw": analytics_raw,
+        "summary": summary,
+        "trend": {"items": trend_items, "granularity": "day"},
+        "detail": first_page,
+        "available_filters": available,
+        "meta": meta,
+    }
+    if resolution_info is not None:
+        result["resolution_info"] = resolution_info
+    return result
+
+
+# ============================================================
+# View (supplementary + interactive filtering on cache)
+# ============================================================
+
+
+def apply_view(
+    *,
+    query_id: str,
+    packages: Optional[List[str]] = None,
+    workcenter_groups: Optional[List[str]] = None,
+    reason: Optional[str] = None,
+    metric_filter: str = "all",
+    trend_dates: Optional[List[str]] = None,
+    detail_reason: Optional[str] = None,
+    page: int = 1,
+    per_page: int = 50,
+) -> Optional[Dict[str, Any]]:
+    """Read cache → apply filters → return derived data. Returns None if expired."""
+    df = _get_cached_df(query_id)
+    if df is None:
+        return None
+
+    filtered = _apply_supplementary_filters(
+        df,
+        packages=packages,
+        workcenter_groups=workcenter_groups,
+        reason=reason,
+        metric_filter=metric_filter,
+    )
+
+    # Analytics always uses full date range (supplementary-filtered only).
+    # The frontend derives trend from analytics_raw and filters Pareto by
+    # selectedTrendDates client-side.
+    analytics_raw = _derive_analytics_raw(filtered)
+    summary = _derive_summary_from_analytics(analytics_raw)
+
+    # Detail list: additionally filter by detail_reason and trend_dates
+    detail_df = filtered
+    if trend_dates:
+        date_set = set(trend_dates)
+        detail_df = detail_df[
+            detail_df["TXN_DAY"].apply(lambda d: _to_date_str(d) in date_set)
+        ]
+    if detail_reason:
+        detail_df = detail_df[
+            detail_df["LOSSREASONNAME"].str.strip() == detail_reason.strip()
+        ]
+
+    detail_page = _paginate_detail(detail_df, page=page, per_page=per_page)
+
+    return {
+        "analytics_raw": analytics_raw,
+        "summary": summary,
+        "detail": detail_page,
+    }
+
+
+def _apply_supplementary_filters(
+    df: pd.DataFrame,
+    *,
+    packages: Optional[List[str]] = None,
+    workcenter_groups: Optional[List[str]] = None,
+    reason: Optional[str] = None,
+    metric_filter: str = "all",
+) -> pd.DataFrame:
+    """Apply supplementary filters via pandas boolean indexing."""
+    if df is None or df.empty:
+        return df
+
+    mask = pd.Series(True, index=df.index)
+
+    if packages:
+        pkg_set = {p.strip() for p in packages if p.strip()}
+        if pkg_set and "PRODUCTLINENAME" in df.columns:
+            mask &= df["PRODUCTLINENAME"].isin(pkg_set)
+
+    if workcenter_groups:
+        wc_groups = [g.strip() for g in workcenter_groups if g.strip()]
+        if wc_groups:
+            specs = get_specs_for_groups(wc_groups)
+            if specs and "SPECNAME" in df.columns:
+                spec_set = {s.upper() for s in specs}
+                mask &= df["SPECNAME"].str.strip().str.upper().isin(spec_set)
+            elif "WORKCENTER_GROUP" in df.columns:
+                mask &= df["WORKCENTER_GROUP"].isin(wc_groups)
+
+    if reason and "LOSSREASONNAME" in df.columns:
+        mask &= df["LOSSREASONNAME"].str.strip() == reason.strip()
+
+    if metric_filter == "reject" and "REJECT_TOTAL_QTY" in df.columns:
+        mask &= df["REJECT_TOTAL_QTY"] > 0
+    elif metric_filter == "defect" and "DEFECT_QTY" in df.columns:
+        mask &= df["DEFECT_QTY"] > 0
+
+    return df[mask]
+
+
+# ============================================================
+# Derivation helpers
+# ============================================================
+
+
+def _derive_analytics_raw(df: pd.DataFrame) -> list:
+    """GROUP BY (TXN_DAY, LOSSREASONNAME) → per date×reason rows."""
+    if df is None or df.empty:
+        return []
+
+    agg_cols = {
+        "MOVEIN_QTY": ("MOVEIN_QTY", "sum"),
+        "REJECT_TOTAL_QTY": ("REJECT_TOTAL_QTY", "sum"),
+        "DEFECT_QTY": ("DEFECT_QTY", "sum"),
+    }
+    # Add optional columns if present
+    if "AFFECTED_WORKORDER_COUNT" in df.columns:
+        agg_cols["AFFECTED_WORKORDER_COUNT"] = ("AFFECTED_WORKORDER_COUNT", "sum")
+
+    grouped = (
+        df.groupby(["TXN_DAY", "LOSSREASONNAME"], sort=True)
+        .agg(**agg_cols)
+        .reset_index()
+    )
+
+    # Count distinct CONTAINERIDs per group for AFFECTED_LOT_COUNT
+    if "CONTAINERID" in df.columns:
+        lot_counts = (
+            df.groupby(["TXN_DAY", "LOSSREASONNAME"])["CONTAINERID"]
+            .nunique()
+            .reset_index()
+            .rename(columns={"CONTAINERID": "AFFECTED_LOT_COUNT"})
+        )
+        grouped = grouped.merge(
+            lot_counts, on=["TXN_DAY", "LOSSREASONNAME"], how="left"
+        )
+    else:
+        grouped["AFFECTED_LOT_COUNT"] = 0
+
+    items = []
+    for _, row in grouped.iterrows():
+        items.append(
+            {
+                "bucket_date": _to_date_str(row["TXN_DAY"]),
+                "reason": _normalize_text(row["LOSSREASONNAME"]) or "(未填寫)",
+                "MOVEIN_QTY": _as_int(row.get("MOVEIN_QTY")),
+                "REJECT_TOTAL_QTY": _as_int(row.get("REJECT_TOTAL_QTY")),
+                "DEFECT_QTY": _as_int(row.get("DEFECT_QTY")),
+                "AFFECTED_LOT_COUNT": _as_int(row.get("AFFECTED_LOT_COUNT")),
+                "AFFECTED_WORKORDER_COUNT": _as_int(
+                    row.get("AFFECTED_WORKORDER_COUNT")
+                ),
+            }
+        )
+    return items
+
+
+def _derive_summary_from_analytics(analytics_raw: list) -> dict:
+    """Aggregate analytics_raw into a single summary dict."""
+    movein = sum(r.get("MOVEIN_QTY", 0) for r in analytics_raw)
+    reject_total = sum(r.get("REJECT_TOTAL_QTY", 0) for r in analytics_raw)
+    defect = sum(r.get("DEFECT_QTY", 0) for r in analytics_raw)
+    affected_lot = sum(r.get("AFFECTED_LOT_COUNT", 0) for r in analytics_raw)
+    affected_wo = sum(r.get("AFFECTED_WORKORDER_COUNT", 0) for r in analytics_raw)
+
+    total_scrap = reject_total + defect
+    return {
+        "MOVEIN_QTY": movein,
+        "REJECT_TOTAL_QTY": reject_total,
+        "DEFECT_QTY": defect,
+        "REJECT_RATE_PCT": round((reject_total / movein * 100) if movein else 0, 4),
+        "DEFECT_RATE_PCT": round((defect / movein * 100) if movein else 0, 4),
+        "REJECT_SHARE_PCT": round(
+            (reject_total / total_scrap * 100) if total_scrap else 0, 4
+        ),
+        "AFFECTED_LOT_COUNT": affected_lot,
+        "AFFECTED_WORKORDER_COUNT": affected_wo,
+    }
+
+
+def _derive_trend_from_analytics(analytics_raw: list) -> list:
+    """Group analytics_raw by date into trend items."""
+    by_date: Dict[str, Dict[str, int]] = {}
+    for row in analytics_raw:
+        d = row.get("bucket_date", "")
+        if d not in by_date:
+            by_date[d] = {"MOVEIN_QTY": 0, "REJECT_TOTAL_QTY": 0, "DEFECT_QTY": 0}
+        by_date[d]["MOVEIN_QTY"] += row.get("MOVEIN_QTY", 0)
+        by_date[d]["REJECT_TOTAL_QTY"] += row.get("REJECT_TOTAL_QTY", 0)
+        by_date[d]["DEFECT_QTY"] += row.get("DEFECT_QTY", 0)
+
+    items = []
+    for date_str in sorted(by_date.keys()):
+        vals = by_date[date_str]
+        movein = vals["MOVEIN_QTY"]
+        reject = vals["REJECT_TOTAL_QTY"]
+        defect = vals["DEFECT_QTY"]
+        items.append(
+            {
+                "bucket_date": date_str,
+                "MOVEIN_QTY": movein,
+                "REJECT_TOTAL_QTY": reject,
+                "DEFECT_QTY": defect,
+                "REJECT_RATE_PCT": round(
+                    (reject / movein * 100) if movein else 0, 4
+                ),
+                "DEFECT_RATE_PCT": round(
+                    (defect / movein * 100) if movein else 0, 4
+                ),
+            }
+        )
+    return items
+
+
+def _paginate_detail(
+    df: pd.DataFrame, *, page: int = 1, per_page: int = 50
+) -> dict:
+    """Sort + paginate LOT-level rows."""
+    if df is None or df.empty:
+        return {
+            "items": [],
+            "pagination": {
+                "page": 1,
+                "perPage": per_page,
+                "total": 0,
+                "totalPages": 1,
+            },
+        }
+
+    page = max(int(page), 1)
+    per_page = min(max(int(per_page), 1), 200)
+
+    # Sort
+    sort_cols = []
+    sort_asc = []
+    for col, asc in [
+        ("TXN_DAY", False),
+        ("WORKCENTERSEQUENCE_GROUP", True),
+        ("WORKCENTERNAME", True),
+        ("REJECT_TOTAL_QTY", False),
+        ("CONTAINERNAME", True),
+    ]:
+        if col in df.columns:
+            sort_cols.append(col)
+            sort_asc.append(asc)
+
+    if sort_cols:
+        sorted_df = df.sort_values(sort_cols, ascending=sort_asc)
+    else:
+        sorted_df = df
+
+    total = len(sorted_df)
+    total_pages = max((total + per_page - 1) // per_page, 1)
+    offset = (page - 1) * per_page
+    page_df = sorted_df.iloc[offset : offset + per_page]
+
+    items = []
+    for _, row in page_df.iterrows():
+        items.append(
+            {
+                "TXN_TIME": _to_datetime_str(row.get("TXN_TIME")),
+                "TXN_DAY": _to_date_str(row.get("TXN_DAY")),
+                "TXN_MONTH": _normalize_text(row.get("TXN_MONTH")),
+                "WORKCENTER_GROUP": _normalize_text(row.get("WORKCENTER_GROUP")),
+                "WORKCENTERNAME": _normalize_text(row.get("WORKCENTERNAME")),
+                "SPECNAME": _normalize_text(row.get("SPECNAME")),
+                "EQUIPMENTNAME": _normalize_text(row.get("EQUIPMENTNAME")),
+                "PRODUCTLINENAME": _normalize_text(row.get("PRODUCTLINENAME")),
+                "PJ_TYPE": _normalize_text(row.get("PJ_TYPE")),
+                "CONTAINERNAME": _normalize_text(row.get("CONTAINERNAME")),
+                "PJ_FUNCTION": _normalize_text(row.get("PJ_FUNCTION")),
+                "PRODUCTNAME": _normalize_text(row.get("PRODUCTNAME")),
+                "LOSSREASONNAME": _normalize_text(row.get("LOSSREASONNAME")),
+                "LOSSREASON_CODE": _normalize_text(row.get("LOSSREASON_CODE")),
+                "REJECTCOMMENT": _normalize_text(row.get("REJECTCOMMENT")),
+                "MOVEIN_QTY": _as_int(row.get("MOVEIN_QTY")),
+                "REJECT_QTY": _as_int(row.get("REJECT_QTY")),
+                "STANDBY_QTY": _as_int(row.get("STANDBY_QTY")),
+                "QTYTOPROCESS_QTY": _as_int(row.get("QTYTOPROCESS_QTY")),
+                "INPROCESS_QTY": _as_int(row.get("INPROCESS_QTY")),
+                "PROCESSED_QTY": _as_int(row.get("PROCESSED_QTY")),
+                "REJECT_TOTAL_QTY": _as_int(row.get("REJECT_TOTAL_QTY")),
+                "DEFECT_QTY": _as_int(row.get("DEFECT_QTY")),
+                "REJECT_RATE_PCT": round(
+                    _as_float(row.get("REJECT_RATE_PCT")), 4
+                ),
+                "DEFECT_RATE_PCT": round(
+                    _as_float(row.get("DEFECT_RATE_PCT")), 4
+                ),
+                "REJECT_SHARE_PCT": round(
+                    _as_float(row.get("REJECT_SHARE_PCT")), 4
+                ),
+                "AFFECTED_WORKORDER_COUNT": _as_int(
+                    row.get("AFFECTED_WORKORDER_COUNT")
+                ),
+            }
+        )
+
+    return {
+        "items": items,
+        "pagination": {
+            "page": page,
+            "perPage": per_page,
+            "total": total,
+            "totalPages": total_pages,
+        },
+    }
+
+
+def _extract_available_filters(df: pd.DataFrame) -> dict:
+    """Extract distinct packages/reasons/WC groups from the full cache DF."""
+    return {
+        "workcenter_groups": _extract_workcenter_group_options(df),
+        "packages": _extract_distinct_text_values(df, "PRODUCTLINENAME"),
+        "reasons": _extract_distinct_text_values(df, "LOSSREASONNAME"),
+    }
+
+
+# ============================================================
+# CSV export from cache
+# ============================================================
+
+
+def export_csv_from_cache(
+    *,
+    query_id: str,
+    packages: Optional[List[str]] = None,
+    workcenter_groups: Optional[List[str]] = None,
+    reason: Optional[str] = None,
+    metric_filter: str = "all",
+    trend_dates: Optional[List[str]] = None,
+    detail_reason: Optional[str] = None,
+) -> Optional[list]:
+    """Read cache → apply filters → return list of dicts for CSV export."""
+    df = _get_cached_df(query_id)
+    if df is None:
+        return None
+
+    filtered = _apply_supplementary_filters(
+        df,
+        packages=packages,
+        workcenter_groups=workcenter_groups,
+        reason=reason,
+        metric_filter=metric_filter,
+    )
+
+    if trend_dates:
+        date_set = set(trend_dates)
+        filtered = filtered[
+            filtered["TXN_DAY"].apply(lambda d: _to_date_str(d) in date_set)
+        ]
+    if detail_reason and "LOSSREASONNAME" in filtered.columns:
+        filtered = filtered[
+            filtered["LOSSREASONNAME"].str.strip() == detail_reason.strip()
+        ]
+
+    rows = []
+    for _, row in filtered.iterrows():
+        rows.append(
+            {
+                "LOT": _normalize_text(row.get("CONTAINERNAME")),
+                "WORKCENTER": _normalize_text(row.get("WORKCENTERNAME")),
+                "WORKCENTER_GROUP": _normalize_text(row.get("WORKCENTER_GROUP")),
+                "Package": _normalize_text(row.get("PRODUCTLINENAME")),
+                "FUNCTION": _normalize_text(row.get("PJ_FUNCTION")),
+                "TYPE": _normalize_text(row.get("PJ_TYPE")),
+                "PRODUCT": _normalize_text(row.get("PRODUCTNAME")),
+                "原因": _normalize_text(row.get("LOSSREASONNAME")),
+                "EQUIPMENT": _normalize_text(row.get("EQUIPMENTNAME")),
+                "COMMENT": _normalize_text(row.get("REJECTCOMMENT")),
+                "SPEC": _normalize_text(row.get("SPECNAME")),
+                "REJECT_QTY": _as_int(row.get("REJECT_QTY")),
+                "STANDBY_QTY": _as_int(row.get("STANDBY_QTY")),
+                "QTYTOPROCESS_QTY": _as_int(row.get("QTYTOPROCESS_QTY")),
+                "INPROCESS_QTY": _as_int(row.get("INPROCESS_QTY")),
+                "PROCESSED_QTY": _as_int(row.get("PROCESSED_QTY")),
+                "扣帳報廢量": _as_int(row.get("REJECT_TOTAL_QTY")),
+                "不扣帳報廢量": _as_int(row.get("DEFECT_QTY")),
+                "MOVEIN_QTY": _as_int(row.get("MOVEIN_QTY")),
+                "報廢時間": _to_datetime_str(row.get("TXN_TIME")),
+                "日期": _to_date_str(row.get("TXN_DAY")),
+            }
+        )
+    return rows
diff --git a/src/mes_dashboard/services/reject_history_service.py b/src/mes_dashboard/services/reject_history_service.py
index d9e763d..e07d8aa 100644
--- a/src/mes_dashboard/services/reject_history_service.py
+++ b/src/mes_dashboard/services/reject_history_service.py
@@ -225,8 +225,8 @@ def _build_where_clause(
         builder.add_condition("UPPER(NVL(TRIM(b.SCRAP_OBJECTTYPE), '-')) <> 'MATERIAL'")
         material_exclusion_applied = True
     pb_diode_exclusion_applied = False
-    if exclude_pb_diode and "PB_Diode" not in normalized_packages:
-        builder.add_condition("b.PRODUCTLINENAME <> 'PB_Diode'")
+    if exclude_pb_diode and not any(p.startswith("PB_") for p in normalized_packages):
+        builder.add_condition("b.PRODUCTLINENAME NOT LIKE 'PB\\_%' ESCAPE '\\'")
         pb_diode_exclusion_applied = True
     if normalized_categories:
         builder.add_in_condition("b.REJECTCATEGORYNAME", normalized_categories)
@@ -275,6 +275,12 @@ def _build_where_clause(
     return where_clause, params, meta
 
 
+_DEFAULT_BASE_WHERE = (
+    "r.TXNDATE >= TO_DATE(:start_date, 'YYYY-MM-DD')"
+    " AND r.TXNDATE < TO_DATE(:end_date, 'YYYY-MM-DD') + 1"
+)
+
+
 def _prepare_sql(
     name: str,
     *,
@@ -282,10 +288,12 @@ def _prepare_sql(
     bucket_expr: str = "",
     metric_column: str = "",
     base_variant: str = "",
+    base_where: str = "",
 ) -> str:
     sql = _load_sql(name)
     sql = sql.replace("{{ BASE_QUERY }}", _base_query_sql(base_variant))
     sql = sql.replace("{{ BASE_WITH_CTE }}", _base_with_cte_sql("base", base_variant))
+    sql = sql.replace("{{ BASE_WHERE }}", base_where or _DEFAULT_BASE_WHERE)
     sql = sql.replace("{{ WHERE_CLAUSE }}", where_clause or "")
     sql = sql.replace("{{ BUCKET_EXPR }}", bucket_expr or "TRUNC(b.TXN_DAY)")
     sql = sql.replace("{{ METRIC_COLUMN }}", metric_column or "b.REJECT_TOTAL_QTY")
diff --git a/src/mes_dashboard/sql/reject_history/performance_daily.sql b/src/mes_dashboard/sql/reject_history/performance_daily.sql
index e4958c1..cdb7ab0 100644
--- a/src/mes_dashboard/sql/reject_history/performance_daily.sql
+++ b/src/mes_dashboard/sql/reject_history/performance_daily.sql
@@ -78,8 +78,7 @@ reject_raw AS (
       ON c.CONTAINERID = r.CONTAINERID
     LEFT JOIN spec_map sm
       ON sm.SPEC = TRIM(r.SPECNAME)
-    WHERE r.TXNDATE >= TO_DATE(:start_date, 'YYYY-MM-DD')
-      AND r.TXNDATE < TO_DATE(:end_date, 'YYYY-MM-DD') + 1
+    WHERE {{ BASE_WHERE }}
 ),
 daily_agg AS (
     SELECT
diff --git a/src/mes_dashboard/sql/reject_history/performance_daily_lot.sql b/src/mes_dashboard/sql/reject_history/performance_daily_lot.sql
index a19704d..44e8284 100644
--- a/src/mes_dashboard/sql/reject_history/performance_daily_lot.sql
+++ b/src/mes_dashboard/sql/reject_history/performance_daily_lot.sql
@@ -72,8 +72,7 @@ reject_raw AS (
       ON c.CONTAINERID = r.CONTAINERID
     LEFT JOIN spec_map sm
       ON sm.SPEC = TRIM(r.SPECNAME)
-    WHERE r.TXNDATE >= TO_DATE(:start_date, 'YYYY-MM-DD')
-      AND r.TXNDATE < TO_DATE(:end_date, 'YYYY-MM-DD') + 1
+    WHERE {{ BASE_WHERE }}
 ),
 daily_agg AS (
     SELECT