egg/DashBoard
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(mid-section-defect): include non-charge-off rejects, fix forward tracing, remove auto-refresh

Browse Source 
- Add DEFECTQTY to reject SUM in station_detection, station_detection_by_ids,
  and downstream_rejects SQL so KPI/charts include both charge-off and
  non-charge-off reject quantities
- Wire forward direction through events-based trace pipeline so downstream
  pareto charts and detail table populate correctly
- Remove inappropriate 5-min auto-refresh from query tool page; replace
  useAutoRefresh with local createAbortSignal for request cancellation

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
egg
2026-02-24 18:20:09 +08:00
parent f14591c7dc
commit bb6eec6a87
6 changed files with 119 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/src/mid-section-defect/App.vue
View File

@@ -2,7 +2,6 @@
import { computed, reactive, ref } from 'vue';
import { apiGet, ensureMesApiAvailable } from '../core/api.js';
import { useAutoRefresh } from '../shared-composables/useAutoRefresh.js';
import { useTraceProgress } from '../shared-composables/useTraceProgress.js';
import TraceProgressBar from '../shared-composables/TraceProgressBar.vue';
@@ -381,10 +380,6 @@ async function loadAnalysis() {
saveSession();
}
if (!autoRefreshStarted) {
autoRefreshStarted = true;
startAutoRefresh();
}
} catch (err) {
if (err?.name === 'AbortError') {
return;
@@ -434,16 +429,14 @@ function exportCsv() {
document.body.removeChild(link);
}
let autoRefreshStarted = false;
const { createAbortSignal, startAutoRefresh } = useAutoRefresh({
onRefresh: async () => {
trace.abort();
await loadAnalysis();
},
intervalMs: 5 * 60 * 1000,
autoStart: false,
refreshOnVisible: true,
});
const _abortControllers = new Map();
function createAbortSignal(key = 'default') {
const prev = _abortControllers.get(key);
if (prev) prev.abort();
const ctrl = new AbortController();
_abortControllers.set(key, ctrl);
return ctrl.signal;
}
function saveSession() {
try {

2
src/mes_dashboard/routes/trace_routes.py
View File

@@ -412,6 +412,7 @@ def _build_msd_aggregation(
seed_container_ids = _normalize_strings(list(lineage_ancestors.keys()))
upstream_events = domain_results.get("upstream_history", {})
downstream_events = domain_results.get("downstream_rejects", {})
station = str(params.get("station") or "測試").strip()
direction = str(params.get("direction") or "backward").strip()
@@ -422,6 +423,7 @@ def _build_msd_aggregation(
seed_container_ids=seed_container_ids,
lineage_ancestors=lineage_ancestors,
upstream_events_by_cid=upstream_events,
downstream_events_by_cid=downstream_events,
station=station,
direction=direction,
mode=mode,

116
src/mes_dashboard/services/mid_section_defect_service.py
View File

@@ -297,6 +297,7 @@ def build_trace_aggregation_from_events(
seed_container_ids: Optional[List[str]] = None,
lineage_ancestors: Optional[Dict[str, Any]] = None,
upstream_events_by_cid: Optional[Dict[str, List[Dict[str, Any]]]] = None,
downstream_events_by_cid: Optional[Dict[str, List[Dict[str, Any]]]] = None,
station: str = '測試',
direction: str = 'backward',
mode: str = 'date_range',
@@ -308,6 +309,7 @@ def build_trace_aggregation_from_events(
seed_container_ids=seed_container_ids,
lineage_ancestors=lineage_ancestors,
upstream_events_by_cid=upstream_events_by_cid,
downstream_events_by_cid=downstream_events_by_cid,
station=station,
direction=direction,
)
@@ -348,6 +350,43 @@ def build_trace_aggregation_from_events(
filtered_df = detection_df
detection_data = _build_detection_lookup(filtered_df)
seed_ids = [
cid for cid in (seed_container_ids or list(detection_data.keys()))
if isinstance(cid, str) and cid.strip()
]
genealogy_status = 'ready'
if seed_ids and lineage_ancestors is None:
genealogy_status = 'error'
# Forward direction: use forward pipeline
if direction == 'forward':
station_order = get_group_order(station)
defect_cids = filtered_df.loc[
filtered_df['REJECTQTY'] > 0, 'CONTAINERID'
].unique().tolist()
wip_by_cid = _normalize_upstream_event_records(upstream_events_by_cid or {})
downstream_rejects = _normalize_downstream_event_records(downstream_events_by_cid or {})
forward_attr = _attribute_forward_defects(
detection_data, defect_cids, wip_by_cid, downstream_rejects, station_order,
)
detail = _build_forward_detail_table(
filtered_df, defect_cids, wip_by_cid, downstream_rejects, station_order,
)
return {
'kpi': _build_forward_kpi(detection_data, forward_attr),
'charts': _build_forward_charts(forward_attr, detection_data),
'daily_trend': _build_daily_trend(filtered_df, normalized_loss_reasons),
'available_loss_reasons': available_loss_reasons,
'genealogy_status': genealogy_status,
'detail_total_count': len(detail),
'attribution': [],
}
# Backward direction
normalized_ancestors = _normalize_lineage_ancestors(
lineage_ancestors,
seed_container_ids=seed_container_ids,
@@ -363,14 +402,6 @@ def build_trace_aggregation_from_events(
)
detail = _build_detail_table(filtered_df, normalized_ancestors, normalized_upstream)
seed_ids = [
cid for cid in (seed_container_ids or list(detection_data.keys()))
if isinstance(cid, str) and cid.strip()
]
genealogy_status = 'ready'
if seed_ids and lineage_ancestors is None:
genealogy_status = 'error'
return {
'kpi': _build_kpi(filtered_df, attribution, normalized_loss_reasons),
'charts': _build_all_charts(attribution, detection_data),
@@ -388,6 +419,7 @@ def _build_trace_aggregation_container_mode(
seed_container_ids: Optional[List[str]] = None,
lineage_ancestors: Optional[Dict[str, Any]] = None,
upstream_events_by_cid: Optional[Dict[str, List[Dict[str, Any]]]] = None,
downstream_events_by_cid: Optional[Dict[str, List[Dict[str, Any]]]] = None,
station: str = '測試',
direction: str = 'backward',
) -> Optional[Dict[str, Any]]:
@@ -437,6 +469,43 @@ def _build_trace_aggregation_container_mode(
filtered_df = detection_df
detection_data = _build_detection_lookup(filtered_df)
seed_ids = [
cid for cid in seed_container_ids
if isinstance(cid, str) and cid.strip()
]
genealogy_status = 'ready'
if seed_ids and lineage_ancestors is None:
genealogy_status = 'error'
# Forward direction
if direction == 'forward':
station_order = get_group_order(station)
defect_cids = filtered_df.loc[
filtered_df['REJECTQTY'] > 0, 'CONTAINERID'
].unique().tolist()
wip_by_cid = _normalize_upstream_event_records(upstream_events_by_cid or {})
downstream_rejects = _normalize_downstream_event_records(downstream_events_by_cid or {})
forward_attr = _attribute_forward_defects(
detection_data, defect_cids, wip_by_cid, downstream_rejects, station_order,
)
detail = _build_forward_detail_table(
filtered_df, defect_cids, wip_by_cid, downstream_rejects, station_order,
)
return {
'kpi': _build_forward_kpi(detection_data, forward_attr),
'charts': _build_forward_charts(forward_attr, detection_data),
'daily_trend': [],
'available_loss_reasons': available_loss_reasons,
'genealogy_status': genealogy_status,
'detail_total_count': len(detail),
'attribution': [],
}
# Backward direction
normalized_ancestors = _normalize_lineage_ancestors(
lineage_ancestors,
seed_container_ids=seed_container_ids,
@@ -452,14 +521,6 @@ def _build_trace_aggregation_container_mode(
)
detail = _build_detail_table(filtered_df, normalized_ancestors, normalized_upstream)
seed_ids = [
cid for cid in seed_container_ids
if isinstance(cid, str) and cid.strip()
]
genealogy_status = 'ready'
if seed_ids and lineage_ancestors is None:
genealogy_status = 'error'
return {
'kpi': _build_kpi(filtered_df, attribution, normalized_loss_reasons),
'charts': _build_all_charts(attribution, detection_data),
@@ -1202,6 +1263,29 @@ def _normalize_upstream_event_records(
return dict(result)
def _normalize_downstream_event_records(
events_by_cid: Dict[str, List[Dict[str, Any]]],
) -> Dict[str, List[Dict[str, Any]]]:
"""Normalize EventFetcher downstream_rejects payload into forward-pipeline-ready records."""
result: Dict[str, List[Dict[str, Any]]] = defaultdict(list)
for cid, events in events_by_cid.items():
cid_value = _safe_str(cid)
if not cid_value:
continue
for event in events:
group_name = _safe_str(event.get('WORKCENTER_GROUP'))
if not group_name:
continue
result[cid_value].append({
'workcenter_group': group_name,
'lossreasonname': _safe_str(event.get('LOSSREASONNAME')),
'equipment_name': _safe_str(event.get('EQUIPMENTNAME')),
'reject_total_qty': _safe_int(event.get('REJECT_TOTAL_QTY')),
'txndate': _safe_str(event.get('TXNDATE')),
})
return dict(result)
# ============================================================
# Detection Data Lookup
# ============================================================

5
src/mes_dashboard/sql/mid_section_defect/downstream_rejects.sql
View File

@@ -5,7 +5,7 @@
-- Dynamically built IN clause for descendant CONTAINERIDs ({{ DESCENDANT_FILTER }})
--
-- Tables used:
-- DWH.DW_MES_LOTREJECTHISTORY (reject records)
-- DWH.DW_MES_LOTREJECTHISTORY (reject records - charge-off + non-charge-off)
--
-- Performance:
-- CONTAINERID has index. Batch IN clause (up to 1000 per query).
@@ -49,7 +49,8 @@ SELECT
+ NVL(r.STANDBYQTY, 0)
+ NVL(r.QTYTOPROCESS, 0)
+ NVL(r.INPROCESSQTY, 0)
+ NVL(r.PROCESSEDQTY, 0) AS REJECT_TOTAL_QTY,
+ NVL(r.PROCESSEDQTY, 0)
+ NVL(r.DEFECTQTY, 0) AS REJECT_TOTAL_QTY,
r.TXNDATE
FROM DWH.DW_MES_LOTREJECTHISTORY r
WHERE {{ DESCENDANT_FILTER }}

5
src/mes_dashboard/sql/mid_section_defect/station_detection.sql
View File

@@ -9,7 +9,7 @@
--
-- Tables used:
-- DWH.DW_MES_LOTWIPHISTORY (detection station records)
-- DWH.DW_MES_LOTREJECTHISTORY (defect records - ALL loss reasons)
-- DWH.DW_MES_LOTREJECTHISTORY (defect records - charge-off + non-charge-off)
-- DWH.DW_MES_CONTAINER (product info + MFGORDERNAME for genealogy)
-- DWH.DW_MES_WIP (WORKFLOWNAME)
@@ -43,7 +43,8 @@ detection_rejects AS (
r.CONTAINERID,
r.LOSSREASONNAME,
SUM(NVL(r.REJECTQTY, 0) + NVL(r.STANDBYQTY, 0) + NVL(r.QTYTOPROCESS, 0)
+ NVL(r.INPROCESSQTY, 0) + NVL(r.PROCESSEDQTY, 0)) AS REJECTQTY
+ NVL(r.INPROCESSQTY, 0) + NVL(r.PROCESSEDQTY, 0)
+ NVL(r.DEFECTQTY, 0)) AS REJECTQTY
FROM DWH.DW_MES_LOTREJECTHISTORY r
WHERE r.TXNDATE >= TO_DATE(:start_date, 'YYYY-MM-DD')
AND r.TXNDATE < TO_DATE(:end_date, 'YYYY-MM-DD') + 1

5
src/mes_dashboard/sql/mid_section_defect/station_detection_by_ids.sql
View File

@@ -9,7 +9,7 @@
--
-- Tables used:
-- DWH.DW_MES_LOTWIPHISTORY (detection station records)
-- DWH.DW_MES_LOTREJECTHISTORY (defect records - ALL loss reasons)
-- DWH.DW_MES_LOTREJECTHISTORY (defect records - charge-off + non-charge-off)
-- DWH.DW_MES_CONTAINER (product info + MFGORDERNAME for genealogy)
-- DWH.DW_MES_WIP (WORKFLOWNAME)
@@ -42,7 +42,8 @@ detection_rejects AS (
r.CONTAINERID,
r.LOSSREASONNAME,
SUM(NVL(r.REJECTQTY, 0) + NVL(r.STANDBYQTY, 0) + NVL(r.QTYTOPROCESS, 0)
+ NVL(r.INPROCESSQTY, 0) + NVL(r.PROCESSEDQTY, 0)) AS REJECTQTY
+ NVL(r.INPROCESSQTY, 0) + NVL(r.PROCESSEDQTY, 0)
+ NVL(r.DEFECTQTY, 0)) AS REJECTQTY
FROM DWH.DW_MES_LOTREJECTHISTORY r
WHERE r.CONTAINERID IN ({{ CONTAINER_IDS }})
AND ({{ STATION_FILTER_REJECTS }})