fix(inventory): 修復倉庫低庫存警告計算與全站租戶名稱動態化

2026-02-02 11:03:09 +08:00
parent 1748eb007e
commit 75c634ffe4
8 changed files with 24 additions and 14 deletions
--- a/app/Modules/Inventory/Controllers/WarehouseController.php
+++ b/app/Modules/Inventory/Controllers/WarehouseController.php
@@ -37,6 +37,12 @@ class WarehouseController extends Controller
                            ->orWhere('expiry_date', '>=', now());
                      });
            }], 'quantity')
+            ->addSelect(['low_stock_count' => function ($query) {
+                $query->selectRaw('count(*)')
+                    ->from('warehouse_product_safety_stocks as ss')
+                    ->whereColumn('ss.warehouse_id', 'warehouses.id')
+                    ->whereRaw('(SELECT COALESCE(SUM(quantity), 0) FROM inventories WHERE warehouse_id = ss.warehouse_id AND product_id = ss.product_id) < ss.safety_stock');
+            }])
            ->orderBy('created_at', 'desc')
            ->paginate(10)
            ->withQueryString();
--- a/resources/js/Components/ApplicationLogo.tsx
+++ b/resources/js/Components/ApplicationLogo.tsx
@@ -21,7 +21,7 @@ export default function ApplicationLogo(props: ImgHTMLAttributes<HTMLImageElemen
        <img
            {...props}
            src="/logo.png"
-            alt="小小冰室 Logo"
+            alt={`${branding?.short_name || 'Star'} Logo`}
        />
    );
 }
--- a/resources/js/Layouts/AuthenticatedLayout.tsx
+++ b/resources/js/Layouts/AuthenticatedLayout.tsx
@@ -454,7 +454,7 @@ export default function AuthenticatedLayout({
                    </button>
                    <Link href="/" className="flex items-center gap-2">
                        <ApplicationLogo className="w-8 h-8 rounded-lg object-contain" />
-                        <span className="font-bold text-slate-900">{branding?.short_name || '小小冰室'} ERP</span>
+                        <span className="font-bold text-slate-900">{branding?.short_name || 'Star'} ERP</span>
                    </Link>
                </div>

@@ -510,7 +510,7 @@ export default function AuthenticatedLayout({
                    {!isCollapsed && (
                        <Link href="/" className="flex items-center gap-2 group">
                            <ApplicationLogo className="w-8 h-8 rounded-lg object-contain group-hover:scale-110 transition-transform" />
-                            <span className="font-extrabold text-primary-main text-lg tracking-tight">{branding?.short_name || '小小冰室'} ERP</span>
+                            <span className="font-extrabold text-primary-main text-lg tracking-tight">{branding?.short_name || 'Star'} ERP</span>
                        </Link>
                    )}
                    {isCollapsed && (
@@ -559,7 +559,7 @@ export default function AuthenticatedLayout({
                <div className="h-16 flex items-center justify-between px-6 border-b border-slate-100">
                    <Link href="/" className="flex items-center gap-2">
                        <ApplicationLogo className="w-8 h-8 rounded-lg object-contain" />
-                        <span className="font-extrabold text-primary-main text-lg">{branding?.short_name || '小小冰室'} ERP</span>
+                        <span className="font-extrabold text-primary-main text-lg">{branding?.short_name || 'Star'} ERP</span>
                    </Link>
                    <button onClick={() => setIsMobileOpen(false)} className="p-2 text-slate-400">
                        <X className="h-5 w-5" />
@@ -588,7 +588,7 @@ export default function AuthenticatedLayout({
                    {children}
                </div>
                <footer className="mt-auto py-6 text-center text-sm text-slate-400">
-                    Copyright &copy; {new Date().getFullYear()} {branding?.name || '小小冰室'}. All rights reserved. Design by 星科技
+                    Copyright &copy; {new Date().getFullYear()} {branding?.name || branding?.short_name || 'Star ERP'}. All rights reserved. Design by 星科技
                </footer>
                <Toaster richColors closeButton position="top-center" />
            </main>
--- a/resources/js/Pages/Auth/Login.tsx
+++ b/resources/js/Pages/Auth/Login.tsx
@@ -42,7 +42,7 @@ export default function Login() {

    return (
        <div className="min-h-screen flex items-center justify-center bg-gray-50 relative overflow-hidden">
-            <Head title="登入">
+            <Head title={`登入 - ${props.branding?.short_name || 'Star ERP'}`}>
                <link rel="icon" type="image/png" href="/favicon.png" />
            </Head>

@@ -136,7 +136,7 @@ export default function Login() {
                </div>

                <p className="text-center text-gray-400 text-sm mt-8">
-                    &copy; {new Date().getFullYear()} {props.branding?.name || '小小冰室'}. All rights reserved.
+                    &copy; {new Date().getFullYear()} {props.branding?.name || props.branding?.short_name || 'Star ERP'}. All rights reserved.
                </p>
            </div>
        </div>
--- a/resources/js/Pages/Dashboard.tsx
+++ b/resources/js/Pages/Dashboard.tsx
@@ -1,5 +1,6 @@
 import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout';
-import { Link, Head } from '@inertiajs/react';
+import { Link, Head, usePage } from '@inertiajs/react';
+import { PageProps } from '@/types/global';
 import { cn } from "@/lib/utils";
 import {
    Package,
@@ -27,6 +28,7 @@ interface Props {
 }

 export default function Dashboard({ stats }: Props) {
+    const { branding } = usePage<PageProps>().props;
    const cardData = [
        {
            label: '商品總數',
@@ -75,7 +77,7 @@ export default function Dashboard({ stats }: Props) {

    return (
        <AuthenticatedLayout>
-            <Head title="控制台 - 小小冰室 ERP" />
+            <Head title={`控制台 - ${branding?.short_name || 'Star'} ERP`} />

            <div className="p-8 max-w-7xl mx-auto">
                <div className="mb-8">
@@ -83,7 +85,7 @@ export default function Dashboard({ stats }: Props) {
                        <TrendingUp className="h-6 w-6 text-primary-main" />
                        系統總覽
                    </h1>
-                    <p className="text-gray-500 mt-1">歡迎回來，這是您的小小冰室 ERP 營運數據概況。</p>
+                    <p className="text-gray-500 mt-1">歡迎回來，這是您的 {branding?.short_name || 'Star'} ERP 營運數據概況。</p>
                </div>

                {/* 主要數據卡片 */}
--- a/resources/js/Pages/Product/Index.tsx
+++ b/resources/js/Pages/Product/Index.tsx
@@ -8,7 +8,8 @@ import ProductDialog from "@/Components/Product/ProductDialog";
 import CategoryManagerDialog from "@/Components/Category/CategoryManagerDialog";
 import UnitManagerDialog, { Unit } from "@/Components/Unit/UnitManagerDialog";
 import AuthenticatedLayout from "@/Layouts/AuthenticatedLayout";
-import { Head, router } from "@inertiajs/react";
+import { Head, router, usePage } from "@inertiajs/react";
+import { PageProps as GlobalPageProps } from "@/types/global";
 import { debounce } from "lodash";
 import Pagination from "@/Components/shared/Pagination";
 import { getBreadcrumbs } from "@/utils/breadcrumb";
@@ -57,6 +58,7 @@ interface PageProps {
 }

 export default function ProductManagement({ products, categories, units, filters }: PageProps) {
+  const { branding } = usePage<GlobalPageProps>().props;
  const [searchTerm, setSearchTerm] = useState(filters.search || "");
  const [typeFilter, setTypeFilter] = useState<string>(filters.category_id || "all");
  const [perPage, setPerPage] = useState<string>(filters.per_page || "10");
@@ -182,7 +184,7 @@ export default function ProductManagement({ products, categories, units, filters
            <Package className="h-6 w-6 text-primary-main" />
            商品資料管理
          </h1>
-          <p className="text-gray-500 mt-1">管理小小冰室原物料與成品資料</p>
+          <p className="text-gray-500 mt-1">管理 {branding?.short_name || 'Star'} 原物料與成品資料</p>
        </div>

        {/* Toolbar */}
--- a/resources/js/Pages/Warehouse/Index.tsx
+++ b/resources/js/Pages/Warehouse/Index.tsx
@@ -225,7 +225,7 @@ export default function WarehouseIndex({ warehouses, totals, filters }: PageProp
                                key={warehouse.id}
                                warehouse={warehouse}
                                stats={{
-                                    totalQuantity: warehouse.total_quantity || 0,
+                                    totalQuantity: warehouse.book_stock || 0,
                                    lowStockCount: warehouse.low_stock_count || 0,
                                    replenishmentNeeded: warehouse.low_stock_count || 0
                                }}
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -4,7 +4,7 @@
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1">

-        <title inertia>{{ config('app.name', 'Laravel') }}</title>
+        <title inertia>{{ $appName ?? config('app.name', 'Star ERP') }}</title>

        <!-- Fonts -->
        <link rel="icon" type="image/png" href="{{ $branding['logo_url'] ?? '/favicon.png' }}">