feat(inventory): 販賣機視覺優化、修復匯入日期缺失與倉庫刪除權限錯誤

2026-02-09 10:19:46 +08:00
parent f22df90e01
commit 5e542752ba
14 changed files with 255 additions and 71 deletions
--- a/app/Modules/Inventory/Controllers/InventoryController.php
+++ b/app/Modules/Inventory/Controllers/InventoryController.php
@@ -53,12 +53,18 @@ class InventoryController extends Controller
            ->pluck('safety_stock', 'product_id')
            ->mapWithKeys(fn($val, $key) => [(string)$key => (float)$val]);

-        // 3. 準備 inventories (批號分組)
        $items = $warehouse->inventories()
            ->with(['product.baseUnit', 'lastIncomingTransaction', 'lastOutgoingTransaction'])
            ->get();

-        $inventories = $items->groupBy('product_id')->map(function ($batchItems) use ($safetyStockMap) {
+        // 判斷是否為販賣機並調整分組
+        $isVending = $warehouse->type === 'vending';
+        
+        $inventories = $items->groupBy(function ($item) use ($isVending) {
+            return $isVending 
+                ? $item->product_id . '-' . ($item->location ?? 'NO-SLOT') 
+                : $item->product_id;
+        })->map(function ($batchItems) use ($safetyStockMap, $isVending) {
            $firstItem = $batchItems->first();
            $product = $firstItem->product;
            $totalQuantity = $batchItems->sum('quantity');
--- a/app/Modules/Inventory/Controllers/SafetyStockController.php
+++ b/app/Modules/Inventory/Controllers/SafetyStockController.php
@@ -31,23 +31,25 @@ class SafetyStockController extends Controller
            ];
        });

-        // 準備現有庫存列表 (用於庫存量對比)
-        $inventories = Inventory::where('warehouse_id', $warehouse->id)
-            ->select('product_id', DB::raw('SUM(quantity) as total_quantity'))
-            ->groupBy('product_id')
-            ->get()
-            ->map(function ($inv) {
-                return [
-                    'productId' => (string) $inv->product_id,
-                    'quantity' => (float) $inv->total_quantity,
-                ];
-            });
+        // 獲取現有庫存 (用於抓取「已在倉庫中」的商品)
+        $inventoryProductIds = Inventory::where('warehouse_id', $warehouse->id)->pluck('product_id')->unique();

-        // 準備安全庫存設定列表 (從新表格讀取)
-        $safetyStockSettings = WarehouseProductSafetyStock::where('warehouse_id', $warehouse->id)
+        // 準備安全庫存設定列表 (從資料庫讀取)
+        $existingSettings = WarehouseProductSafetyStock::where('warehouse_id', $warehouse->id)
            ->with(['product.category', 'product.baseUnit'])
-            ->get()
-            ->map(function ($setting) {
+            ->get();
+
+        $existingProductIds = $existingSettings->pluck('product_id')->toArray();
+
+        // 找出：有庫存但是「還沒設定過安全庫存」的商品
+        $missingProductIds = $inventoryProductIds->diff($existingProductIds);
+        
+        $missingProducts = Product::whereIn('id', $missingProductIds)
+            ->with(['category', 'baseUnit'])
+            ->get();
+
+        // 合併：已設定的 + 有庫存未設定的 (預設值 0)
+        $safetyStockSettings = $existingSettings->map(function ($setting) {
            return [
                'id' => (string) $setting->id,
                'warehouseId' => (string) $setting->warehouse_id,
@@ -57,6 +59,31 @@ class SafetyStockController extends Controller
                'safetyStock' => (float) $setting->safety_stock,
                'unit' => $setting->product->baseUnit?->name ?? '個',
                'updatedAt' => $setting->updated_at->toIso8601String(),
+                'isNew' => false, // 標記為舊有設定
+            ];
+        })->concat($missingProducts->map(function ($product) use ($warehouse) {
+            return [
+                'id' => 'temp_' . $product->id, // 暫時 ID
+                'warehouseId' => (string) $warehouse->id,
+                'productId' => (string) $product->id,
+                'productName' => $product->name,
+                'productType' => $product->category ? $product->category->name : '其他',
+                'safetyStock' => 0, // 預設 0
+                'unit' => $product->baseUnit?->name ?? '個',
+                'updatedAt' => now()->toIso8601String(),
+                'isNew' => true, // 標記為建議新增
+            ];
+        }))->values();
+
+        // 原本的 inventories 映射 (供顯示對比)
+        $inventories = Inventory::where('warehouse_id', $warehouse->id)
+            ->select('product_id', DB::raw('SUM(quantity) as total_quantity'))
+            ->groupBy('product_id')
+            ->get()
+            ->map(function ($inv) {
+                return [
+                    'productId' => (string) $inv->product_id,
+                    'quantity' => (float) $inv->total_quantity,
                ];
            });

--- a/app/Modules/Inventory/Controllers/WarehouseController.php
+++ b/app/Modules/Inventory/Controllers/WarehouseController.php
@@ -156,8 +156,9 @@ class WarehouseController extends Controller

    public function destroy(Warehouse $warehouse)
    {
-        // 檢查是否有相關聯的採購單
-        if ($warehouse->purchaseOrders()->exists()) {
+        // 檢查是否有相關聯的採購單 (跨模組檢查，不使用模型關聯以符合解耦規範)
+        $hasPurchaseOrders = \App\Modules\Procurement\Models\PurchaseOrder::where('warehouse_id', $warehouse->id)->exists();
+        if ($hasPurchaseOrders) {
            return redirect()->back()->with('error', '無法刪除：該倉庫有相關聯的採購單，請先處理採購單。');
        }

--- a/app/Modules/Inventory/Exports/InventoryTemplateExport.php
+++ b/app/Modules/Inventory/Exports/InventoryTemplateExport.php
@@ -34,7 +34,6 @@ class InventoryDataSheet implements FromArray, WithHeadings, WithTitle, ShouldAu
            '商品代號',
            '商品名稱',
            '數量',
-            '單位',
            '入庫單價',
            '儲位/貨道',
            '批號',
@@ -58,7 +57,6 @@ class InventoryInstructionSheet implements FromArray, WithHeadings, WithTitle, S
            ['商品代號', '擇一輸入', '若條碼未填寫，系統會依據代號匹配商品'],
            ['商品名稱', '選填', '僅供對照參考，匯入時系統會自動忽略此欄位內容'],
            ['數量', '必填', '入庫的商品數量，須為大於 0 的數字'],
-            ['單位', '必填', '單位 (如：個、件)'],
            ['入庫單價', '選填', '未填寫時將預設使用商品的「採購成本價」'],
            ['儲位/貨道', '選填', '一般倉庫請填寫「儲位(位址)」，販賣機倉庫請填寫「貨道編號」(如: A1)'],
            ['批號', '選填', '如需批次控管請填寫，若留空系統會自動標記為 "NO-BATCH"'],
--- a/app/Modules/Inventory/Imports/InventoryImport.php
+++ b/app/Modules/Inventory/Imports/InventoryImport.php
@@ -9,10 +9,11 @@ use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithValidation;
 use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
 use Maatwebsite\Excel\Imports\HeadingRowFormatter;
 use Illuminate\Support\Facades\DB;

-class InventoryImport implements ToModel, WithHeadingRow, WithValidation, WithMapping
+class InventoryImport implements ToModel, WithHeadingRow, WithValidation, WithMapping, SkipsEmptyRows
 {
    private $warehouse;
    private $inboundDate;
@@ -35,6 +36,9 @@ class InventoryImport implements ToModel, WithHeadingRow, WithValidation, WithMa
        if (isset($row['商品代號'])) {
            $row['商品代號'] = (string) $row['商品代號'];
        }
+        if (isset($row['儲位/貨道'])) {
+            $row['儲位/貨道'] = (string) $row['儲位/貨道'];
+        }
        return $row;
    }

@@ -100,8 +104,11 @@ class InventoryImport implements ToModel, WithHeadingRow, WithValidation, WithMa
                'batch_number' => $inventory->batch_number,
                'quantity' => $quantity,
                'unit_cost' => $unitCost,
-                'transaction_type' => '手動入庫',
+                'type' => '手動入庫',
                'reason' => 'Excel 匯入入庫',
+                'balance_before' => $oldQty,
+                'balance_after' => $inventory->quantity,
+                'actual_time' => $this->inboundDate,
                'notes' => $this->notes,
                'expiry_date' => $inventory->expiry_date,
            ]);
@@ -115,8 +122,11 @@ class InventoryImport implements ToModel, WithHeadingRow, WithValidation, WithMa
        return [
            '商品條碼' => ['nullable', 'string'],
            '商品代號' => ['nullable', 'string'],
-            '數量' => ['required', 'numeric', 'min:0.01'],
-            '單位' => ['required', 'string'],
+            '數量' => [
+                'required_with:商品條碼,商品代號', // 只有在有商品資訊時，數量才是必填
+                'numeric',
+                'min:0' // 允許數量為 0
+            ],
            '入庫單價' => ['nullable', 'numeric', 'min:0'],
            '儲位/貨道' => ['nullable', 'string', 'max:50'],
            '批號' => ['nullable', 'string'],
--- a/database/migrations/tenant/2026_02_09_090204_update_inventories_unique_index_to_include_location.php
+++ b/database/migrations/tenant/2026_02_09_090204_update_inventories_unique_index_to_include_location.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('inventories', function (Blueprint $table) {
+            // 不刪除舊索引（以免外鍵報錯），直接建立新的、更精確的唯一索引
+            // 這樣「商品+批號+貨道」的組合就會被視為唯一，達成多貨道支援
+            $table->unique(['warehouse_id', 'product_id', 'batch_number', 'location'], 'warehouse_product_batch_location_unique');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('inventories', function (Blueprint $table) {
+            $table->dropUnique('warehouse_product_batch_location_unique');
+        });
+    }
+};
--- a/database/migrations/tenant/2026_02_09_090508_force_remove_old_inventory_unique_index.php
+++ b/database/migrations/tenant/2026_02_09_090508_force_remove_old_inventory_unique_index.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // 最直接的做法：暫時關閉外鍵檢查，然後強制刪除報錯的索引
+        DB::statement('SET FOREIGN_KEY_CHECKS=0;');
+        
+        try {
+            // 直接下達 SQL 指令刪除索引
+            DB::statement('ALTER TABLE inventories DROP INDEX warehouse_product_batch_unique;');
+        } catch (\Exception $e) {
+            // 索引不存在則跳過
+        }
+
+        DB::statement('SET FOREIGN_KEY_CHECKS=1;');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        DB::statement('SET FOREIGN_KEY_CHECKS=0;');
+        
+        DB::statement('ALTER TABLE inventories ADD UNIQUE INDEX warehouse_product_batch_unique (warehouse_id, product_id, batch_number);');
+
+        DB::statement('SET FOREIGN_KEY_CHECKS=1;');
+    }
+};
--- a/resources/js/Components/Warehouse/Inventory/InventoryImportDialog.tsx
+++ b/resources/js/Components/Warehouse/Inventory/InventoryImportDialog.tsx
@@ -20,9 +20,10 @@ interface Props {
    open: boolean;
    onOpenChange: (open: boolean) => void;
    warehouseId: string;
+    warehouseName: string;
 }

-export default function InventoryImportDialog({ open, onOpenChange, warehouseId }: Props) {
+export default function InventoryImportDialog({ open, onOpenChange, warehouseId, warehouseName }: Props) {
    const { data, setData, post, processing, errors, reset, clearErrors } = useForm({
        file: null as File | null,
        inboundDate: new Date().toISOString().split('T')[0],
@@ -63,6 +64,9 @@ export default function InventoryImportDialog({ open, onOpenChange, warehouseId
                    <DialogTitle>匯入庫存資料</DialogTitle>
                    <DialogDescription>
                        請先下載範本，填寫完畢後上傳檔案進行批次入庫。
+                        <div className="mt-2 p-2 bg-primary-main/5 border border-primary-main/20 rounded text-primary-main font-medium">
+                            目標倉庫：{warehouseName}
+                        </div>
                    </DialogDescription>
                </DialogHeader>

--- a/resources/js/Components/Warehouse/Inventory/InventoryTable.tsx
+++ b/resources/js/Components/Warehouse/Inventory/InventoryTable.tsx
@@ -135,9 +135,19 @@ export default function InventoryTable({
                                            ) : (
                                                <ChevronRight className="h-5 w-5 text-gray-600" />
                                            )}
-                                            <h3 className="font-semibold text-gray-900">{group.productName}</h3>
+                                            <h3 className="font-semibold text-gray-900">
+                                                {group.productName}
+                                                {isVending && group.batches.length > 0 && (() => {
+                                                    const locations = Array.from(new Set(group.batches.map(b => b.location).filter(Boolean)));
+                                                    return locations.length > 0 ? (
+                                                        <span className="ml-2 text-primary-main font-bold">
+                                                            {locations.map(loc => `[${loc}]`).join('')}
+                                                        </span>
+                                                    ) : null;
+                                                })()}
+                                            </h3>
                                            <span className="text-sm text-gray-500">
-                                                {hasInventory ? `${group.batches.length} 個批號` : '無庫存'}
+                                                {isVending ? '' : (hasInventory ? `${group.batches.length} 個批號` : '無庫存')}
                                            </span>
                                            {group.batches.some(b => b.expiryDate && new Date(b.expiryDate) < new Date()) && (
                                                <Badge className="bg-red-50 text-red-600 border-red-200">
@@ -220,7 +230,7 @@ export default function InventoryTable({
                                                            <TableRow key={batch.id}>
                                                                <TableCell className="text-grey-2">{index + 1}</TableCell>
                                                                <TableCell>{batch.batchNumber || "-"}</TableCell>
-                                                                <TableCell>{batch.location || "-"}</TableCell>
+                                                                <TableCell className="font-medium text-primary-main">{batch.location || "-"}</TableCell>
                                                                <TableCell>
                                                                    <span>{batch.quantity} {batch.unit}</span>
                                                                </TableCell>
--- a/resources/js/Components/Warehouse/SafetyStock/SafetyStockList.tsx
+++ b/resources/js/Components/Warehouse/SafetyStock/SafetyStockList.tsx
@@ -53,7 +53,16 @@ export default function SafetyStockList({
    });

    // 獲取狀態徽章 (與 InventoryTable 保持一致)
-    const getStatusBadge = (quantity: number, safetyStock: number) => {
+    const getStatusBadge = (quantity: number, safetyStock: number, isNew?: boolean) => {
+        // 如果是自動帶入的品項且尚未存檔，顯示「未設定」
+        if (isNew) {
+            return (
+                <Badge variant="outline" className="text-gray-400 border-gray-200 font-normal">
+                    未設定
+                </Badge>
+            );
+        }
+
        const status = getSafetyStockStatus(quantity, safetyStock);
        switch (status) {
            case "正常":
@@ -122,7 +131,7 @@ export default function SafetyStockList({
                                    </span>
                                </TableCell>
                                <TableCell>
-                                    {getStatusBadge(currentStock, setting.safetyStock)}
+                                    {getStatusBadge(currentStock, setting.safetyStock, setting.isNew)}
                                </TableCell>
                                <TableCell className="text-right">
                                    <div className="flex justify-end gap-2">
--- a/resources/js/Components/Warehouse/WarehouseCard.tsx
+++ b/resources/js/Components/Warehouse/WarehouseCard.tsx
@@ -11,6 +11,9 @@ import {
  Edit,
  Info,
  FileText,
+  CupSoda,
+  QrCode,
+  Milk,
 } from "lucide-react";
 import { Warehouse, WarehouseStats } from "@/types/warehouse";
 import { Button } from "@/Components/ui/button";
@@ -50,17 +53,28 @@ export default function WarehouseCard({
  onEdit,
 }: WarehouseCardProps) {
  const [showInfoDialog, setShowInfoDialog] = useState(false);
+  const isVending = warehouse.type === 'vending';

  return (
    <Card
-      className={`relative overflow-hidden transition-all hover:shadow-lg flex flex-col ${hasWarning
+      className={`relative overflow-hidden transition-all duration-300 hover:shadow-lg flex flex-col group ${isVending
+        ? "border-primary-400 border-2 bg-white min-h-[300px]"
+        : hasWarning
          ? "border-orange-400 border-2 bg-orange-50/50"
          : "border-gray-200"
        }`}
    >
+      {/* 裝飾性背景元素 (僅限販賣機) */}
+      {isVending && (
+        <>
+          {/* LED 裝飾線條 - 保持主色調 */}
+          <div className="absolute top-0 bottom-0 left-0 w-1 bg-primary-500 shadow-[1px_0_5px_rgba(var(--primary-main-rgb),0.2)]" />
+        </>
+      )}
+
      {/* 警告橫幅 */}
      {hasWarning && (
-        <div className="absolute top-0 left-0 right-0 bg-orange-500 text-white px-4 py-1 flex items-center justify-between text-sm">
+        <div className="absolute top-0 left-0 right-0 bg-orange-500 text-white px-4 py-1 flex items-center justify-between text-sm z-10">
          <div className="flex items-center gap-2">
            <AlertTriangle className="h-4 w-4" />
            <span>低庫存警告</span>
@@ -71,12 +85,14 @@ export default function WarehouseCard({

      <CardContent className={`p-6 flex flex-col flex-1 ${hasWarning ? "pt-12" : "pt-6"}`}>
        {/* 上半部：資訊區域 */}
-        <div className="flex-1">
+        <div className="flex-1 relative z-10">
          {/* 標題區塊 */}
-          <div className="flex items-start justify-between mb-4">
+          <div className="flex items-start justify-between mb-2">
            <div>
              <div className="flex items-center gap-2 mb-1">
-                <h3 className="text-2xl font-bold">{warehouse.name}</h3>
+                <h3 className="text-2xl font-bold text-gray-900">
+                  {warehouse.name}
+                </h3>
                <button
                  onClick={() => setShowInfoDialog(true)}
                  className="text-gray-400 hover:text-gray-600 transition-colors"
@@ -92,30 +108,22 @@ export default function WarehouseCard({
                  {WAREHOUSE_TYPE_LABELS[warehouse.type || 'standard'] || '標準倉'}
                  {warehouse.type === 'quarantine' ? ' (不計入可用)' : ' (計入可用)'}
                </Badge>
-                {warehouse.type === 'transit' && warehouse.license_plate && (
-                  <Badge variant="secondary" className="text-xs font-normal bg-yellow-100 text-yellow-800 border-yellow-200">
-                    {warehouse.license_plate} {warehouse.driver_name && `(${warehouse.driver_name})`}
-                  </Badge>
-                )}
              </div>
            </div>
          </div>

          <div className="text-sm text-gray-600 mb-4 line-clamp-2 min-h-[40px]">
-            {warehouse.description || "無描述"}
+            {warehouse.description || (isVending ? "管理此機台的商品配貨與補貨狀況" : "無描述")}
          </div>

-
-          {/* 統計區塊 - 狀態標籤 */}
+          {/* 統計區塊 */}
          <div className="space-y-3">
-
-            {/* 帳面庫存總計 (金額) - 瑕疵倉隱藏此項以減少重複 */}
            <Can permission="inventory.view_cost">
              {warehouse.type !== 'quarantine' && (
-                <div className="flex items-center justify-between p-3 rounded-lg bg-primary-50/50 border border-primary-100">
-                  <div className="flex items-center gap-2 text-primary-700">
-                    <Package className="h-4 w-4" />
-                    <span className="text-sm font-medium">帳面庫存總計</span>
+                <div className="flex items-center justify-between p-3 rounded-lg bg-primary-50/50 border border-primary-100 text-primary-700">
+                  <div className="flex items-center gap-2">
+                    <Package className="h-4 w-4 opacity-80" />
+                    <span className="text-sm font-medium">帳面庫存估值</span>
                  </div>
                  <div className="text-sm font-bold text-primary-main">
                    ${Number(stats.totalValue || 0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
@@ -124,7 +132,6 @@ export default function WarehouseCard({
              )}
            </Can>

-            {/* 過期統計 (金額) */}
            <Can permission="inventory.view_cost">
              {Number(stats.abnormalValue || 0) > 0 && (
                <div className="flex items-center justify-between p-3 rounded-lg bg-red-50/50 border border-red-100 mt-3">
@@ -141,12 +148,31 @@ export default function WarehouseCard({
              )}
            </Can>

-
+            {/* 販賣機特色視覺：投幣、取物口裝飾 (移動至帳面庫存下方，顏色更顯眼) */}
+            {isVending && (
+              <div className="flex gap-4 mt-6 items-end">
+                <div className="flex-1 h-12 bg-gray-100 rounded-lg border-2 border-gray-300 shadow-inner flex items-center justify-center relative overflow-hidden">
+                  <div className="absolute inset-0 bg-gradient-to-b from-gray-200/50 to-transparent pointer-events-none" />
+                  <div className="flex gap-1 items-end opacity-30 pb-1">
+                    <CupSoda className="h-5 w-5 text-gray-400 rotate-12 -translate-x-1" />
+                    <Milk className="h-6 w-6 text-gray-500 -rotate-12 translate-y-1" />
+                    <CupSoda className="h-5 w-5 text-gray-400 rotate-3" />
+                    <Milk className="h-5 w-5 text-gray-400 -rotate-6 translate-x-1" />
+                    <CupSoda className="h-6 w-6 text-gray-500 rotate-12 translate-y-1" />
+                  </div>
+                </div>
+                <div className="w-10 h-10 bg-gray-200 rounded-sm border-2 border-gray-400 flex items-center justify-center p-1 shadow-sm self-center">
+                  <div className="text-gray-600 opacity-60">
+                    <QrCode className="h-6 w-6" />
+                  </div>
+                </div>
+              </div>
+            )}
          </div>
        </div>

        {/* 下半部：操作按鈕 */}
-        <div className="mt-5 pt-3 border-t border-gray-200">
+        <div className="mt-5 pt-4 border-t border-gray-200">
          <div className="flex gap-2">
            <Button
              onClick={() => onViewInventory(warehouse.id)}
--- a/resources/js/Pages/Warehouse/Inventory.tsx
+++ b/resources/js/Pages/Warehouse/Inventory.tsx
@@ -133,7 +133,7 @@ export default function WarehouseInventoryPage({
                </div>

                {/* 操作按鈕 (位於標題下方) */}
-                <div className="flex items-center gap-3 mb-6">
+                <div className="flex flex-wrap items-center gap-3 mb-6">
                    {/* 安全庫存設定按鈕 */}
                    <Can permission="inventory.safety_stock">
                        <Link href={route('warehouses.safety-stock.index', warehouse.id)}>
@@ -231,6 +231,7 @@ export default function WarehouseInventoryPage({
                    open={importDialogOpen}
                    onOpenChange={setImportDialogOpen}
                    warehouseId={warehouse.id}
+                    warehouseName={warehouse.name}
                />
            </div>
        </AuthenticatedLayout>
--- a/resources/js/Pages/Warehouse/SafetyStockSettings.tsx
+++ b/resources/js/Pages/Warehouse/SafetyStockSettings.tsx
@@ -69,6 +69,26 @@ export default function SafetyStockPage({
    };

    const handleEdit = (updatedSetting: SafetyStockSetting) => {
+        // 如果 ID 包含 temp_，表示這是一個「自動帶入但尚未存入資料庫」的建議項
+        // 這種情況應該呼叫 POST (store) 而非 PUT (update)，以避免被後端路由模型綁定報 404
+        if (updatedSetting.id.includes('temp_')) {
+            router.post(route('warehouses.safety-stock.store', warehouse.id), {
+                settings: [{
+                    productId: updatedSetting.productId,
+                    quantity: updatedSetting.safetyStock
+                }],
+            }, {
+                onSuccess: () => {
+                    setEditingSetting(null);
+                    toast.success(`成功設定 ${updatedSetting.productName} 的安全庫存`);
+                },
+                onError: (errors) => {
+                    const firstError = Object.values(errors)[0];
+                    toast.error(typeof firstError === 'string' ? firstError : "設定失敗");
+                }
+            });
+        } else {
+            // 已存在的項目，正常執行 PUT 更新
            router.put(route('warehouses.safety-stock.update', [warehouse.id, updatedSetting.id]), {
                safetyStock: updatedSetting.safetyStock,
            }, {
@@ -81,6 +101,7 @@ export default function SafetyStockPage({
                    toast.error(typeof firstError === 'string' ? firstError : "更新失敗");
                }
            });
+        }
    };

    const handleDelete = () => {
--- a/resources/js/types/warehouse.ts
+++ b/resources/js/types/warehouse.ts
@@ -113,6 +113,7 @@ export interface SafetyStockSetting {
  unit?: string;
  createdAt: string;
  updatedAt: string;
+  isNew?: boolean;
 }

 /**