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

feat: WIP 頁面新增 Package/Type 篩選並統一使用 PACKAGE_LEF

Browse Source 
- 新增 PACKAGE 和 TYPE 篩選欄位至 WIP Overview 和 WIP Detail
- 所有 Package 欄位改用 PACKAGE_LEF (原 PRODUCTLINENAME)
- Workcenter x Package Matrix 改用 PACKAGE_LEF
- 新增 search_packages 和 search_types 模糊搜索函數
- API 參數 type 改為 field 以避免與 PJ_TYPE 欄位混淆
- 統一篩選標籤為大寫 (WORKORDER, LOT ID, PACKAGE, TYPE)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
beabigegg
2026-02-02 14:09:06 +08:00
parent 88d30065cd
commit 8b137a942e
4 changed files with 382 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/mes_dashboard/routes/wip_routes.py
View File

@@ -16,6 +16,8 @@ from mes_dashboard.services.wip_service import (
get_packages,
search_workorders,
search_lot_ids,
search_packages,
search_types,
)
# Create Blueprint
@@ -38,6 +40,8 @@ def api_overview_summary():
Query Parameters:
workorder: Optional WORKORDER filter (fuzzy match)
lotid: Optional LOTID filter (fuzzy match)
package: Optional PACKAGE_LEF filter (exact match)
pj_type: Optional PJ_TYPE filter (exact match)
include_dummy: Include DUMMY lots (default: false)
Returns:
@@ -45,12 +49,16 @@ def api_overview_summary():
"""
workorder = request.args.get('workorder', '').strip() or None
lotid = request.args.get('lotid', '').strip() or None
package = request.args.get('package', '').strip() or None
pj_type = request.args.get('type', '').strip() or None
include_dummy = _parse_bool(request.args.get('include_dummy', ''))
result = get_wip_summary(
include_dummy=include_dummy,
workorder=workorder,
lotid=lotid
lotid=lotid,
package=package,
pj_type=pj_type
)
if result is not None:
return jsonify({'success': True, 'data': result})
@@ -64,6 +72,8 @@ def api_overview_matrix():
Query Parameters:
workorder: Optional WORKORDER filter (fuzzy match)
lotid: Optional LOTID filter (fuzzy match)
package: Optional PACKAGE_LEF filter (exact match)
pj_type: Optional PJ_TYPE filter (exact match)
include_dummy: Include DUMMY lots (default: false)
status: Optional WIP status filter ('RUN', 'QUEUE', 'HOLD')
hold_type: Optional hold type filter ('quality', 'non-quality')
@@ -75,6 +85,8 @@ def api_overview_matrix():
"""
workorder = request.args.get('workorder', '').strip() or None
lotid = request.args.get('lotid', '').strip() or None
package = request.args.get('package', '').strip() or None
pj_type = request.args.get('type', '').strip() or None
include_dummy = _parse_bool(request.args.get('include_dummy', ''))
status = request.args.get('status', '').strip().upper() or None
hold_type = request.args.get('hold_type', '').strip().lower() or None
@@ -98,7 +110,9 @@ def api_overview_matrix():
workorder=workorder,
lotid=lotid,
status=status,
hold_type=hold_type
hold_type=hold_type,
package=package,
pj_type=pj_type
)
if result is not None:
return jsonify({'success': True, 'data': result})
@@ -241,10 +255,10 @@ def api_meta_packages():
@wip_bp.route('/meta/search')
def api_meta_search():
"""API: Search for WORKORDER or LOTID values.
"""API: Search for WORKORDER, LOTID, PACKAGE, or PJ_TYPE values.
Query Parameters:
type: Search type ('workorder' or 'lotid')
field: Field to search ('workorder', 'lotid', 'package', or 'pj_type')
q: Search query (minimum 2 characters)
limit: Maximum results (default: 20, max: 50)
include_dummy: Include DUMMY lots (default: false)
@@ -252,16 +266,16 @@ def api_meta_search():
Returns:
JSON with items list containing matching values
"""
search_type = request.args.get('type', '').strip().lower()
search_field = request.args.get('field', '').strip().lower()
q = request.args.get('q', '').strip()
limit = min(request.args.get('limit', 20, type=int), 50)
include_dummy = _parse_bool(request.args.get('include_dummy', ''))
# Validate search type
if search_type not in ('workorder', 'lotid'):
# Validate search field
if search_field not in ('workorder', 'lotid', 'package', 'pj_type'):
return jsonify({
'success': False,
'error': 'Invalid type. Use "workorder" or "lotid"'
'error': 'Invalid field. Use "workorder", "lotid", "package", or "pj_type"'
}), 400
# Validate query length
@@ -269,10 +283,14 @@ def api_meta_search():
return jsonify({'success': True, 'data': {'items': []}})
# Perform search
if search_type == 'workorder':
if search_field == 'workorder':
result = search_workorders(q=q, limit=limit, include_dummy=include_dummy)
else:
elif search_field == 'lotid':
result = search_lot_ids(q=q, limit=limit, include_dummy=include_dummy)
elif search_field == 'package':
result = search_packages(q=q, limit=limit, include_dummy=include_dummy)
else: # pj_type
result = search_types(q=q, limit=limit, include_dummy=include_dummy)
if result is not None:
return jsonify({'success': True, 'data': {'items': result}})

274
src/mes_dashboard/services/wip_service.py
View File

@@ -213,7 +213,9 @@ def _filter_base_conditions(
def get_wip_summary(
include_dummy: bool = False,
workorder: Optional[str] = None,
lotid: Optional[str] = None
lotid: Optional[str] = None,
package: Optional[str] = None,
pj_type: Optional[str] = None
) -> Optional[Dict[str, Any]]:
"""Get WIP KPI summary for overview dashboard.
@@ -223,6 +225,8 @@ def get_wip_summary(
include_dummy: If True, include DUMMY lots (default: False)
workorder: Optional WORKORDER filter (fuzzy match)
lotid: Optional LOTID filter (fuzzy match)
package: Optional PACKAGE_LEF filter (exact match)
pj_type: Optional PJ_TYPE filter (exact match)
Returns:
Dict with summary stats (camelCase):
@@ -238,6 +242,14 @@ def get_wip_summary(
df = _filter_base_conditions(cached_df, include_dummy, workorder, lotid)
df = _add_wip_status_columns(df)
# Apply package filter
if package and 'PACKAGE_LEF' in df.columns:
df = df[df['PACKAGE_LEF'] == package]
# Apply pj_type filter
if pj_type and 'PJ_TYPE' in df.columns:
df = df[df['PJ_TYPE'] == pj_type]
if df.empty:
return {
'totalLots': 0,
@@ -290,17 +302,23 @@ def get_wip_summary(
logger.warning(f"Cache-based summary calculation failed, falling back to Oracle: {exc}")
# Fallback to Oracle direct query
return _get_wip_summary_from_oracle(include_dummy, workorder, lotid)
return _get_wip_summary_from_oracle(include_dummy, workorder, lotid, package, pj_type)
def _get_wip_summary_from_oracle(
include_dummy: bool = False,
workorder: Optional[str] = None,
lotid: Optional[str] = None
lotid: Optional[str] = None,
package: Optional[str] = None,
pj_type: Optional[str] = None
) -> Optional[Dict[str, Any]]:
"""Get WIP summary directly from Oracle (fallback)."""
try:
conditions = _build_base_conditions(include_dummy, workorder, lotid)
if package:
conditions.append(f"PACKAGE_LEF = '{_escape_sql(package)}'")
if pj_type:
conditions.append(f"PJ_TYPE = '{_escape_sql(pj_type)}'")
where_clause = f"WHERE {' AND '.join(conditions)}" if conditions else ""
non_quality_list = _build_hold_type_sql_list()
@@ -381,7 +399,9 @@ def get_wip_matrix(
workorder: Optional[str] = None,
lotid: Optional[str] = None,
status: Optional[str] = None,
hold_type: Optional[str] = None
hold_type: Optional[str] = None,
package: Optional[str] = None,
pj_type: Optional[str] = None
) -> Optional[Dict[str, Any]]:
"""Get workcenter x product line matrix for overview dashboard.
@@ -394,6 +414,8 @@ def get_wip_matrix(
status: Optional WIP status filter ('RUN', 'QUEUE', 'HOLD')
hold_type: Optional hold type filter ('quality', 'non-quality')
Only effective when status='HOLD'
package: Optional PACKAGE_LEF filter (exact match)
pj_type: Optional PJ_TYPE filter (exact match)
Returns:
Dict with matrix data:
@@ -411,8 +433,16 @@ def get_wip_matrix(
df = _filter_base_conditions(cached_df, include_dummy, workorder, lotid)
df = _add_wip_status_columns(df)
# Filter by WORKCENTER_GROUP and PRODUCTLINENAME
df = df[df['WORKCENTER_GROUP'].notna() & df['PRODUCTLINENAME'].notna()]
# Filter by WORKCENTER_GROUP and PACKAGE_LEF
df = df[df['WORKCENTER_GROUP'].notna() & df['PACKAGE_LEF'].notna()]
# Apply package filter
if package:
df = df[df['PACKAGE_LEF'] == package]
# Apply pj_type filter
if pj_type and 'PJ_TYPE' in df.columns:
df = df[df['PJ_TYPE'] == pj_type]
# WIP status filter
if status:
@@ -441,13 +471,13 @@ def get_wip_matrix(
logger.warning(f"Cache-based matrix calculation failed, falling back to Oracle: {exc}")
# Fallback to Oracle direct query
return _get_wip_matrix_from_oracle(include_dummy, workorder, lotid, status, hold_type)
return _get_wip_matrix_from_oracle(include_dummy, workorder, lotid, status, hold_type, package, pj_type)
def _build_matrix_result(df: pd.DataFrame) -> Dict[str, Any]:
"""Build matrix result from DataFrame."""
# Group by workcenter and package
grouped = df.groupby(['WORKCENTER_GROUP', 'WORKCENTERSEQUENCE_GROUP', 'PRODUCTLINENAME'])['QTY'].sum().reset_index()
grouped = df.groupby(['WORKCENTER_GROUP', 'WORKCENTERSEQUENCE_GROUP', 'PACKAGE_LEF'])['QTY'].sum().reset_index()
if grouped.empty:
return {
@@ -472,7 +502,7 @@ def _build_matrix_result(df: pd.DataFrame) -> Dict[str, Any]:
# Build matrix and totals
for _, row in grouped.iterrows():
wc = row['WORKCENTER_GROUP']
pkg = row['PRODUCTLINENAME']
pkg = row['PACKAGE_LEF']
qty = int(row['QTY'] or 0)
if wc not in matrix:
@@ -502,13 +532,19 @@ def _get_wip_matrix_from_oracle(
workorder: Optional[str] = None,
lotid: Optional[str] = None,
status: Optional[str] = None,
hold_type: Optional[str] = None
hold_type: Optional[str] = None,
package: Optional[str] = None,
pj_type: Optional[str] = None
) -> Optional[Dict[str, Any]]:
"""Get WIP matrix directly from Oracle (fallback)."""
try:
conditions = _build_base_conditions(include_dummy, workorder, lotid)
conditions.append("WORKCENTER_GROUP IS NOT NULL")
conditions.append("PRODUCTLINENAME IS NOT NULL")
conditions.append("PACKAGE_LEF IS NOT NULL")
if package:
conditions.append(f"PACKAGE_LEF = '{_escape_sql(package)}'")
if pj_type:
conditions.append(f"PJ_TYPE = '{_escape_sql(pj_type)}'")
# WIP status filter
if status:
@@ -534,12 +570,12 @@ def _get_wip_matrix_from_oracle(
SELECT
WORKCENTER_GROUP,
WORKCENTERSEQUENCE_GROUP,
PRODUCTLINENAME,
PACKAGE_LEF,
SUM(QTY) as QTY
FROM {WIP_VIEW}
{where_clause}
GROUP BY WORKCENTER_GROUP, WORKCENTERSEQUENCE_GROUP, PRODUCTLINENAME
ORDER BY WORKCENTERSEQUENCE_GROUP, PRODUCTLINENAME
GROUP BY WORKCENTER_GROUP, WORKCENTERSEQUENCE_GROUP, PACKAGE_LEF
ORDER BY WORKCENTERSEQUENCE_GROUP, PACKAGE_LEF
"""
df = read_sql_df(sql)
@@ -682,7 +718,7 @@ def get_wip_detail(
Args:
workcenter: WORKCENTER_GROUP name
package: Optional PRODUCTLINENAME filter
package: Optional PACKAGE_LEF filter
status: Optional WIP status filter ('RUN', 'QUEUE', 'HOLD')
hold_type: Optional hold type filter ('quality', 'non-quality')
Only effective when status='HOLD'
@@ -712,7 +748,7 @@ def get_wip_detail(
df = df[df['WORKCENTER_GROUP'] == workcenter]
if package:
df = df[df['PRODUCTLINENAME'] == package]
df = df[df['PACKAGE_LEF'] == package]
# Calculate summary before status filter
summary_df = df.copy()
@@ -766,7 +802,7 @@ def get_wip_detail(
'wipStatus': _safe_value(row.get('WIP_STATUS')),
'holdReason': _safe_value(row.get('HOLDREASONNAME')),
'qty': int(row.get('QTY', 0) or 0),
'package': _safe_value(row.get('PRODUCTLINENAME')),
'package': _safe_value(row.get('PACKAGE_LEF')),
'spec': _safe_value(row.get('SPECNAME'))
})
@@ -810,7 +846,7 @@ def _get_wip_detail_from_oracle(
conditions.append(f"WORKCENTER_GROUP = '{_escape_sql(workcenter)}'")
if package:
conditions.append(f"PRODUCTLINENAME = '{_escape_sql(package)}'")
conditions.append(f"PACKAGE_LEF = '{_escape_sql(package)}'")
# WIP status filter (RUN/QUEUE/HOLD based on EQUIPMENTCOUNT and CURRENTHOLDCOUNT)
if status:
@@ -838,7 +874,7 @@ def _get_wip_detail_from_oracle(
summary_conditions = _build_base_conditions(include_dummy, workorder, lotid)
summary_conditions.append(f"WORKCENTER_GROUP = '{_escape_sql(workcenter)}'")
if package:
summary_conditions.append(f"PRODUCTLINENAME = '{_escape_sql(package)}'")
summary_conditions.append(f"PACKAGE_LEF = '{_escape_sql(package)}'")
summary_where = f"WHERE {' AND '.join(summary_conditions)}"
non_quality_list = _build_hold_type_sql_list()
@@ -931,7 +967,7 @@ def _get_wip_detail_from_oracle(
STATUS,
HOLDREASONNAME,
QTY,
PRODUCTLINENAME,
PACKAGE_LEF,
SPECNAME,
CASE WHEN COALESCE(EQUIPMENTCOUNT, 0) > 0 THEN 'RUN'
WHEN COALESCE(CURRENTHOLDCOUNT, 0) > 0 THEN 'HOLD'
@@ -955,7 +991,7 @@ def _get_wip_detail_from_oracle(
'wipStatus': _safe_value(row['WIP_STATUS']),
'holdReason': _safe_value(row['HOLDREASONNAME']),
'qty': int(row['QTY'] or 0),
'package': _safe_value(row['PRODUCTLINENAME']),
'package': _safe_value(row['PACKAGE_LEF']),
'spec': _safe_value(row['SPECNAME'])
})
@@ -1076,19 +1112,19 @@ def get_packages(include_dummy: bool = False) -> Optional[List[Dict[str, Any]]]:
if cached_df is not None:
try:
df = _filter_base_conditions(cached_df, include_dummy)
df = df[df['PRODUCTLINENAME'].notna()]
df = df[df['PACKAGE_LEF'].notna()]
if df.empty:
return []
# Group by package and count
grouped = df.groupby('PRODUCTLINENAME').size().reset_index(name='LOT_COUNT')
grouped = df.groupby('PACKAGE_LEF').size().reset_index(name='LOT_COUNT')
grouped = grouped.sort_values('LOT_COUNT', ascending=False)
result = []
for _, row in grouped.iterrows():
result.append({
'name': row['PRODUCTLINENAME'],
'name': row['PACKAGE_LEF'],
'lot_count': int(row['LOT_COUNT'] or 0)
})
@@ -1104,16 +1140,16 @@ def _get_packages_from_oracle(include_dummy: bool = False) -> Optional[List[Dict
"""Get packages directly from Oracle (fallback)."""
try:
conditions = _build_base_conditions(include_dummy)
conditions.append("PRODUCTLINENAME IS NOT NULL")
conditions.append("PACKAGE_LEF IS NOT NULL")
where_clause = f"WHERE {' AND '.join(conditions)}"
sql = f"""
SELECT
PRODUCTLINENAME,
PACKAGE_LEF,
COUNT(*) as LOT_COUNT
FROM {WIP_VIEW}
{where_clause}
GROUP BY PRODUCTLINENAME
GROUP BY PACKAGE_LEF
ORDER BY COUNT(*) DESC
"""
df = read_sql_df(sql)
@@ -1124,7 +1160,7 @@ def _get_packages_from_oracle(include_dummy: bool = False) -> Optional[List[Dict
result = []
for _, row in df.iterrows():
result.append({
'name': row['PRODUCTLINENAME'],
'name': row['PACKAGE_LEF'],
'lot_count': int(row['LOT_COUNT'] or 0)
})
@@ -1288,6 +1324,170 @@ def _search_lot_ids_from_oracle(
return None
def search_packages(
q: str,
limit: int = 20,
include_dummy: bool = False
) -> Optional[List[str]]:
"""Search for PACKAGE_LEF values matching the query.
Uses Redis cache when available, falls back to Oracle direct query.
Args:
q: Search query (minimum 2 characters)
limit: Maximum number of results (default: 20, max: 50)
include_dummy: If True, include DUMMY lots (default: False)
Returns:
List of matching PACKAGE_LEF values (distinct)
"""
# Validate input
if not q or len(q) < 2:
return []
limit = min(limit, 50) # Cap at 50
# Try cache first
cached_df = _get_wip_dataframe()
if cached_df is not None:
try:
df = _filter_base_conditions(cached_df, include_dummy)
# Check if PACKAGE_LEF column exists
if 'PACKAGE_LEF' not in df.columns:
logger.warning("PACKAGE_LEF column not found in cache")
return _search_packages_from_oracle(q, limit, include_dummy)
df = df[df['PACKAGE_LEF'].notna()]
# Filter by search query (case-insensitive)
df = df[df['PACKAGE_LEF'].str.contains(q, case=False, na=False)]
if df.empty:
return []
# Get distinct values sorted
result = df['PACKAGE_LEF'].drop_duplicates().sort_values().head(limit).tolist()
return result
except Exception as exc:
logger.warning(f"Cache-based package search failed, falling back to Oracle: {exc}")
# Fallback to Oracle direct query
return _search_packages_from_oracle(q, limit, include_dummy)
def _search_packages_from_oracle(
q: str,
limit: int = 20,
include_dummy: bool = False
) -> Optional[List[str]]:
"""Search packages directly from Oracle (fallback)."""
try:
conditions = _build_base_conditions(include_dummy)
conditions.append(f"PACKAGE_LEF LIKE '%{_escape_sql(q)}%'")
conditions.append("PACKAGE_LEF IS NOT NULL")
where_clause = f"WHERE {' AND '.join(conditions)}"
sql = f"""
SELECT DISTINCT PACKAGE_LEF
FROM {WIP_VIEW}
{where_clause}
ORDER BY PACKAGE_LEF
FETCH FIRST {limit} ROWS ONLY
"""
df = read_sql_df(sql)
if df is None or df.empty:
return []
return df['PACKAGE_LEF'].tolist()
except Exception as exc:
logger.error(f"Search packages failed: {exc}")
return None
def search_types(
q: str,
limit: int = 20,
include_dummy: bool = False
) -> Optional[List[str]]:
"""Search for PJ_TYPE values matching the query.
Uses Redis cache when available, falls back to Oracle direct query.
Args:
q: Search query (minimum 2 characters)
limit: Maximum number of results (default: 20, max: 50)
include_dummy: If True, include DUMMY lots (default: False)
Returns:
List of matching PJ_TYPE values (distinct)
"""
# Validate input
if not q or len(q) < 2:
return []
limit = min(limit, 50) # Cap at 50
# Try cache first
cached_df = _get_wip_dataframe()
if cached_df is not None:
try:
df = _filter_base_conditions(cached_df, include_dummy)
# Check if PJ_TYPE column exists
if 'PJ_TYPE' not in df.columns:
logger.warning("PJ_TYPE column not found in cache")
return _search_types_from_oracle(q, limit, include_dummy)
df = df[df['PJ_TYPE'].notna()]
# Filter by search query (case-insensitive)
df = df[df['PJ_TYPE'].str.contains(q, case=False, na=False)]
if df.empty:
return []
# Get distinct values sorted
result = df['PJ_TYPE'].drop_duplicates().sort_values().head(limit).tolist()
return result
except Exception as exc:
logger.warning(f"Cache-based type search failed, falling back to Oracle: {exc}")
# Fallback to Oracle direct query
return _search_types_from_oracle(q, limit, include_dummy)
def _search_types_from_oracle(
q: str,
limit: int = 20,
include_dummy: bool = False
) -> Optional[List[str]]:
"""Search types directly from Oracle (fallback)."""
try:
conditions = _build_base_conditions(include_dummy)
conditions.append(f"PJ_TYPE LIKE '%{_escape_sql(q)}%'")
conditions.append("PJ_TYPE IS NOT NULL")
where_clause = f"WHERE {' AND '.join(conditions)}"
sql = f"""
SELECT DISTINCT PJ_TYPE
FROM {WIP_VIEW}
{where_clause}
ORDER BY PJ_TYPE
FETCH FIRST {limit} ROWS ONLY
"""
df = read_sql_df(sql)
if df is None or df.empty:
return []
return df['PJ_TYPE'].tolist()
except Exception as exc:
logger.error(f"Search types failed: {exc}")
return None
# ============================================================
# Hold Detail API Functions
# ============================================================
@@ -1441,7 +1641,7 @@ def get_hold_detail_distribution(
})
# By Package
pkg_df = df[df['PRODUCTLINENAME'].notna()].groupby('PRODUCTLINENAME').agg({
pkg_df = df[df['PACKAGE_LEF'].notna()].groupby('PACKAGE_LEF').agg({
'LOTID': 'count',
'QTY': 'sum'
}).reset_index()
@@ -1574,13 +1774,13 @@ def _get_hold_detail_distribution_from_oracle(
# By Package
pkg_sql = f"""
SELECT
PRODUCTLINENAME AS NAME,
PACKAGE_LEF AS NAME,
COUNT(*) AS LOTS,
SUM(QTY) AS QTY
FROM {WIP_VIEW}
{where_clause}
AND PRODUCTLINENAME IS NOT NULL
GROUP BY PRODUCTLINENAME
AND PACKAGE_LEF IS NOT NULL
GROUP BY PACKAGE_LEF
ORDER BY COUNT(*) DESC
"""
pkg_df = read_sql_df(pkg_sql)
@@ -1676,7 +1876,7 @@ def get_hold_detail_lots(
Args:
reason: The HOLDREASONNAME to filter by
workcenter: Optional WORKCENTER_GROUP filter
package: Optional PRODUCTLINENAME filter
package: Optional PACKAGE_LEF filter
age_range: Optional age range filter ('0-1', '1-3', '3-7', '7+')
include_dummy: If True, include DUMMY lots (default: False)
page: Page number (1-based)
@@ -1702,7 +1902,7 @@ def get_hold_detail_lots(
if workcenter:
df = df[df['WORKCENTER_GROUP'] == workcenter]
if package:
df = df[df['PRODUCTLINENAME'] == package]
df = df[df['PACKAGE_LEF'] == package]
if age_range:
if age_range == '0-1':
df = df[(df['AGEBYDAYS'] >= 0) & (df['AGEBYDAYS'] < 1)]
@@ -1728,7 +1928,7 @@ def get_hold_detail_lots(
'lotId': _safe_value(row.get('LOTID')),
'workorder': _safe_value(row.get('WORKORDER')),
'qty': int(row.get('QTY', 0) or 0),
'package': _safe_value(row.get('PRODUCTLINENAME')),
'package': _safe_value(row.get('PACKAGE_LEF')),
'workcenter': _safe_value(row.get('WORKCENTER_GROUP')),
'spec': _safe_value(row.get('SPECNAME')),
'age': round(float(row.get('AGEBYDAYS', 0) or 0), 1),
@@ -1782,7 +1982,7 @@ def _get_hold_detail_lots_from_oracle(
if workcenter:
conditions.append(f"WORKCENTER_GROUP = '{_escape_sql(workcenter)}'")
if package:
conditions.append(f"PRODUCTLINENAME = '{_escape_sql(package)}'")
conditions.append(f"PACKAGE_LEF = '{_escape_sql(package)}'")
if age_range:
if age_range == '0-1':
conditions.append("AGEBYDAYS >= 0 AND AGEBYDAYS < 1")
@@ -1812,7 +2012,7 @@ def _get_hold_detail_lots_from_oracle(
LOTID,
WORKORDER,
QTY,
PRODUCTLINENAME AS PACKAGE,
PACKAGE_LEF AS PACKAGE,
WORKCENTER_GROUP AS WORKCENTER,
SPECNAME AS SPEC,
ROUND(AGEBYDAYS, 1) AS AGE,

72
src/mes_dashboard/templates/wip_detail.html
View File

@@ -678,10 +678,18 @@
</div>
</div>
<div class="filter-group">
<label>Package</label>
<select id="filterPackage" onchange="applyFilters()">
<option value="">All</option>
</select>
<label>PACKAGE</label>
<div class="autocomplete-container">
<input type="text" id="filterPackage" placeholder="Search..." autocomplete="off">
<div class="autocomplete-dropdown" id="packageDropdown"></div>
</div>
</div>
<div class="filter-group">
<label>TYPE</label>
<div class="autocomplete-container">
<input type="text" id="filterType" placeholder="Search..." autocomplete="off">
<div class="autocomplete-dropdown" id="typeDropdown"></div>
</div>
</div>
<button class="btn-primary" onclick="applyFilters()">Apply</button>
<button class="btn-secondary" onclick="clearFilters()">Clear</button>
@@ -748,6 +756,7 @@
pageSize: 100,
filters: {
package: '',
type: '',
workorder: '',
lotid: ''
},
@@ -811,6 +820,9 @@
if (state.filters.package) {
params.package = state.filters.package;
}
if (state.filters.type) {
params.type = state.filters.type;
}
if (activeStatusFilter) {
// Handle hold type filters
if (activeStatusFilter === 'quality-hold') {
@@ -854,9 +866,19 @@
if (!query || query.length < 2) {
return [];
}
// Map internal type to API field name
const fieldMap = {
'workorder': 'workorder',
'lotid': 'lotid',
'package': 'package',
'type': 'pj_type'
};
const field = fieldMap[type] || type;
try {
const result = await MesApi.get('/api/wip/meta/search', {
params: { type, q: query, limit: 20 },
params: { field, q: query, limit: 20 },
silent: true,
retries: 0 // No retry for autocomplete
});
@@ -896,7 +918,7 @@
let html = '<table><thead><tr>';
// Fixed columns
html += '<th class="fixed-col">Lot ID</th>';
html += '<th class="fixed-col">LOT ID</th>';
html += '<th class="fixed-col">Equipment</th>';
html += '<th class="fixed-col">WIP Status</th>';
html += '<th class="fixed-col">Package</th>';
@@ -1229,7 +1251,8 @@
function applyFilters() {
state.filters.workorder = document.getElementById('filterWorkorder').value.trim();
state.filters.lotid = document.getElementById('filterLotid').value.trim();
state.filters.package = document.getElementById('filterPackage').value;
state.filters.package = document.getElementById('filterPackage').value.trim();
state.filters.type = document.getElementById('filterType').value.trim();
state.page = 1;
loadAllData(false);
}
@@ -1238,7 +1261,8 @@
document.getElementById('filterWorkorder').value = '';
document.getElementById('filterLotid').value = '';
document.getElementById('filterPackage').value = '';
state.filters = { package: '', workorder: '', lotid: '' };
document.getElementById('filterType').value = '';
state.filters = { package: '', type: '', workorder: '', lotid: '' };
// Also clear status filter
activeStatusFilter = null;
@@ -1286,9 +1310,11 @@
// Initialize
// ============================================================
async function init() {
// Setup autocomplete for WORKORDER and LOT ID
// Setup autocomplete for WORKORDER, LOT ID, PACKAGE, and TYPE
setupAutocomplete('filterWorkorder', 'workorderDropdown', 'workorder');
setupAutocomplete('filterLotid', 'lotidDropdown', 'lotid');
setupAutocomplete('filterPackage', 'packageDropdown', 'package');
setupAutocomplete('filterType', 'typeDropdown', 'type');
// Allow Enter key to trigger filter
document.getElementById('filterWorkorder').addEventListener('keypress', (e) => {
@@ -1297,10 +1323,38 @@
document.getElementById('filterLotid').addEventListener('keypress', (e) => {
if (e.key === 'Enter') applyFilters();
});
document.getElementById('filterPackage').addEventListener('keypress', (e) => {
if (e.key === 'Enter') applyFilters();
});
document.getElementById('filterType').addEventListener('keypress', (e) => {
if (e.key === 'Enter') applyFilters();
});
// Get workcenter from URL or use first available
state.workcenter = getUrlParam('workcenter');
// Get filters from URL params (passed from wip_overview)
const urlWorkorder = getUrlParam('workorder');
const urlLotid = getUrlParam('lotid');
const urlPackage = getUrlParam('package');
const urlType = getUrlParam('type');
if (urlWorkorder) {
state.filters.workorder = urlWorkorder;
document.getElementById('filterWorkorder').value = urlWorkorder;
}
if (urlLotid) {
state.filters.lotid = urlLotid;
document.getElementById('filterLotid').value = urlLotid;
}
if (urlPackage) {
state.filters.package = urlPackage;
document.getElementById('filterPackage').value = urlPackage;
}
if (urlType) {
state.filters.type = urlType;
document.getElementById('filterType').value = urlType;
}
if (!state.workcenter) {
// Fetch workcenters and use first one
try {

61
src/mes_dashboard/templates/wip_overview.html
View File

@@ -698,17 +698,29 @@
<!-- Filters -->
<div class="filters">
<div class="filter-group">
<label>Work Order</label>
<input type="text" id="filterWorkorder" placeholder="輸入 Work Order..." autocomplete="off">
<label>WORKORDER</label>
<input type="text" id="filterWorkorder" placeholder="輸入 WORKORDER..." autocomplete="off">
<span class="search-loading" id="workorderLoading"></span>
<div class="autocomplete-dropdown" id="workorderDropdown"></div>
</div>
<div class="filter-group">
<label>Lot ID</label>
<input type="text" id="filterLotid" placeholder="輸入 Lot ID..." autocomplete="off">
<label>LOT ID</label>
<input type="text" id="filterLotid" placeholder="輸入 LOT ID..." autocomplete="off">
<span class="search-loading" id="lotidLoading"></span>
<div class="autocomplete-dropdown" id="lotidDropdown"></div>
</div>
<div class="filter-group">
<label>PACKAGE</label>
<input type="text" id="filterPackage" placeholder="輸入 PACKAGE..." autocomplete="off">
<span class="search-loading" id="packageLoading"></span>
<div class="autocomplete-dropdown" id="packageDropdown"></div>
</div>
<div class="filter-group">
<label>TYPE</label>
<input type="text" id="filterType" placeholder="輸入 TYPE..." autocomplete="off">
<span class="search-loading" id="typeLoading"></span>
<div class="autocomplete-dropdown" id="typeDropdown"></div>
</div>
<button class="btn-primary" onclick="applyFilters()">套用篩選</button>
<button class="btn-secondary" onclick="clearFilters()">清除篩選</button>
<span id="activeFilters"></span>
@@ -808,11 +820,15 @@
REFRESH_INTERVAL: 10 * 60 * 1000, // 10 minutes
filters: {
workorder: '',
lotid: ''
lotid: '',
package: '',
type: ''
},
searchTimers: {
workorder: null,
lotid: null
lotid: null,
package: null,
type: null
}
};
@@ -866,6 +882,12 @@
if (state.filters.lotid) {
params.lotid = state.filters.lotid;
}
if (state.filters.package) {
params.package = state.filters.package;
}
if (state.filters.type) {
params.type = state.filters.type;
}
return params;
}
@@ -936,9 +958,18 @@
const loadingEl = document.getElementById(`${type}Loading`);
loadingEl.classList.add('active');
// Map internal type to API field name
const fieldMap = {
'workorder': 'workorder',
'lotid': 'lotid',
'package': 'package',
'type': 'pj_type'
};
const field = fieldMap[type] || type;
try {
const result = await MesApi.get('/api/wip/meta/search', {
params: { type, q: query, limit: 20 },
params: { field, q: query, limit: 20 },
silent: true,
retries: 0 // No retry for autocomplete
});
@@ -1021,6 +1052,8 @@
function applyFilters() {
state.filters.workorder = document.getElementById('filterWorkorder').value.trim();
state.filters.lotid = document.getElementById('filterLotid').value.trim();
state.filters.package = document.getElementById('filterPackage').value.trim();
state.filters.type = document.getElementById('filterType').value.trim();
updateActiveFiltersDisplay();
loadAllData(false);
@@ -1029,8 +1062,12 @@
function clearFilters() {
document.getElementById('filterWorkorder').value = '';
document.getElementById('filterLotid').value = '';
document.getElementById('filterPackage').value = '';
document.getElementById('filterType').value = '';
state.filters.workorder = '';
state.filters.lotid = '';
state.filters.package = '';
state.filters.type = '';
updateActiveFiltersDisplay();
loadAllData(false);
@@ -1053,6 +1090,12 @@
if (state.filters.lotid) {
html += `<span class="filter-tag">Lot: ${state.filters.lotid} <span class="remove" onclick="removeFilter('lotid')">×</span></span>`;
}
if (state.filters.package) {
html += `<span class="filter-tag">Pkg: ${state.filters.package} <span class="remove" onclick="removeFilter('package')">×</span></span>`;
}
if (state.filters.type) {
html += `<span class="filter-tag">Type: ${state.filters.type} <span class="remove" onclick="removeFilter('type')">×</span></span>`;
}
container.innerHTML = html;
}
@@ -1279,6 +1322,8 @@
params.append('workcenter', workcenter);
if (state.filters.workorder) params.append('workorder', state.filters.workorder);
if (state.filters.lotid) params.append('lotid', state.filters.lotid);
if (state.filters.package) params.append('package', state.filters.package);
if (state.filters.type) params.append('type', state.filters.type);
window.location.href = `/wip-detail?${params.toString()}`;
}
@@ -1387,6 +1432,8 @@
window.onload = function() {
setupAutocomplete('workorder');
setupAutocomplete('lotid');
setupAutocomplete('package');
setupAutocomplete('type');
loadAllData(true);
startAutoRefresh();
};