From 154a2e05538ed5933584d8cbf9caf3324fe159e4 Mon Sep 17 00:00:00 2001 From: sky121113 Date: Mon, 18 May 2026 14:46:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[FEAT]=20=E9=87=8D=E6=A7=8B=E8=88=87?= =?UTF-8?q?=E5=84=AA=E5=8C=96=E5=95=86=E5=93=81=E5=88=A9=E6=BD=A4=E7=B5=B1?= =?UTF-8?q?=E8=A8=88=E5=A0=B1=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 【後端優化】重構 AnalysisController.php，以高效單次 SQL 統計計算銷量、銷額、總成本與淨利，套用 company_id 進行多租戶隔離，支援超級管理員跨租戶查詢，並解決 MySQL only_full_group_by 嚴格模式的 group by 語法相容問題。 2. 【前端介面】全新實作 product-reports.blade.php 極簡奢華風視圖，整合 Flatpickr 雙向日期區間選擇與「近 7 日、今日、本週、上週、本月、上月」快速切換快捷按鈕。 3. 【圖表自適應】整合 ApexCharts 銷售走勢曲線與圓餅圖，設計 PHP 端走勢數據日補零機制，並導入 ResizeObserver 進行圖表寬度百分之百響應式重繪。 4. 【尊榮數據導出】提供複製 (tsv)、CSV、Excel 與 PDF/列印的多維度導出引擎控制項。 5. 【高級前端分頁】對齊銷售紀錄規格，實作 Alpine.js 純前端高級分頁與 Show 10/25/50/100 筆數選擇器，並修復 select 動態 option 渲染時 ES6 template string 逸出問題。 6. 【細節齊平與遮擋修正】將日期 Input 寬度由 sm:w-56 拓寬至 sm:w-72，將日曆 Icon 左邊距從 pl-3.5 改進為 pl-5，Input 文字內左距調整為 pl-13，達到與 searchable-select 的 100% 齊平對齊，並配置跨卡片遞降 z-index 層級（z-40 -> z-30 -> z-20）徹底解決下拉選單在電腦版被下方走勢圖 Card 遮擋/截斷的 Bug。 7. 【多語系支援】於 zh_TW.json, en.json, ja.json 補強指標中英日翻譯。 8. 【選單整合】於 sidebar-menu.blade.php 的數據分析模組下正式啟用「商品報表」選單項目。 --- .../Controllers/Admin/AnalysisController.php | 179 ++- lang/en.json | 44 +- lang/ja.json | 44 +- lang/zh_TW.json | 44 +- .../admin/analysis/product-reports.blade.php | 1073 +++++++++++++++++ .../layouts/partials/sidebar-menu.blade.php | 24 +- 6 files changed, 1396 insertions(+), 12 deletions(-) create mode 100644 resources/views/admin/analysis/product-reports.blade.php diff --git a/app/Http/Controllers/Admin/AnalysisController.php b/app/Http/Controllers/Admin/AnalysisController.php index 2e7f099..3b913ab 100644 --- a/app/Http/Controllers/Admin/AnalysisController.php +++ b/app/Http/Controllers/Admin/AnalysisController.php @@ -26,11 +26,186 @@ class AnalysisController extends Controller } // 商品報表分析 - public function productReports() + public function productReports(Request $request) { - return view('admin.placeholder', [ + $user = auth()->user(); + $companyId = $user->company_id; + + // 1. 取得篩選參數 + $selectedCompanyId = $request->input('company_id'); + $selectedProductId = $request->input('product_id', 'ALL'); + $dateRange = $request->input('date_range'); + + // 2. 解析日期區間 + if ($dateRange) { + $dates = explode(' to ', $dateRange); + if (count($dates) === 2) { + $startDate = \Illuminate\Support\Carbon::parse($dates[0])->startOfDay(); + $endDate = \Illuminate\Support\Carbon::parse($dates[1])->endOfDay(); + } else { + $startDate = \Illuminate\Support\Carbon::parse($dates[0])->startOfDay(); + $endDate = \Illuminate\Support\Carbon::parse($dates[0])->endOfDay(); + } + } else { + // 預設為最近 7 天 (含今日) + $startDate = now()->subDays(6)->startOfDay(); + $endDate = now()->endOfDay(); + $dateRange = $startDate->format('Y-m-d') . ' to ' . $endDate->format('Y-m-d'); + } + + // 3. 租戶隔離：非系統管理員強制限制為其所屬公司 + if (!$user->isSystemAdmin()) { + $effectiveCompanyId = $companyId; + } else { + $effectiveCompanyId = $selectedCompanyId; + } + + // 4. 加載下拉選單選項 + // 公司選單 (僅限 Super Admin) + $companies = []; + if ($user->isSystemAdmin()) { + $companies = \App\Models\System\Company::active()->get(['id', 'name']); + } + + // 商品選單 + $productsQuery = \App\Models\Product\Product::query(); + if ($effectiveCompanyId) { + $productsQuery->where('company_id', $effectiveCompanyId); + } + $products = $productsQuery->active()->get(['id', 'name', 'barcode']); + + // 5. 執行主報表統計 SQL + // 計算各商品的銷售數量、銷售額、總成本、利潤 + $mainQuery = \Illuminate\Support\Facades\DB::table('order_items as oi') + ->join('orders as o', 'o.id', '=', 'oi.order_id') + ->leftJoin('products as p', 'p.id', '=', 'oi.product_id') + ->select([ + 'oi.product_id', + \Illuminate\Support\Facades\DB::raw('COALESCE(p.barcode, oi.barcode) as barcode'), + \Illuminate\Support\Facades\DB::raw('COALESCE(p.name, oi.product_name) as name'), + \Illuminate\Support\Facades\DB::raw('SUM(oi.quantity) as total_quantity'), + \Illuminate\Support\Facades\DB::raw('SUM(oi.subtotal) as total_sales'), + \Illuminate\Support\Facades\DB::raw('SUM(oi.quantity * COALESCE(p.cost, 0)) as total_cost'), + \Illuminate\Support\Facades\DB::raw('SUM(oi.subtotal) - SUM(oi.quantity * COALESCE(p.cost, 0)) as total_profit') + ]) + ->where('o.payment_status', \App\Models\Transaction\Order::PAYMENT_STATUS_SUCCESS) + ->whereNull('o.deleted_at') + ->whereBetween('o.created_at', [$startDate, $endDate]); + + // 套用公司篩選 + if ($effectiveCompanyId) { + $mainQuery->where('o.company_id', $effectiveCompanyId); + } + + // 套用特定商品篩選 + if ($selectedProductId && $selectedProductId !== 'ALL') { + $mainQuery->where('oi.product_id', $selectedProductId); + } + + $mainQuery->groupBy('oi.product_id') + ->groupBy(\Illuminate\Support\Facades\DB::raw('COALESCE(p.barcode, oi.barcode)')) + ->groupBy(\Illuminate\Support\Facades\DB::raw('COALESCE(p.name, oi.product_name)')); + $tableData = $mainQuery->get(); + + // 6. 計算總計 Summary + $totalQuantity = 0; + $totalSales = 0.0; + $totalCost = 0.0; + $totalProfit = 0.0; + + foreach ($tableData as $row) { + $row->total_quantity = (int)$row->total_quantity; + $row->total_sales = (float)$row->total_sales; + $row->total_cost = (float)$row->total_cost; + $row->total_profit = (float)$row->total_profit; + + $totalQuantity += $row->total_quantity; + $totalSales += $row->total_sales; + $totalCost += $row->total_cost; + $totalProfit += $row->total_profit; + } + + $summary = [ + 'total_quantity' => $totalQuantity, + 'total_sales' => round($totalSales, 2), + 'total_cost' => round($totalCost, 2), + 'total_profit' => round($totalProfit, 2), + ]; + + // 7. 圖表日走勢統計 SQL + $trendQuery = \Illuminate\Support\Facades\DB::table('order_items as oi') + ->join('orders as o', 'o.id', '=', 'oi.order_id') + ->leftJoin('products as p', 'p.id', '=', 'oi.product_id') + ->select([ + \Illuminate\Support\Facades\DB::raw("DATE_FORMAT(o.created_at, '%Y-%m-%d') as date"), + \Illuminate\Support\Facades\DB::raw('SUM(oi.quantity) as total_quantity'), + \Illuminate\Support\Facades\DB::raw('SUM(oi.subtotal) as total_sales'), + \Illuminate\Support\Facades\DB::raw('SUM(oi.quantity * COALESCE(p.cost, 0)) as total_cost'), + ]) + ->where('o.payment_status', \App\Models\Transaction\Order::PAYMENT_STATUS_SUCCESS) + ->whereNull('o.deleted_at') + ->whereBetween('o.created_at', [$startDate, $endDate]); + + if ($effectiveCompanyId) { + $trendQuery->where('o.company_id', $effectiveCompanyId); + } + + if ($selectedProductId && $selectedProductId !== 'ALL') { + $trendQuery->where('oi.product_id', $selectedProductId); + } + + $trendQuery->groupBy('date')->orderBy('date', 'asc'); + $trendData = $trendQuery->get(); + + // 補齊日期區間內所有空缺日走勢 + $period = new \DatePeriod( + $startDate->copy()->startOfDay(), + new \DateInterval('P1D'), + $endDate->copy()->endOfDay() + ); + + $chartData = []; + foreach ($period as $date) { + $dateStr = $date->format('Y-m-d'); + $chartData[$dateStr] = [ + 'date' => $dateStr, + 'quantity' => 0, + 'sales' => 0.0, + 'cost' => 0.0, + ]; + } + + foreach ($trendData as $row) { + if (isset($chartData[$row->date])) { + $chartData[$row->date]['quantity'] = (int)$row->total_quantity; + $chartData[$row->date]['sales'] = round((float)$row->total_sales, 2); + $chartData[$row->date]['cost'] = round((float)$row->total_cost, 2); + } + } + $chartData = array_values($chartData); + + // 8. 判斷是否為 AJAX 請求，回傳 JSON 格式 + if ($request->ajax()) { + return response()->json([ + 'success' => true, + 'summary' => $summary, + 'chart_data' => $chartData, + 'table_data' => $tableData, + ]); + } + + // 9. 一般 GET 載入視圖 + return view('admin.analysis.product-reports', [ 'title' => '商品報表分析', 'description' => '商品銷售數據分析', + 'companies' => $companies, + 'products' => $products, + 'selectedCompanyId' => $selectedCompanyId, + 'selectedProductId' => $selectedProductId, + 'dateRange' => $dateRange, + 'summary' => $summary, + 'chartData' => $chartData, + 'tableData' => $tableData, ]); } diff --git a/lang/en.json b/lang/en.json index 834e5c8..48bd1b6 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1984,5 +1984,47 @@ "Please use our standard template to ensure data compatibility.": "Please use our standard template to ensure data compatibility.", ":count staff cards imported successfully": ":count staff cards imported successfully", "Import failed": "Import failed", - "System restarting": "System restarting" + "System restarting": "System restarting", + "Product Report Analysis": "Product Report Analysis", + "Smart vending machine product sales, cost and profit analysis report": "Smart vending machine product sales, cost and profit analysis report", + "Real-time operational data synchronized": "Real-time operational data synchronized", + "Total Quantity Sold": "Total Quantity Sold", + "Product physical shipment count": "Product physical shipment count", + "Total Sales Amount": "Total Sales Amount", + "Sales Amount": "Sales Amount", + "Total transaction amount of successful payments": "Total transaction amount of successful payments", + "Total Product Cost": "Total Product Cost", + "Product Cost": "Product Cost", + "Sales Quantity": "Sales Quantity", + "Accumulated dynamic product purchase cost": "Accumulated dynamic product purchase cost", + "Total Sales Profit": "Total Sales Profit", + "Sales revenue minus product cost net value": "Sales revenue minus product cost net value", + "Current data indicates a loss": "Current data indicates a loss", + "Quick Filter": "Quick Filter", + "Last 7 Days": "Last 7 Days", + "Today": "Today", + "This Week": "This Week", + "Last Week": "Last Week", + "This Month": "This Month", + "Last Month": "Last Month", + "Select Product for Analysis": "Select Product for Analysis", + "All Products (ALL)": "All Products (ALL)", + "Tenant Company": "Tenant Company", + "Cross-Company / Headquarter Global Stats": "Cross-Company / Headquarter Global Stats", + "Product Sales & Profit Trend": "Product Sales & Profit Trend", + "Daily operational variance curve for selected timeframe": "Daily operational variance curve for selected timeframe", + "Detailed Analysis Data": "Detailed Analysis Data", + "Search product name, barcode...": "Search product name, barcode...", + "Export Report": "Export Report", + "Copy to Clipboard": "Copy to Clipboard", + "Export to CSV": "Export to CSV", + "Export to Excel": "Export to Excel", + "Print & PDF": "Print & PDF", + "Product Barcode": "Product Barcode", + "Quantity Sold": "Quantity Sold", + "Total Sales": "Total Sales", + "Total Net Profit": "Total Net Profit", + "Gross Margin": "Gross Margin", + "No product data matching search criteria": "No product data matching search criteria", + "Analyze Solely": "Analyze Solely" } \ No newline at end of file diff --git a/lang/ja.json b/lang/ja.json index 61dd5ba..e4af4c0 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -1984,5 +1984,47 @@ "Please use our standard template to ensure data compatibility.": "データの互換性を確保するために、標準テンプレートを使用してください。", ":count staff cards imported successfully": ":count 枚のスタッフカードが正常にインポートされました", "Import failed": "インポート失敗", - "System restarting": "再起動中" + "System restarting": "再起動中", + "Product Report Analysis": "商品レポート分析", + "Smart vending machine product sales, cost and profit analysis report": "スマート自動販売機商品販売・コスト利益分析レポート", + "Real-time operational data synchronized": "リアルタイム運営データ同期完了", + "Total Quantity Sold": "販売総数", + "Product physical shipment count": "商品の実出荷数", + "Total Sales Amount": "販売総額", + "Sales Amount": "売上金額", + "Total transaction amount of successful payments": "支払い成功取引総額", + "Total Product Cost": "商品総コスト", + "Product Cost": "商品コスト", + "Sales Quantity": "販売数量", + "Accumulated dynamic product purchase cost": "リアルタイム仕入コスト累計", + "Total Sales Profit": "販売総利益", + "Sales revenue minus product cost net value": "販売額から商品コストを差し引いた純利益", + "Current data indicates a loss": "現在データは赤字を示しています", + "Quick Filter": "クイックフィルター", + "Last 7 Days": "過去7日間", + "Today": "今日", + "This Week": "今週", + "Last Week": "先週", + "This Month": "今月", + "Last Month": "先月", + "Select Product for Analysis": "分析対象商品の選択", + "All Products (ALL)": "全商品 (ALL)", + "Tenant Company": "所属テナント会社", + "Cross-Company / Headquarter Global Stats": "複数会社間 / 本部グローバル統計", + "Product Sales & Profit Trend": "商品販売・利益推移", + "Daily operational variance curve for selected timeframe": "選択期間における日次運営変動曲線", + "Detailed Analysis Data": "明細分析データ", + "Search product name, barcode...": "商品名、バーコードで検索...", + "Export Report": "レポートのエクスポート", + "Copy to Clipboard": "クリップボードにコピー", + "Export to CSV": "CSVエクスポート", + "Export to Excel": "Excelエクスポート", + "Print & PDF": "印刷 & PDF", + "Product Barcode": "商品バーコード", + "Quantity Sold": "販売数", + "Total Sales": "販売総額", + "Total Net Profit": "純利益総額", + "Gross Margin": "粗利益率", + "No product data matching search criteria": "検索条件に一致する商品データはありません", + "Analyze Solely": "個別分析" } \ No newline at end of file diff --git a/lang/zh_TW.json b/lang/zh_TW.json index 9dadedc..6509e85 100644 --- a/lang/zh_TW.json +++ b/lang/zh_TW.json @@ -2033,5 +2033,47 @@ "Please use our standard template to ensure data compatibility.": "請使用標準範例檔以確保資料相容性。", ":count staff cards imported successfully": "成功匯入 :count 張員工識別卡", "Import failed": "匯入失敗", - "System restarting": "重啟中" + "System restarting": "重啟中", + "Product Report Analysis": "商品報表分析", + "Smart vending machine product sales, cost and profit analysis report": "智慧型販賣機商品銷售與成本利潤分析報表", + "Real-time operational data synchronized": "即時營運數據已同步", + "Total Quantity Sold": "銷售總數量", + "Product physical shipment count": "商品實體出貨件數", + "Total Sales Amount": "銷售總金額", + "Sales Amount": "銷售金額", + "Total transaction amount of successful payments": "已付款成功之交易總額", + "Total Product Cost": "商品總成本", + "Product Cost": "商品成本", + "Sales Quantity": "銷售數量", + "Accumulated dynamic product purchase cost": "即時商品進貨成本累計", + "Total Sales Profit": "銷售總利潤", + "Sales revenue minus product cost net value": "銷售額扣除商品成本淨值", + "Current data indicates a loss": "當前數據出現虧損", + "Quick Filter": "快捷篩選", + "Last 7 Days": "近 7 日", + "Today": "今日", + "This Week": "本週", + "Last Week": "上週", + "This Month": "本月", + "Last Month": "上月", + "Select Product for Analysis": "選擇分析商品", + "All Products (ALL)": "全部商品 (ALL)", + "Tenant Company": "所屬租戶公司", + "Cross-Company / Headquarter Global Stats": "跨公司 / 總部全域統計", + "Product Sales & Profit Trend": "商品銷售利潤走勢", + "Daily operational variance curve for selected timeframe": "所選統計區間之每日營運變動曲線", + "Detailed Analysis Data": "明細分析數據", + "Search product name, barcode...": "搜尋商品名稱、條碼...", + "Export Report": "匯出報表", + "Copy to Clipboard": "複製至剪貼簿", + "Export to CSV": "匯出成 CSV", + "Export to Excel": "匯出成 Excel", + "Print & PDF": "列印與 PDF", + "Product Barcode": "商品條碼", + "Quantity Sold": "銷售數量", + "Total Sales": "銷售總額", + "Total Net Profit": "總淨利潤", + "Gross Margin": "毛利率", + "No product data matching search criteria": "沒有符合搜尋條件的商品資料", + "Analyze Solely": "單獨分析" } \ No newline at end of file diff --git a/resources/views/admin/analysis/product-reports.blade.php b/resources/views/admin/analysis/product-reports.blade.php new file mode 100644 index 0000000..c28ba0b --- /dev/null +++ b/resources/views/admin/analysis/product-reports.blade.php @@ -0,0 +1,1073 @@ +@extends('layouts.admin') + +@section('scripts') + +@endsection + +@section('content') +
+ + + +
+ + {{ __('Real-time operational data synchronized') }} +
+ + + +
+ +
+
+
+
+

{{ __('Sales Quantity') }}

+

-

+
+
+ + + +
+
+
+ + {{ __('Product physical shipment count') }} +
+
+ + +
+
+
+
+

{{ __('Total Sales Amount') }}

+

-

+
+
+ + + +
+
+
+ + {{ __('Total transaction amount of successful payments') }} +
+
+ + +
+
+
+
+

{{ __('Total Product Cost') }}

+

-

+
+
+ + + +
+
+
+ + {{ __('Accumulated dynamic product purchase cost') }} +
+
+ + +
+
+
+
+

{{ __('Total Sales Profit') }}

+

-

+
+
+ + + +
+
+
+ + +
+
+
+ + +
+
+ + +
+ {{ __('Quick Filter') }} + +
+ + +
+ +
+
+ + + + + + +
+
+ + +
+ + @foreach($products as $p) + + @endforeach + +
+ + + @if(auth()->user()->isSystemAdmin()) +
+ + @foreach($companies as $c) + + @endforeach + +
+ @endif +
+ +
+
+ + +
+ +
+
+
+

{{ __('Product Sales & Profit Trend') }}

+

{{ __('Daily operational variance curve for selected timeframe') }}

+
+
+
+ + {{ __('Sales Amount') }} +
+
+ + {{ __('Product Cost') }} +
+
+ + {{ __('Sales Quantity') }} +
+
+
+ +
+
+
+
+
+ + +
+ +
+ + +
+
+

{{ __('Detailed Analysis Data') }}

+

+
+ +
+ +
+ + + + + + + +
+ + +
+ + + +
+ + + + +
+
+
+
+ + + + + +
+ + + + +
+ + +
+ + +
+ +
+ {{ __('Show') }} +
+ +
+ +
+
+
+ + +

+ + + {{ __('to') }} + + + / + + {{ __('items') }} +

+
+ + +
+ + + + +
+ +
+ +
+
+ + + +
+ +
+ +
+
+ +
+ + +@endsection diff --git a/resources/views/layouts/partials/sidebar-menu.blade.php b/resources/views/layouts/partials/sidebar-menu.blade.php index c07c981..8bf6fec 100644 --- a/resources/views/layouts/partials/sidebar-menu.blade.php +++ b/resources/views/layouts/partials/sidebar-menu.blade.php @@ -222,9 +222,8 @@ @endcan -{{-- @can('menu.analysis') -8. 分析管理 +{{-- 8. 分析管理 --}}
    • @endcan ---}} {{-- From 1dc79f2cec600c6f9f9466f4fd46fe15eadcaee5 Mon Sep 17 00:00:00 2001 From: sky121113 Date: Mon, 18 May 2026 14:49:20 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[STYLE]=20=E4=BF=AE=E6=AD=A3=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=A0=B1=E8=A1=A8=E6=97=A5=E6=9C=9F=E7=AF=A9=E9=81=B8?= =?UTF-8?q?=E4=B9=8B=20Icon=20=E8=88=87=E6=96=87=E5=AD=97=E5=B7=A6?= =?UTF-8?q?=E9=96=93=E8=B7=9D=EF=BC=8C=E5=B0=8D=E9=BD=8A=E9=8A=B7=E8=B2=A8?= =?UTF-8?q?=E7=B4=80=E9=8C=84=E8=A6=8F=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/admin/analysis/product-reports.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/admin/analysis/product-reports.blade.php b/resources/views/admin/analysis/product-reports.blade.php index c28ba0b..5dfdcd2 100644 --- a/resources/views/admin/analysis/product-reports.blade.php +++ b/resources/views/admin/analysis/product-reports.blade.php @@ -127,13 +127,13 @@
    - +
    From 90a77404fe1addef8c910a1ab6a3686674afcea0 Mon Sep 17 00:00:00 2001 From: sky121113 Date: Mon, 18 May 2026 14:55:23 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[FEAT]=20=E6=96=B0=E5=A2=9E=E5=95=86?= =?UTF-8?q?=E5=93=81=E9=8A=B7=E5=94=AE=E6=8E=92=E8=A1=8C=E6=AC=84=E4=BD=8D?= =?UTF-8?q?=E8=88=87=E5=B0=8A=E6=A6=AE=E5=BE=BD=E7=AB=A0=EF=BC=8C=E4=B8=A6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B3=87=E6=96=99=E5=8C=AF=E5=87=BA=E5=BC=95?= =?UTF-8?q?=E6=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 於商品成本分析報表（電腦版 Table）最左側新增「排行」欄位，完美對齊圓角卡片樣式。 2. 針對前三名（Top 3）銷售商品設計尊榮徽章：第 1 名黃金徽章、第 2 名白銀徽章、第 3 名青銅徽章，其餘名次採用精緻 Mono 灰字。 3. 行動版 Card 移除原先通用包裹圖示，替換為智能偵測之獎牌徽章（🥇、🥈、🥉）或排行數字。 4. 全面升級資料複製（TSV）、CSV、Excel 與 PDF 列印等四大導出引擎，將「排行」業務指標同步注入首欄，並處理 colspan 對齊。 5. 補強多語系翻譯，於 zh_TW.json、en.json 與 ja.json 中完美新增「Rank / 排行 / 順位」鍵值。 --- lang/en.json | 1 + lang/ja.json | 1 + lang/zh_TW.json | 1 + .../admin/analysis/product-reports.blade.php | 69 ++++++++++++++----- 4 files changed, 53 insertions(+), 19 deletions(-) diff --git a/lang/en.json b/lang/en.json index 48bd1b6..db7ca43 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1265,6 +1265,7 @@ "Quick Select": "Quick Select", "Quick replenishment from this view": "Quick replenishment from this view", "Quick search...": "Quick search...", + "Rank": "Rank", "Real-time OEE analysis awaits": "Real-time OEE analysis awaits", "Real-time Operation Logs (Last 50)": "Real-time Operation Logs (Last 50)", "Real-time fleet efficiency and OEE metrics": "Real-time fleet efficiency and OEE metrics", diff --git a/lang/ja.json b/lang/ja.json index e4af4c0..71343a2 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -1265,6 +1265,7 @@ "Quick Select": "クイック選択", "Quick replenishment from this view": "この画面からクイック補充", "Quick search...": "クイック検索...", + "Rank": "順位", "Real-time OEE analysis awaits": "リアルタイムOEE分析待機中", "Real-time Operation Logs (Last 50)": "リアルタイム操作ログ (直近50件)", "Real-time fleet efficiency and OEE metrics": "全機器のリアルタイム効率とOEE指標", diff --git a/lang/zh_TW.json b/lang/zh_TW.json index 6509e85..4aad887 100644 --- a/lang/zh_TW.json +++ b/lang/zh_TW.json @@ -1284,6 +1284,7 @@ "Quick Select": "快速選取", "Quick replenishment from this view": "從此畫面快速補貨", "Quick search...": "快速搜尋...", + "Rank": "排行", "Real-time OEE analysis awaits": "即時 OEE 分析預備中", "Real-time Operation Logs (Last 50)": "即時操作日誌 (最後 50 筆)", "Real-time fleet efficiency and OEE metrics": "全機台即時效率與 OEE 指標", diff --git a/resources/views/admin/analysis/product-reports.blade.php b/resources/views/admin/analysis/product-reports.blade.php index 5dfdcd2..7889046 100644 --- a/resources/views/admin/analysis/product-reports.blade.php +++ b/resources/views/admin/analysis/product-reports.blade.php @@ -262,7 +262,12 @@ - + +
    + {{ __('Rank') }} +
    + +
    {{ __('Product Barcode') }}