Merge branch 'dev'

docs: 微調 README 格式
fix(production): 移除 Create.tsx 中未使用的 units 變數與重複屬性
2026-02-12 16:41:08 +08:00 · 2026-02-12 16:36:51 +08:00 · 2026-02-12 16:34:51 +08:00 · 2026-02-12 16:31:46 +08:00 · 2026-02-12 16:30:34 +08:00 · 2026-02-12 13:41:43 +08:00
264 changed files with 24713 additions and 3294 deletions
--- a/.agent/rules/framework.md
+++ b/.agent/rules/framework.md
@@ -50,7 +50,16 @@ trigger: always_on
    *   Routes: `kebab-case` (小寫橫線分隔)
 *   **回傳格式**： 所有的前後端溝通需維持一致的 JSON 結構，特別是驗證錯誤 (Validation Errors) 與閃存訊息 (Flash Messages)。

-## 6. AI 協作規則 (給 Antigravity AI)
+## 6. 嚴格模組化通訊規範 (Strict Modular Communication)
+為了確保系統的可維護性與獨立性，所有模組必須遵守以下「實體解耦」規範：
+
+*   **禁止跨模組 Eloquent 關聯**：禁止在 Model 中定義指向其他模組的 `belongsTo`, `hasMany` 等關聯。
+*   **介面化通訊 (Contracts)**：模組間的資料交換與功能調用必須透過 `app/Modules/{ModuleName}/Contracts/` 下定義的介面進行。
+*   **禁止跨模組 Model 引用**：Controller 與 Service 禁止 `use` 其他模組的 Model (除非是該模組自身的 Contracts)。
+*   **手動資料水和 (Manual Hydration)**：若頁面需要顯示跨模組資料（例：訂單顯示使用者名稱），Controller 應透過 Service 獲取基本資料，再手動組合成前端所需的 JSON/Props 結構。
+*   **資料一致性**：跨模組的資料操作應由各模組的 Service 處理其內部的 transaction 完整性。
+
+## 7. AI 協作規則 (給 Antigravity AI)
 *   **角色設定**： 你是一位專業的全端開發工程師助手。
 *   **代碼生成指令**：
    *   所有的解釋說明請使用 **繁體中文**。
@@ -58,11 +67,27 @@ trigger: always_on
    *   必須考慮 ERP 邏輯（例如：權限判斷、操作日誌、資料完整性）。
    *   新增功能時，請先判斷應歸屬於哪個 Module，並建立在 `app/Modules/` 對應目錄下。

-## 7. 運行機制 (Docker / Sail)
+    *   新增功能時，請先判斷應歸屬於哪個 Module，並建立在 `app/Modules/` 對應目錄下。
+
+## 8. 多租戶開發規範 (Multi-tenancy Standards)
+本專案採用多租戶隔離架構，開發時必須遵守以下資料同步規則：
+*   **權限與選單同步**：新增 Permission 或修改系統設定時，必須確保中央資料庫 (Central) 與所有租戶資料庫 (Tenants) 均已同步。
+*   **指令執行**：
+    *   **Seeders**: 必須執行 `./vendor/bin/sail php artisan tenants:run db:seed` 以確保所有租戶均獲得更新。
+    *   **Tinker**: 檢查租戶資料時應使用 `./vendor/bin/sail php artisan tenants:run tinker`。
+    *   **Migrations**: 租戶相關的 Schema 異動應放在 `database/migrations/tenant/` 並執行 `./vendor/bin/sail artisan tenants:migrate`。
+
+## 9. 運行機制 (Docker / Sail)
 由於專案運行在 Docker 容器環境中，請勿直接在宿主機 (Host) 執行 php 或 composer 指令。請使用專案內建的 `sail` 指令：

 *   **啟動環境**： `./vendor/bin/sail up -d`
 *   **執行 PHP 指令**： `./vendor/bin/sail php -v`
 *   **執行 Artisan 指令**： `./vendor/bin/sail artisan route:list`
 *   **執行 Composer**： `./vendor/bin/sail composer install`
-*   **執行 Node/NPM**： `./vendor/bin/sail npm run dev`
+*   **執行 Node/NPM**： `./vendor/bin/sail npm run dev`
+
+## 10. 日期處理 (Date Handling)
+
+- 前端顯示日期時預設使用 `resources/js/lib/date.ts` 提供的 `formatDate` 工具。
+- 避免直接顯示原始 ISO 字串（如 `...Z` 結尾的格式）。
+- **智慧格式切換**：`formatDate` 會自動判斷原始資料，若時間部分為 `00:00:00` 則僅顯示 `YYYY-MM-DD`，否則顯示 `YYYY-MM-DD HH:mm:ss`。
--- a/.agent/skills/activity-logging/SKILL.md
+++ b/.agent/skills/activity-logging/SKILL.md
@@ -1,158 +1,111 @@
 ---
 name: 操作紀錄實作規範
-description: 規範系統內 Activity Log 的實作標準，包含後端資料過濾、快照策略、與前端顯示邏輯。
+description: 規範系統內 Activity Log 的實作標準，包含自動名稱解析、複雜單據合併記錄、與前端顯示優化。
 ---

-# 操作紀錄實作規範
+# 操作紀錄實作規範 (Activity Logging Skill)

-本文件說明如何在開發新功能時，依據系統規範實作 `spatie/laravel-activitylog` 操作紀錄，確保資料儲存效率與前端顯示一致性。
+本文件定義了 Star ERP 系統中操作紀錄的最高實作標準，旨在確保每筆日誌都具有「高度可讀性」與「單一性」。

-## 1. 後端實作標準 (Backend)
+---

-所有 Model 之操作紀錄應遵循「僅儲存變動資料」與「保留關鍵快照」兩大原則。
+## 1. 後端實作核心 (Backend)

-### 1.1 啟用 Activity Log
-
-在 Model 中引用 `LogsActivity` trait 並實作 `getActivitylogOptions` 方法。
-
-```php
-use Spatie\Activitylog\Traits\LogsActivity;
-use Spatie\Activitylog\LogOptions;
-
-class Product extends Model
-{
-    use LogsActivity;
-
-    public function getActivitylogOptions(): LogOptions
-    {
-        return LogOptions::defaults()
-            ->logAll()
-            ->logOnlyDirty() // ✅ 關鍵：只記錄有變動的欄位
-            ->dontSubmitEmptyLogs(); // 若無變動則不記錄
-    }
-}
-```
-
-### 1.2 手動記錄 (Manual Logging)
-
-若需在 Controller 手動記錄（例如需客製化邏輯），**必須**自行實作變動過濾，不可直接儲存所有屬性。
-
-**錯誤範例 (Do NOT do this):**
-```php
-// ❌ 錯誤：這會導致每次更新都記錄所有欄位，即使它們沒變
-activity()
-    ->withProperties(['attributes' => $newAttributes, 'old' => $oldAttributes])
-    ->log('updated');
-```
-
-**正確範例 (Do this):**
-```php
-// ✅ 正確：自行比對差異，只存變動值
-$changedAttributes = [];
-$changedOldAttributes = [];
-
-foreach ($newAttributes as $key => $value) {
-    if ($value != ($oldAttributes[$key] ?? null)) {
-        $changedAttributes[$key] = $value;
-        $changedOldAttributes[$key] = $oldAttributes[$key] ?? null;
-    }
-}
-
-if (!empty($changedAttributes)) {
-    activity()
-        ->withProperties(['attributes' => $changedAttributes, 'old' => $changedOldAttributes])
-        ->log('updated');
-}
-```
-
-### 1.3 快照策略 (Snapshot Strategy)
-
-為確保資料被刪除後仍能辨識操作對象，**必須**在 `properties.snapshot` 中儲存關鍵識別資訊（如名稱、代號、類別名稱）。
-
-**主要方式：使用 `tapActivity` (推薦)**
+### 1.1 全域 ID 轉名稱邏輯 (Global ID Resolution)
+為了讓管理者能直覺看懂日誌，所有的 ID（如 `warehouse_id`, `created_by`）在記錄時都應自動解析為名稱。此邏輯應統一在 Model 的 `tapActivity` 中實作。

+#### 關鍵實作參考：
 ```php
 public function tapActivity(\Spatie\Activitylog\Contracts\Activity $activity, string $eventName)
 {
-    $properties = $activity->properties;
+    // 🚩 核心：轉換為陣列以避免 Indirect modification error
+    $properties = $activity->properties instanceof \Illuminate\Support\Collection 
+        ? $activity->properties->toArray() 
+        : $activity->properties;
+
+    // 1. Snapshot 快照：用於主描述的上下文（例如：單號、名稱）
    $snapshot = $properties['snapshot'] ?? [];
-
-    // 保存關鍵關聯名稱 (避免關聯資料刪除後 ID 失效)
-    $snapshot['category_name'] = $this->category ? $this->category->name : null;
-    $snapshot['po_number'] = $this->code; // 儲存單號
-    
-    // 保存自身名稱 (Context)
-    $snapshot['name'] = $this->name;
-
+    $snapshot['doc_no'] = $this->doc_no;
+    $snapshot['warehouse_name'] = $this->warehouse?->name;
    $properties['snapshot'] = $snapshot;
+
+    // 2. 名稱解析：自動將 attributes 與 old 中的 ID 換成人名/物名
+    $resolver = function (&$data) {
+        if (empty($data) || !is_array($data)) return;
+        
+        // 使用者 ID 轉換
+        foreach (['created_by', 'updated_by', 'completed_by'] as $f) {
+            if (isset($data[$f]) && is_numeric($data[$f])) {
+                $data[$f] = \App\Modules\Core\Models\User::find($data[$f])?->name;
+            }
+        }
+        // 倉庫 ID 轉換
+        if (isset($data['warehouse_id']) && is_numeric($data['warehouse_id'])) {
+            $data['warehouse_id'] = \App\Modules\Inventory\Models\Warehouse::find($data['warehouse_id'])?->name;
+        }
+    };
+
+    if (isset($properties['attributes'])) $resolver($properties['attributes']);
+    if (isset($properties['old'])) $resolver($properties['old']);
+
    $activity->properties = $properties;
 }
 ```

-## 2. 顯示名稱映射 (UI Mapping)
+### 1.2 複雜操作的日誌合併 (Log Consolidation)
+當一個操作同時涉及「多個品項異動」與「單據狀態變更」時，**嚴禁**產生多筆重複日誌。

-### 2.1 對象名稱映射 (Mapping)
-
-需在 `ActivityLogController.php` 中設定 Model 與中文名稱的對應，讓前端列表能顯示中文對象（如「公共事業費」而非 `UtilityFee`）。
-
-**位置**: `app/Http/Controllers/Admin/ActivityLogController.php`
+*   **策略**：在 Service 層手動發送主日誌，並使用 `saveQuietly()` 更新單據屬性以抑止 Trait 的自動日誌。
+*   **格式**：主日誌應包含 `items_diff` (品項差異) 與 `attributes/old` (單據狀態變更)。

 ```php
-protected function getSubjectMap()
-{
-    return [
-        'App\Modules\Inventory\Models\Product' => '商品',
-        'App\Modules\Finance\Models\UtilityFee' => '公共事業費', // ✅ 新增映射
-    ];
-}
+// Service 中的實作方式
+DB::transaction(function () use ($doc, $items) {
+    // 1. 更新品項 (記錄變動細節)
+    $updatedItems = $this->getUpdatedItems($doc, $items); 
+    
+    // 2. 靜默更新單據狀態 (避免 Trait 產生冗餘日誌)
+    $doc->status = 'completed';
+    $doc->saveQuietly(); 
+
+    // 3. 手動觸發單一合併日誌
+    activity()
+        ->performedOn($doc)
+        ->withProperties([
+            'items_diff' => ['updated' => $updatedItems],
+            'attributes' => ['status' => 'completed'],
+            'old' => ['status' => 'counting']
+        ])
+        ->log('updated');
+});
 ```

-### 2.2 欄位名稱中文化 (Field Translation)
+---

-需在前端 `ActivityDetailDialog` 中設定欄位名稱的中文翻譯。
+## 2. 前端介面規範 (Frontend)

-**位置**: `resources/js/Components/ActivityLog/ActivityDetailDialog.tsx`
+### 2.1 標籤命名規範 (Field Labels)
+前端顯示應完全移除「ID」字眼，提供最友善的閱讀體驗。

+**檔案位置**: `resources/js/Components/ActivityLog/ActivityDetailDialog.tsx`
 ```typescript
 const fieldLabels: Record<string, string> = {
-    // ... 既有欄位
-    'transaction_date': '費用日期',
-    'category': '費用類別',
-    'amount': '金額',
+    warehouse_id: '倉庫',   // ❌ 禁用「倉庫 ID」
+    created_by: '建立者',   // ❌ 禁用「建立者 ID」
+    completed_by: '完成者',
+    status: '狀態',
 };
 ```

-## 3. 前端顯示邏輯 (Frontend)
+### 2.2 特殊結構顯示
+*   **品項異動**：前端應能渲染 `items_diff` 結構，以「品項名稱 + 數值變動」的方式呈現表格（已在 `ActivityDetailDialog` 實作）。

-### 3.1 列表描述生成 (Description Generation)
+---

-前端 `LogTable.tsx` 會依據 `properties.snapshot` 中的欄位自動組建描述（例如：「Admin 新增 電話費 公共事業費」）。
+## 3. 開發檢核清單 (Checklist)

-若您的 Model 使用了特殊的識別欄位（例如 `category`），**必須**將其加入 `nameParams` 陣列中。
-
-**位置**: `resources/js/Components/ActivityLog/LogTable.tsx`
-
-```typescript
-const nameParams = [
-    'po_number', 'name', 'code', 
-    'category_name', 
-    'category' // ✅ 確保加入此欄位，前端才能抓到 $snapshot['category']
-];
-```
-
-### 3.2 詳情過濾邏輯
-
-前端 `ActivityDetailDialog` 已內建智慧過濾邏輯：
- **Created**: 顯示初始化欄位。
- **Updated**: **僅顯示有變動的欄位** (由 `isChanged` 判斷)。
- **Deleted**: 顯示刪除前的完整資料。
-
-開發者僅需確保傳入的 `attributes` 與 `old` 資料結構正確，過濾邏輯會自動運作。
-
-## 檢核清單
-
- [ ] **Backend**: Model 是否已設定 `logOnlyDirty` 或手動實作過濾？
- [ ] **Backend**: 是否已透過 `tapActivity` 或手動方式記錄 Snapshot（關鍵名稱）？
- [ ] **Backend**: 是否已在 `ActivityLogController` 加入 Model 中文名稱映射？
- [ ] **Frontend**: 是否已在 `ActivityDetailDialog` 加入欄位中文翻譯？
- [ ] **Frontend**: 若使用特殊識別欄位，是否已加入 `LogTable` 的 `nameParams`？
+- [ ] **Model**: `tapActivity` 是否已處理 Collection 快照？
+- [ ] **Model**: 是否已實作全域 ID 至名稱的自動解析？
+- [ ] **Service**: 是否使用 `saveQuietly()` 避免產生重複的「單據已更新」日誌？
+- [ ] **UI**: `fieldLabels` 是否已移除所有「ID」字樣？
+- [ ] **UI**: 若有品項異動，是否已正確格式化傳入 `items_diff`？
--- a/.agent/skills/ui-consistency/SKILL.md
+++ b/.agent/skills/ui-consistency/SKILL.md
@@ -123,8 +123,8 @@ tooltip
 // ✅ 成功操作
 <Button className="button-filled-success">確認</Button>

-// ✅ 資訊操作
-<Button className="button-filled-info">查看詳情</Button>
+// ✅ 資訊操作（用於系統提示、說明等非業務主流程）
+<Button className="button-filled-info">系統資訊</Button>

 // ✅ 警告操作
 <Button className="button-filled-warning">警告</Button>
@@ -177,6 +177,23 @@ tooltip
 </Can>
 ```

+#### 表格操作列檢視按鈕
+
+```tsx
+<Can permission="resource.view">
+  <Link href={route('resource.show', item.id)}>
+    <Button
+      variant="outline"
+      size="sm"
+      className="button-outlined-primary"
+      title="檢視"
+    >
+      <Eye className="h-4 w-4" />
+    </Button>
+  </Link>
+</Can>
+```
+
 #### 表格操作列編輯按鈕

 ```tsx
@@ -230,6 +247,89 @@ tooltip
 </Can>
 ```

+### 3.4 返回按鈕規範
+
+詳情頁面（如：查看庫存、進貨單詳情）的返回按鈕應統一放置於 **頁面標題上方**，並採用「**圖標 + 文字**」的 Outlined 樣式。
+
+**樣式規格**：
+- **位置**：標題區域上方 (`mb-6`)，獨立於標題列
+- **樣式**：`variant="outline"` + `className="gap-2 button-outlined-primary"`
+- **圖標**：`<ArrowLeft className="h-4 w-4" />`
+- **文字**：清楚說明返回目的地，例如「返回倉庫管理」、「返回列表」
+
+```tsx
+<div className="mb-6">
+  <Link href={route('resource.index')}>
+    <Button
+      variant="outline"
+      className="gap-2 button-outlined-primary"
+    >
+      <ArrowLeft className="h-4 w-4" />
+      返回列表
+    </Button>
+  </Link>
+</div>
+```
+
+---
+
+## 3.5 頁面佈局規範（新增/編輯頁面）
+
+### 標準結構
+
+新增/編輯頁面（如：商品新增、採購單建立）應遵循以下標準結構：
+
+```tsx
+<AuthenticatedLayout breadcrumbs={...}>
+    <Head title="..." />
+    
+    <div className="container mx-auto p-6 max-w-7xl">
+        {/* Header */}
+        <div className="mb-6">
+            {/* 返回按鈕 */}
+            <Link href={route('resource.index')}>
+                <Button
+                    variant="outline"
+                    className="gap-2 button-outlined-primary mb-4"
+                >
+                    <ArrowLeft className="h-4 w-4" />
+                    返回列表
+                </Button>
+            </Link>
+
+            {/* 頁面標題區塊 */}
+            <div className="mb-4">
+                <h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
+                    <Icon className="h-6 w-6 text-primary-main" />
+                    頁面標題
+                </h1>
+                <p className="text-gray-500 mt-1">
+                    頁面說明文字
+                </p>
+            </div>
+        </div>
+
+        {/* 表單或內容區塊 */}
+        <FormComponent ... />
+    </div>
+</AuthenticatedLayout>
+```
+
+### 關鍵規範
+
+1. **外層容器**：使用 `className="container mx-auto p-6 max-w-7xl"` 確保寬度與間距一致
+2. **Header 包裹**：使用 `<div className="mb-6">` 包裹返回按鈕與標題區塊
+3. **返回按鈕**：加上 `mb-4` 與標題區塊分隔
+4. **標題區塊**：使用 `<div className="mb-4">` 包裹 h1 和 p 標籤
+5. **標題樣式**：`text-2xl font-bold text-grey-0 flex items-center gap-2`
+6. **說明文字**：`text-gray-500 mt-1`
+
+### 範例頁面
+
+- ✅ `/resources/js/Pages/PurchaseOrder/Create.tsx`（建立採購單）
+- ✅ `/resources/js/Pages/Product/Create.tsx`（新增商品）
+- ✅ `/resources/js/Pages/Product/Edit.tsx`（編輯商品）
+
 ---

 ## 4. 圖標規範
@@ -426,23 +526,27 @@ const handleSort = (field: string) => {
 import Pagination from "@/Components/shared/Pagination";
 import { SearchableSelect } from "@/Components/ui/searchable-select";

-// 在表格下方
+// 在表格下方（底部工具列）
 <div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
-  <div className="flex items-center gap-2 text-sm text-gray-500">
-    <span>每頁顯示</span>
-    <SearchableSelect
-      value={perPage}
-      onValueChange={handlePerPageChange}
-      options={[
-        { label: "10", value: "10" },
-        { label: "20", value: "20" },
-        { label: "50", value: "50" },
-        { label: "100", value: "100" }
-      ]}
-      className="w-[80px] h-8"
-      showSearch={false}
-    />
-    <span>筆</span>
+  <div className="flex items-center gap-4">
+    <div className="flex items-center gap-2 text-sm text-gray-500">
+      <span>每頁顯示</span>
+      <SearchableSelect
+        value={perPage}
+        onValueChange={handlePerPageChange}
+        options={[
+          { label: "10", value: "10" },
+          { label: "20", value: "20" },
+          { label: "50", value: "50" },
+          { label: "100", value: "100" }
+        ]}
+        className="w-[90px] h-8" // ✅ 統一使用 90px 寬度，避免「100」顯示不全
+        showSearch={false}
+      />
+      <span>筆</span>
+    </div>
+    {/* 總筆數顯示：統一放在每頁顯示右側，使用 text-gray-500 */}
+    <span className="text-sm text-gray-500">共 {data.total} 筆紀錄</span>
  </div>
  <Pagination links={data.links} />
 </div>
@@ -751,7 +855,42 @@ import { SearchableSelect } from "@/Components/ui/searchable-select";

 ```tsx
 import { Calendar } from "lucide-react";
-import { Input } from "@/Components/ui/input";
+
+## 11.7 金額與數字輸入規範
+
+所有涉及金額（單價、成本、總價）的輸入框，應遵循以下規範以確保操作體驗一致：
+
+1.  **HTML 屬性**：
+    *   `type="number"`
+    *   `min="0"` (除非業務邏輯允許負數)
+    *   `step="any"` (設置為 `any` 可允許任意小數，且瀏覽器預設按上下鍵時會增減 **1** 並保留小數部分，例如 37.2 -> 38.2)
+    *   **步進值 (Step)**: 金額與數量輸入框均應設定 `step="any"`，以支援小數點輸入（除非業務邏輯強制整數）。
+    *   `placeholder="0"`
+2.  **樣式類別**：
+    *   預設靠左對齊 (不需要 `text-right`)，亦可依版面需求調整。
+
+### 9.2 對齊方式 (Alignment)
+
+依據欄位所在的情境區分對齊方式：
+
+- **明細列表/表格 (Details/Table)**：金額與數量欄位一律 **靠右對齊 (text-right)**。
+    - 包含：採購單明細、庫存盤點表、調撥單明細等 Table 內的輸入框。
+- **一般表單/新增欄位 (Form/Input)**：金額與數量欄位一律 **靠左對齊 (text-left)**。
+    - 包含：商品資料設定、新增表單中的獨立欄位。亦可依版面需求調整。
+3.  **行為邏輯**：
+    *   輸入時允許輸入小數點。
+    *   鍵盤上下鍵調整時，瀏覽器會預設增減 1 (搭配 `step="any"`)。
+
+```tsx
+<Input
+  type="number"
+  min="0"
+  step="any"
+  value={price}
+  onChange={(e) => setPrice(parseFloat(e.target.value) || 0)}
+  placeholder="0"
+/>
+```

 <div className="relative">
  <Calendar className="absolute left-2.5 top-2.5 h-4 w-4 text-gray-400 pointer-events-none" />
@@ -947,3 +1086,132 @@ import { Pencil } from 'lucide-react';
 5. ✅ **安全性**：統一的權限控制確保資料安全

 當你在開發或審查 Star ERP 客戶端後台的 UI 時，請務必參考此規範！
+
+---
+
+## 15. 批次匯入彈窗規範 (Batch Import Dialog)
+
+為了確保系統中所有批次匯入功能（如：商品、庫存、客戶）的體驗一致，必須遵循以下 UI 結構與樣式。
+
+### 15.1 標題結構
+
+- **樣式**：保持簡潔，僅使用文字標題，不帶額外圖示。
+- **文字**：統一為「匯入XXXX資料」。
+
+```tsx
+<DialogHeader>
+    <DialogTitle>匯入商品資料</DialogTitle>
+    <DialogDescription>
+        請先下載範本，填寫完畢後上傳檔案進行批次處理。
+    </DialogDescription>
+</DialogHeader>
+```
+
+### 15.2 分步引導區塊 (Step-by-Step Guide)
+
+匯入流程必須分為三個清晰的步驟區塊：
+
+#### 步驟 1：取得匯入範本
+- **容器樣式**：`bg-gray-50 rounded-lg border border-gray-100 p-4 space-y-2`
+- **標題圖示**：`<FileSpreadsheet className="w-4 h-4 text-green-600" />`
+- **下載按鈕**：`variant="outline" size="sm" className="w-full sm:w-auto button-outlined-primary"`，並明確標註 `.xlsx`。
+
+#### 步驟 2：設定資訊 (選甜)
+- **容器樣式**：`space-y-2`
+- **標題圖示**：`<Info className="w-4 h-4 text-primary-main" />`
+- **欄位樣式**：使用標準 `Input`，標籤文字使用 `text-sm text-gray-700`。
+- **預設值**：若有備註欄位，應提供合適的預設值（例如：「Excel 匯入」）。
+
+#### 步驟 3：上傳填寫後的檔案
+- **容器樣式**：`space-y-2`
+- **標題圖示**：`<FileUp className="w-4 h-4 text-blue-600" />`
+- **Input 樣式**：`type="file"`，並開啟 `cursor-pointer`。
+
+### 15.3 規則說明面板 (Accordion Rules)
+
+詳細的填寫說明必須收納於 `Accordion` 中，避免干擾主流程：
+
+- **樣式**：標準灰色邊框，不使用特殊背景色 (如琥珀色)。
+- **容器**：`className="w-full border rounded-lg px-2"`
+- **觸發文字**：`text-sm text-gray-500`
+
+```tsx
+<Accordion type="single" collapsible className="w-full border rounded-lg px-2">
+    <AccordionItem value="rules" className="border-b-0">
+        <AccordionTrigger className="text-sm text-gray-500 hover:no-underline py-3">
+            <div className="flex items-center gap-2">
+                <Info className="h-4 w-4" />
+                匯入規則與提示
+            </div>
+        </AccordionTrigger>
+        <AccordionContent>
+            <div className="text-sm text-gray-600 space-y-2 pb-2 pl-6">
+                <ul className="list-disc space-y-1">
+                    <li>使用加粗文字標註關鍵欄位：<span className="font-medium text-gray-700">關鍵字</span></li>
+                    <li>說明文字簡潔明瞭。</li>
+                </ul>
+            </div>
+        </AccordionContent>
+    </AccordionItem>
+</Accordion>
+```
+
+### 15.4 底部操作 (Footer)
+
+- **取消按鈕**：`variant="outline"`，且為 `button-outlined-primary`。
+- **提交按鈕**：`button-filled-primary`，且在處理中時顯示 `Loader2`。
+
+---
+
+## 16. 詳情頁面項目清單規範 (Detail Page Item List Standards)
+
+為了確保詳情頁面（如：採購單詳情、進貨單詳情、銷售匯入詳情）的資訊層級清晰且視覺統一，所有項目清單必須遵循以下規範。
+
+### 16.1 容器結構 (Container Structure)
+
+項目清單應封裝在一個帶有內距的卡片容器中，而不是讓表格直接緊貼外層卡片邊緣。
+
+1. **外層卡片**：`bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden`
+2. **標題區塊**：`p-6 border-b border-gray-100 bg-gray-50/30`
+3. **內容內距**：標題下方的內容區塊應加上 `p-6`。
+4. **表格包裹層**：表格應再包裹一層 `border rounded-lg overflow-hidden`，以確保表格內部的邊角與隔線視覺完整。
+
+```tsx
+<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
+    {/* 標題 */}
+    <div className="p-6 border-b border-gray-100 bg-gray-50/30">
+        <h2 className="text-lg font-bold text-gray-900">項目清單標題</h2>
+    </div>
+    
+    {/* 內容區塊 */}
+    <div className="p-6">
+        <div className="border rounded-lg overflow-hidden">
+            <Table>
+                <TableHeader>
+                    <TableRow className="bg-gray-50 hover:bg-gray-50">
+                        {/* 標頭欄位 */}
+                    </TableRow>
+                </TableHeader>
+                <TableBody>
+                    {/* 表格內容 */}
+                </TableBody>
+            </Table>
+        </div>
+        
+        {/* 若有分頁，直接放在 p-6 容器內，並加 mt-6 分隔 */}
+        <div className="mt-6">
+            <Pagination ... />
+        </div>
+    </div>
+</div>
+```
+
+### 16.2 表格樣式細節 (Table Styling)
+
+1. **標頭背景**：`TableHeader` 的第一個 `TableRow` 應使用 `bg-gray-50 hover:bg-gray-50` 強化視覺區隔。
+2. **文字顏色**：主體文字使用 `text-gray-900`（標題/重要數據）或 `text-gray-500`（輔助/序號）。
+3. **數據對齊**：
+    *   **數量/序號**：文字置中 (`text-center`) 或依據數據類型對齊。
+    *   **金額**：金額欄位必須使用 `text-right` 並視情況加粗 (`font-bold`) 或加上 `text-primary-main` 顏色。
+4. **表格隔線**：確保表格具有清晰但不過於突出的水平隔線，提升長列表的可讀性。
+
--- a/.gemini/antigravity/skills/activity-logging/SKILL.md
+++ b/.gemini/antigravity/skills/activity-logging/SKILL.md
@@ -0,0 +1,158 @@
+---
+name: 操作紀錄實作規範
+description: 規範系統內 Activity Log 的實作標準，包含後端資料過濾、快照策略、與前端顯示邏輯。
+---
+
+# 操作紀錄實作規範
+
+本文件說明如何在開發新功能時，依據系統規範實作 `spatie/laravel-activitylog` 操作紀錄，確保資料儲存效率與前端顯示一致性。
+
+## 1. 後端實作標準 (Backend)
+
+所有 Model 之操作紀錄應遵循「僅儲存變動資料」與「保留關鍵快照」兩大原則。
+
+### 1.1 啟用 Activity Log
+
+在 Model 中引用 `LogsActivity` trait 並實作 `getActivitylogOptions` 方法。
+
+```php
+use Spatie\Activitylog\Traits\LogsActivity;
+use Spatie\Activitylog\LogOptions;
+
+class Product extends Model
+{
+    use LogsActivity;
+
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logAll()
+            ->logOnlyDirty() // ✅ 關鍵：只記錄有變動的欄位
+            ->dontSubmitEmptyLogs(); // 若無變動則不記錄
+    }
+}
+```
+
+### 1.2 手動記錄 (Manual Logging)
+
+若需在 Controller 手動記錄（例如需客製化邏輯），**必須**自行實作變動過濾，不可直接儲存所有屬性。
+
+**錯誤範例 (Do NOT do this):**
+```php
+// ❌ 錯誤：這會導致每次更新都記錄所有欄位，即使它們沒變
+activity()
+    ->withProperties(['attributes' => $newAttributes, 'old' => $oldAttributes])
+    ->log('updated');
+```
+
+**正確範例 (Do this):**
+```php
+// ✅ 正確：自行比對差異，只存變動值
+$changedAttributes = [];
+$changedOldAttributes = [];
+
+foreach ($newAttributes as $key => $value) {
+    if ($value != ($oldAttributes[$key] ?? null)) {
+        $changedAttributes[$key] = $value;
+        $changedOldAttributes[$key] = $oldAttributes[$key] ?? null;
+    }
+}
+
+if (!empty($changedAttributes)) {
+    activity()
+        ->withProperties(['attributes' => $changedAttributes, 'old' => $changedOldAttributes])
+        ->log('updated');
+}
+```
+
+### 1.3 快照策略 (Snapshot Strategy)
+
+為確保資料被刪除後仍能辨識操作對象，**必須**在 `properties.snapshot` 中儲存關鍵識別資訊（如名稱、代號、類別名稱）。
+
+**主要方式：使用 `tapActivity` (推薦)**
+
+```php
+public function tapActivity(\Spatie\Activitylog\Contracts\Activity $activity, string $eventName)
+{
+    $properties = $activity->properties;
+    $snapshot = $properties['snapshot'] ?? [];
+
+    // 保存關鍵關聯名稱 (避免關聯資料刪除後 ID 失效)
+    $snapshot['category_name'] = $this->category ? $this->category->name : null;
+    $snapshot['po_number'] = $this->code; // 儲存單號
+    
+    // 保存自身名稱 (Context)
+    $snapshot['name'] = $this->name;
+
+    $properties['snapshot'] = $snapshot;
+    $activity->properties = $properties;
+}
+```
+
+## 2. 顯示名稱映射 (UI Mapping)
+
+### 2.1 對象名稱映射 (Mapping)
+
+需在 `ActivityLogController.php` 中設定 Model 與中文名稱的對應，讓前端列表能顯示中文對象（如「公共事業費」而非 `UtilityFee`）。
+
+**位置**: `app/Http/Controllers/Admin/ActivityLogController.php`
+
+```php
+protected function getSubjectMap()
+{
+    return [
+        'App\Modules\Inventory\Models\Product' => '商品',
+        'App\Modules\Finance\Models\UtilityFee' => '公共事業費', // ✅ 新增映射
+    ];
+}
+```
+
+### 2.2 欄位名稱中文化 (Field Translation)
+
+需在前端 `ActivityDetailDialog` 中設定欄位名稱的中文翻譯。
+
+**位置**: `resources/js/Components/ActivityLog/ActivityDetailDialog.tsx`
+
+```typescript
+const fieldLabels: Record<string, string> = {
+    // ... 既有欄位
+    'transaction_date': '費用日期',
+    'category': '費用類別',
+    'amount': '金額',
+};
+```
+
+## 3. 前端顯示邏輯 (Frontend)
+
+### 3.1 列表描述生成 (Description Generation)
+
+前端 `LogTable.tsx` 會依據 `properties.snapshot` 中的欄位自動組建描述（例如：「Admin 新增 電話費 公共事業費」）。
+
+若您的 Model 使用了特殊的識別欄位（例如 `category`），**必須**將其加入 `nameParams` 陣列中。
+
+**位置**: `resources/js/Components/ActivityLog/LogTable.tsx`
+
+```typescript
+const nameParams = [
+    'po_number', 'name', 'code', 
+    'category_name', 
+    'category' // ✅ 確保加入此欄位，前端才能抓到 $snapshot['category']
+];
+```
+
+### 3.2 詳情過濾邏輯
+
+前端 `ActivityDetailDialog` 已內建智慧過濾邏輯：
+- **Created**: 顯示初始化欄位。
+- **Updated**: **僅顯示有變動的欄位** (由 `isChanged` 判斷)。
+- **Deleted**: 顯示刪除前的完整資料。
+
+開發者僅需確保傳入的 `attributes` 與 `old` 資料結構正確，過濾邏輯會自動運作。
+
+## 檢核清單
+
+- [ ] **Backend**: Model 是否已設定 `logOnlyDirty` 或手動實作過濾？
+- [ ] **Backend**: 是否已透過 `tapActivity` 或手動方式記錄 Snapshot（關鍵名稱）？
+- [ ] **Backend**: 是否已在 `ActivityLogController` 加入 Model 中文名稱映射？
+- [ ] **Frontend**: 是否已在 `ActivityDetailDialog` 加入欄位中文翻譯？
+- [ ] **Frontend**: 若使用特殊識別欄位，是否已加入 `LogTable` 的 `nameParams`？
--- a/.gemini/antigravity/skills/permission-management/SKILL.md
+++ b/.gemini/antigravity/skills/permission-management/SKILL.md
@@ -0,0 +1,140 @@
+---
+name: 權限管理與實作規範
+description: 為新功能實作權限控制的完整流程規範，包含後端 Seeder 設定、Middleware 路由保護與前端權限判斷。
+---
+
+# 權限管理與實作規範
+
+本文件說明如何在新增功能時，一併實作完整的權限控制機制。專案採用 `spatie/laravel-permission` 套件進行權限管理。
+
+## 1. 定義權限 (Backend)
+
+所有權限皆定義於 `database/seeders/PermissionSeeder.php`。
+
+### 步驟：
+
+1.  開啟 `database/seeders/PermissionSeeder.php`。
+2.  在 `$permissions` 陣列中新增功能對應的權限字串。
+    *   **命名慣例**：`{resource}.{action}` (例如：`system.view_logs`, `products.create`)
+    *   常用動作：`view`, `create`, `edit`, `delete`, `publish`, `export`
+3.  在下方「角色分配」區段，將新權限分配給適合的角色。
+    *   `super-admin`：通常擁有所有權限（程式碼中 `Permission::all()` 自動涵蓋，無需手動新增）。
+    *   `admin`：通常擁有大部分權限。
+    *   其他角色 (`warehouse-manager`, `purchaser`, `viewer`)：依業務邏輯分配。
+
+### 範例：
+
+```php
+// 1. 新增權限字串
+$permissions = [
+    // ... 現有權限
+    'system.view_logs', // 新增：檢視系統日誌
+];
+
+// ...
+
+// 2. 分配給角色
+$admin->givePermissionTo([
+    // ... 現有權限
+    'system.view_logs',
+]);
+```
+
+## 2. 套用資料庫變更
+
+修改 Seeder 後，必須重新執行 Seeder 以將權限寫入資料庫。
+
+```bash
+# 對於所有租戶執行 Seeder (開發環境)
+php artisan tenants:seed --class=PermissionSeeder
+```
+
+## 3. 路由保護 (Backend Middleware)
+
+在 `routes/web.php` 中，使用 `permission:{name}` middleware 保護路由。
+
+### 範例：
+
+```php
+// 單一權限保護
+Route::get('/logs', [LogController::class, 'index'])
+    ->middleware('permission:system.view_logs')
+    ->name('logs.index');
+
+// 路由群組保護
+Route::middleware('permission:products.view')->group(function () {
+    // ...
+});
+
+// 多重權限 (OR 邏輯：有其一即可)
+Route::middleware('permission:products.create|products.edit')->group(function () {
+    // ...
+});
+```
+
+## 4. 前端權限判斷 (React Component)
+
+使用自訂 Hook `usePermission` 來控制 UI 元素的顯示（例如：隱藏沒有權限的按鈕）。
+
+### 引入 Hook：
+
+```tsx
+import { usePermission } from "@/hooks/usePermission";
+```
+
+### 使用方式：
+
+```tsx
+export default function ProductIndex() {
+    const { can } = usePermission();
+
+    return (
+        <div>
+            <h1>商品列表</h1>
+            
+            {/* 只有擁有 create 權限才顯示按鈕 */}
+            {can('products.create') && (
+                <Button>新增商品</Button>
+            )}
+
+            {/* 組合判斷 */}
+            {can('products.edit') && <EditButton />}
+        </div>
+    );
+}
+```
+
+### 權限 Hook 介面說明：
+
+- `can(permission: string)`: 檢查當前使用者是否擁有指定權限。
+- `canAny(permissions: string[])`: 檢查當前使用者是否擁有陣列中**任一**權限。
+- `hasRole(role: string)`: 檢查當前使用者是否擁有指定角色。
+
+## 5. 配置權限群組名稱 (Backend UI Config)
+
+為了讓新權限在「角色與權限」管理介面中顯示正確的中文分組標題，需修改 Controller 設定。
+
+### 步驟：
+
+1.  開啟 `app/Http/Controllers/Admin/RoleController.php`。
+2.  找到 `getGroupedPermissions` 方法。
+3.  在 `$groupDefinitions` 陣列中，新增 `{resource}` 對應的中文名稱。
+
+### 範例：
+
+```php
+$groupDefinitions = [
+    'products' => '商品資料管理',
+    // ...
+    'utility_fees' => '公共事業費管理', // 新增此行
+];
+```
+
+## 檢核清單
+
+- [ ] `PermissionSeeder.php` 已新增權限字串。
+- [ ] `PermissionSeeder.php` 已將新權限分配給對應角色。
+- [ ] 已執行 `php artisan tenants:seed --class=PermissionSeeder` 更新資料庫。
+- [ ] `RoleController.php` 已新增權限群組的中文名稱映射。
+- [ ] 後端路由 (`routes/web.php`) 已加上 middleware 保護。
+- [ ] 前端頁面/按鈕已使用 `usePermission` 進行顯示控制。
--- a/.gemini/antigravity/skills/ui-consistency/SKILL.md
+++ b/.gemini/antigravity/skills/ui-consistency/SKILL.md
@@ -0,0 +1,990 @@
+---
+name: 客戶端後台 UI 統一規範
+description: 確保 Star ERP 客戶端（租戶端）後台所有頁面的 UI 元件保持統一的樣式與行為
+---
+
+# 客戶端後台 UI 統一規範
+
+## 概述
+
+本技能提供 Star ERP 系統**客戶端（租戶端）後台**的 UI 統一性規範，確保所有頁面使用一致的元件、樣式類別、圖標和佈局模式。
+
+> **適用範圍**：本規範適用於租戶端後台（使用 `AuthenticatedLayout` 的頁面），**不適用於**中央管理後台（`LandlordLayout`）。
+
+## 核心原則
+
+1. **使用統一的 UI 組件庫**：優先使用 `@/Components/ui/` 中的 47 個元件
+2. **遵循既定的樣式類別**：使用 `app.css` 中定義的自定義按鈕類別
+3. **統一的圖標系統**：全面使用 `lucide-react` 圖標
+4. **一致的佈局模式**：表格、分頁、操作按鈕等保持相同結構
+5. **權限控制**：所有操作按鈕必須使用 `<Can>` 元件包裹
+
+---
+
+## 1. 專案結構
+
+### 1.1 關鍵目錄
+
+```
+resources/
+├── css/
+│   └── app.css              # 全域樣式與設計 Token
+├── js/
+│   ├── Components/
+│   │   ├── ui/              # 47 個基礎 UI 元件 (shadcn/ui)
+│   │   ├── shared/          # 共用業務元件 (Pagination, BreadcrumbNav 等)
+│   │   └── Permission/      # 權限控制元件 (Can, HasRole, CanAll)
+│   ├── Layouts/
+│   │   ├── AuthenticatedLayout.tsx  # 客戶端後台佈局 ⬅️ 本規範適用
+│   │   └── LandlordLayout.tsx       # 中央管理後台佈局
+│   └── Pages/               # 頁面元件
+```
+
+### 1.2 可用 UI 元件清單
+
+```
+accordion, alert, alert-dialog, avatar, badge, breadcrumb, button, 
+calendar, card, carousel, chart, checkbox, collapsible, command, 
+context-menu, dialog, drawer, dropdown-menu, form, hover-card, 
+input, input-otp, label, menubar, navigation-menu, pagination, 
+popover, progress, radio-group, resizable, scroll-area, 
+searchable-select, select, separator, sheet, sidebar, skeleton, 
+slider, sonner, switch, table, tabs, textarea, toggle, toggle-group, 
+tooltip
+```
+
+---
+
+## 2. 色彩系統
+
+### 2.1 主題色 (Primary) - **動態租戶品牌色**
+
+> **注意**：主題色會根據租戶設定（Branding）動態改變，**嚴禁**在程式碼中 Hardcode 色碼（如 `#01ab83`）。
+> 請務必使用 Tailwind Utility Class 或 CSS 變數。
+
+| Tailwind Class | CSS Variable | 說明 |
+|----------------|--------------|------|
+| `*-primary-main` | `--primary-main` | **主色**：與租戶設定一致（預設綠色），用於主要按鈕、連結、強調文字 |
+| `*-primary-dark` | `--primary-dark` | **深色**：系統自動計算，用於 Hover 狀態 |
+| `*-primary-light` | `--primary-light` | **淺色**：系統自動計算，用於次要強調 |
+| `*-primary-lightest` | `--primary-lightest` | **最淺色**：系統自動計算，用於背景底色、Active 狀態 |
+
+**運作機制**：
+`AuthenticatedLayout` 會根據後端回傳的 `branding` 資料，自動注入 CSS 變數覆寫預設值。
+
+```tsx
+// ✅ 正確：使用 Tailwind Class
+<div className="text-primary-main">...</div>
+
+// ✅ 正確：使用 CSS 變數 (自定義樣式時)
+<div style={{ borderColor: 'var(--primary-main)' }}>...</div>
+
+// ❌ 錯誤：寫死色碼 (會導致租戶無法換色)
+<div className="text-[#01ab83]">...</div>
+```
+
+### 2.2 灰階 (Grey Scale)
+
+```css
+--grey-0: #1a1a1a;  /* 深黑 - 標題文字 */
+--grey-1: #4a4a4a;  /* 深灰 - 主要內文 */
+--grey-2: #6b6b6b;  /* 中灰 - 次要內文、Placeholder */
+--grey-3: #9e9e9e;  /* 淺灰 - 禁用文字、輔助說明 */
+--grey-4: #e0e0e0;  /* 極淺灰 - 邊框、分隔線 */
+--grey-5: #fff;     /* 白色 - 背景、按鈕文字 */
+```
+
+### 2.3 狀態色 (State Colors)
+
+```css
+--other-success: #01ab83;  /* 成功 - 同主題色 */
+--other-error: #dc2626;    /* 錯誤 - 刪除、警示 */
+--other-warning: #f59e0b;  /* 警告 - 提醒、注意 */
+--other-info: #3b82f6;     /* 資訊 - 說明、提示 */
+```
+
+---
+
+## 3. 按鈕規範
+
+### 3.1 按鈕樣式類別
+
+專案在 `resources/css/app.css` 中定義了統一的按鈕樣式，**必須**使用這些類別：
+
+#### Filled 按鈕（實心按鈕）— 用於主要操作
+
+```tsx
+// ✅ 主要操作按鈕（綠色主題色）- 新增、儲存、確認
+<Button className="button-filled-primary">
+  <Plus className="h-4 w-4 mr-2" />
+  新增項目
+</Button>
+
+// ✅ 成功操作
+<Button className="button-filled-success">確認</Button>
+
+// ✅ 資訊操作（用於系統提示、說明等非業務主流程）
+<Button className="button-filled-info">系統資訊</Button>
+
+// ✅ 警告操作
+<Button className="button-filled-warning">警告</Button>
+
+// ✅ 錯誤/刪除操作（AlertDialog 內確認按鈕）
+<Button className="button-filled-error">刪除</Button>
+```
+
+#### Outlined 按鈕（邊框按鈕）— 用於次要操作
+
+```tsx
+// ✅ 編輯按鈕（表格操作列）
+<Button variant="outline" size="sm" className="button-outlined-primary">
+  <Pencil className="h-4 w-4" />
+</Button>
+
+// ✅ 刪除按鈕（表格操作列）
+<Button variant="outline" size="sm" className="button-outlined-error">
+  <Trash2 className="h-4 w-4" />
+</Button>
+```
+
+#### Text 按鈕（文字按鈕）
+
+```tsx
+<Button className="button-text-primary">查看更多</Button>
+```
+
+### 3.2 按鈕大小
+
+| Size | 高度 | 使用情境 |
+|------|------|----------|
+| `size="sm"` | h-8 | 表格操作列、緊湊佈局 |
+| `size="default"` | h-9 | 一般操作、表單提交 |
+| `size="lg"` | h-10 | 主要 CTA、頁面主操作 |
+| `size="icon"` | 9×9 | 純圖標按鈕 |
+
+### 3.3 常見操作按鈕模式
+
+#### 頁面頂部新增按鈕
+
+```tsx
+<Can permission="resource.create">
+  <Link href={route('resource.create')}>
+    <Button className="button-filled-primary">
+      <Plus className="h-4 w-4 mr-2" />
+      新增XXX
+    </Button>
+  </Link>
+</Can>
+```
+
+#### 表格操作列檢視按鈕
+
+```tsx
+<Can permission="resource.view">
+  <Link href={route('resource.show', item.id)}>
+    <Button
+      variant="outline"
+      size="sm"
+      className="button-outlined-primary"
+      title="檢視"
+    >
+      <Eye className="h-4 w-4" />
+    </Button>
+  </Link>
+</Can>
+```
+
+#### 表格操作列編輯按鈕
+
+```tsx
+<Can permission="resource.edit">
+  <Link href={route('resource.edit', item.id)}>
+    <Button
+      variant="outline"
+      size="sm"
+      className="button-outlined-primary"
+      title="編輯"
+    >
+      <Pencil className="h-4 w-4" />
+    </Button>
+  </Link>
+</Can>
+```
+
+#### 表格操作列刪除按鈕（帶確認對話框）
+
+```tsx
+<Can permission="resource.delete">
+  <AlertDialog>
+    <AlertDialogTrigger asChild>
+      <Button 
+        variant="outline" 
+        size="sm" 
+        className="button-outlined-error"
+        title="刪除"
+      >
+        <Trash2 className="h-4 w-4" />
+      </Button>
+    </AlertDialogTrigger>
+    <AlertDialogContent>
+      <AlertDialogHeader>
+        <AlertDialogTitle>確認刪除</AlertDialogTitle>
+        <AlertDialogDescription>
+          確定要刪除「{item.name}」嗎？此操作無法復原。
+        </AlertDialogDescription>
+      </AlertDialogHeader>
+      <AlertDialogFooter>
+        <AlertDialogCancel>取消</AlertDialogCancel>
+        <AlertDialogAction
+          onClick={() => handleDelete(item.id)}
+          className="bg-red-600 hover:bg-red-700"
+        >
+          刪除
+        </AlertDialogAction>
+      </AlertDialogFooter>
+    </AlertDialogContent>
+  </AlertDialog>
+</Can>
+```
+
+### 3.4 返回按鈕規範
+
+詳情頁面（如：查看庫存、進貨單詳情）的返回按鈕應統一放置於 **頁面標題上方**，並採用「**圖標 + 文字**」的 Outlined 樣式。
+
+**樣式規格**：
+- **位置**：標題區域上方 (`mb-6`)，獨立於標題列
+- **樣式**：`variant="outline"` + `className="gap-2 button-outlined-primary"`
+- **圖標**：`<ArrowLeft className="h-4 w-4" />`
+- **文字**：清楚說明返回目的地，例如「返回倉庫管理」、「返回列表」
+
+```tsx
+<div className="mb-6">
+  <Link href={route('resource.index')}>
+    <Button
+      variant="outline"
+      className="gap-2 button-outlined-primary"
+    >
+      <ArrowLeft className="h-4 w-4" />
+      返回列表
+    </Button>
+  </Link>
+</div>
+```
+
+---
+
+## 4. 圖標規範
+
+### 4.1 統一使用 lucide-react
+
+**統一使用 `lucide-react`**，禁止使用其他圖標庫（如 FontAwesome、Material Icons、react-icons 等）。
+
+### 4.2 圖標尺寸標準
+
+| 尺寸 | 類別 | 使用情境 |
+|------|------|----------|
+| 小型 | `h-3 w-3` | Badge 內、小文字旁 |
+| 標準 | `h-4 w-4` | 按鈕內、表格操作 |
+| 標題 | `h-5 w-5` | 側邊欄選單 |
+| 大型 | `h-6 w-6` | 頁面標題 |
+
+### 4.3 常用操作圖標映射
+
+| 操作 | 圖標組件 | 使用情境 |
+|------|----------|----------|
+| 新增 | `<Plus />` | 新增按鈕 |
+| 編輯 | `<Pencil />` | 編輯按鈕 |
+| 刪除 | `<Trash2 />` | 刪除按鈕 |
+| 查看 | `<Eye />` | 查看詳情 |
+| 搜尋 | `<Search />` | 搜尋欄位 |
+| 篩選 | `<Filter />` | 篩選功能 |
+| 下載 | `<Download />` | 下載/匯出 |
+| 上傳 | `<Upload />` | 上傳/匯入 |
+| 設定 | `<Settings />` | 設定功能 |
+| 複製 | `<Copy />` | 複製內容 |
+| 郵件 | `<Mail />` | Email 顯示 |
+| 使用者 | `<Users />`, `<User />` | 使用者管理 |
+| 權限 | `<Shield />` | 角色/權限 |
+| 排序 | `<ArrowUpDown />`, `<ArrowUp />`, `<ArrowDown />` | 表格排序 |
+| 儀表板 | `<LayoutDashboard />` | 首頁/總覽 |
+| 商品 | `<Package />` | 商品管理 |
+| 倉庫 | `<Warehouse />` | 倉庫管理 |
+| 廠商 | `<Truck />`, `<Contact2 />` | 廠商管理 |
+| 採購 | `<ShoppingCart />` | 採購管理 |
+
+### 4.4 圖標使用範例
+
+```tsx
+import { Plus, Pencil, Trash2, Users } from 'lucide-react';
+
+// 頁面標題
+<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
+  <Users className="h-6 w-6 text-[#01ab83]" />
+  使用者管理
+</h1>
+
+// 按鈕內圖標（圖標在左，帶文字）
+<Button className="button-filled-primary">
+  <Plus className="h-4 w-4 mr-2" />
+  新增使用者
+</Button>
+
+// 純圖標按鈕（表格操作列）
+<Button variant="outline" size="sm" className="button-outlined-primary">
+  <Pencil className="h-4 w-4" />
+</Button>
+```
+
+---
+
+## 5. 表格規範
+
+### 5.1 表格容器
+
+```tsx
+<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
+  <Table>
+    {/* 表格內容 */}
+  </Table>
+</div>
+```
+
+### 5.2 表格標題列
+
+```tsx
+<TableHeader className="bg-gray-50">
+  <TableRow>
+    <TableHead className="w-[50px] text-center">#</TableHead>
+    <TableHead>名稱</TableHead>
+    <TableHead className="text-center">操作</TableHead>
+  </TableRow>
+</TableHeader>
+```
+
+**關鍵要點**：
+- 使用 `bg-gray-50` 背景色
+- 序號欄位固定寬度 `w-[50px]` 並置中
+- 操作欄位置中顯示
+
+### 5.3 表格主體
+
+```tsx
+<TableBody>
+  {items.length === 0 ? (
+    <TableRow>
+      <TableCell colSpan={5} className="text-center py-8 text-gray-500">
+        無符合條件的資料
+      </TableCell>
+    </TableRow>
+  ) : (
+    items.map((item, index) => (
+      <TableRow key={item.id}>
+        <TableCell className="text-gray-500 font-medium text-center">
+          {startIndex + index}
+        </TableCell>
+        {/* 其他欄位 */}
+        <TableCell className="text-center">
+          <div className="flex items-center justify-center gap-2">
+            {/* 操作按鈕 */}
+          </div>
+        </TableCell>
+      </TableRow>
+    ))
+  )}
+</TableBody>
+```
+
+**關鍵要點**：
+- 空狀態訊息使用置中、灰色文字
+- 序號欄使用 `text-gray-500 font-medium text-center`
+- 操作欄使用 `flex items-center justify-center gap-2` 排列按鈕
+
+### 5.4 欄位排序規範
+
+當表格需要支援排序時，請遵循以下模式：
+
+1.  **圖標邏輯**：
+    *   未排序：`ArrowUpDown` (class: `text-muted-foreground`)
+    *   升冪 (asc)：`ArrowUp` (class: `text-primary`)
+    *   降冪 (desc)：`ArrowDown` (class: `text-primary`)
+2.  **結構**：在 `TableHead` 內使用 `button` 元素。
+3.  **後端配合**：後端 Controller **必須** 處理 `sort_by` 與 `sort_order` 參數。
+
+```tsx
+// 1. 定義 Helper Component (在元件內部)
+const SortIcon = ({ field }: { field: string }) => {
+    if (filters.sort_by !== field) {
+        return <ArrowUpDown className="h-4 w-4 text-muted-foreground ml-1" />;
+    }
+    if (filters.sort_order === "asc") {
+        return <ArrowUp className="h-4 w-4 text-primary ml-1" />;
+    }
+    return <ArrowDown className="h-4 w-4 text-primary ml-1" />;
+};
+
+// 2. 表格標題應用
+<TableHead>
+    <button 
+        onClick={() => handleSort('created_at')} 
+        className="flex items-center hover:text-gray-900"
+    >
+        建立時間 <SortIcon field="created_at" />
+    </button>
+</TableHead>
+
+// 3. 排序處理函式 (三態切換：未排序 -> 升冪 -> 降冪 -> 未排序)
+const handleSort = (field: string) => {
+    let newSortBy: string | undefined = field;
+    let newSortOrder: 'asc' | 'desc' | undefined = 'asc';
+
+    if (filters.sort_by === field) {
+        if (filters.sort_order === 'asc') {
+            newSortOrder = 'desc';
+        } else {
+            // desc -> reset (回到預設排序)
+            newSortBy = undefined;
+            newSortOrder = undefined;
+        }
+    }
+
+    router.get(
+        route(route().current()!),
+        { ...filters, sort_by: newSortBy, sort_order: newSortOrder },
+        { preserveState: true, replace: true }
+    );
+};
+```
+
+---
+
+## 6. 分頁規範
+
+### 6.1 統一分頁元件
+
+使用 `@/Components/shared/Pagination` 元件：
+
+```tsx
+import Pagination from "@/Components/shared/Pagination";
+import { SearchableSelect } from "@/Components/ui/searchable-select";
+
+// 在表格下方
+<div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
+  <div className="flex items-center gap-2 text-sm text-gray-500">
+    <span>每頁顯示</span>
+    <SearchableSelect
+      value={perPage}
+      onValueChange={handlePerPageChange}
+      options={[
+        { label: "10", value: "10" },
+        { label: "20", value: "20" },
+        { label: "50", value: "50" },
+        { label: "100", value: "100" }
+      ]}
+      className="w-[80px] h-8"
+      showSearch={false}
+    />
+    <span>筆</span>
+  </div>
+  <Pagination links={data.links} />
+</div>
+```
+
+### 6.2 每頁筆數狀態管理
+
+```tsx
+const [perPage, setPerPage] = useState<string>(filters.per_page || "10");
+
+const handlePerPageChange = (value: string) => {
+  setPerPage(value);
+  router.get(
+    route('resource.index'),
+    { per_page: value },
+    { preserveState: false, replace: true, preserveScroll: true }
+  );
+};
+```
+
+---
+
+## 7. Badge 與狀態顯示
+
+### 7.1 基本 Badge
+
+```tsx
+import { Badge } from "@/Components/ui/badge";
+
+// Outline 樣式（最常用）
+<Badge variant="outline">{item.category?.name || '-'}</Badge>
+
+// 預設樣式（主題色背景）
+<Badge variant="default">啟用中</Badge>
+
+// 錯誤樣式
+<Badge variant="destructive">停用</Badge>
+```
+
+### 7.2 角色顯示（特殊樣式）
+
+```tsx
+<div className="flex flex-wrap gap-2">
+  {user.roles.map(role => (
+    <div
+      key={role.id}
+      className={cn(
+        "inline-flex items-center px-2.5 py-1 rounded-md border",
+        role.name === 'super-admin'
+          ? "bg-purple-50 border-purple-200"
+          : "bg-gray-50 border-gray-200"
+      )}
+    >
+      <div className="flex items-center gap-1.5">
+        {role.name === 'super-admin' && <Shield className="h-3.5 w-3.5 text-purple-600" />}
+        <span className={cn(
+          "text-sm font-medium",
+          role.name === 'super-admin' ? "text-purple-700" : "text-gray-900"
+        )}>
+          {role.display_name}
+        </span>
+      </div>
+    </div>
+  ))}
+</div>
+```
+
+---
+
+## 8. 頁面佈局規範
+
+### 8.1 頁面結構
+
+```tsx
+export default function ResourceIndex() {
+  return (
+    <AuthenticatedLayout
+      breadcrumbs={[
+        { label: '分類名稱', href: '#' },
+        { label: '頁面名稱', href: route('resource.index'), isPage: true },
+      ]}
+    >
+      <Head title="頁面標題" />
+      
+      <div className="container mx-auto p-6 max-w-7xl">
+        {/* 頁面頭部 */}
+        {/* 主要內容 */}
+        {/* 分頁元件 */}
+      </div>
+    </AuthenticatedLayout>
+  );
+}
+```
+
+### 8.2 標準頁面頭部
+
+```tsx
+<div className="flex items-center justify-between mb-6">
+  <div>
+    <h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
+      <IconComponent className="h-6 w-6 text-[#01ab83]" />
+      頁面標題
+    </h1>
+    <p className="text-gray-500 mt-1">
+      頁面說明文字
+    </p>
+  </div>
+  <Can permission="resource.create">
+    <Link href={route('resource.create')}>
+      <Button className="button-filled-primary">
+        <Plus className="h-4 w-4 mr-2" />
+        新增項目
+      </Button>
+    </Link>
+  </Can>
+</div>
+```
+
+---
+
+## 9. 權限控制規範
+
+### 9.1 使用 Can 元件
+
+**所有**涉及權限的 UI 元素都必須使用 `<Can>` 元件包裹：
+
+```tsx
+import { Can } from "@/Components/Permission/Can";
+
+<Can permission="resource.create">
+  {/* 新增按鈕 */}
+</Can>
+
+<Can permission="resource.edit">
+  {/* 編輯按鈕 */}
+</Can>
+
+<Can permission="resource.delete">
+  {/* 刪除按鈕 */}
+</Can>
+```
+
+### 9.2 權限命名規範
+
+遵循 `resource.action` 格式：
+
+- `resource.view`：查看列表/詳情
+- `resource.create`：新增
+- `resource.edit`：編輯
+- `resource.delete`：刪除
+
+### 9.3 多權限判斷
+
+```tsx
+// 滿足任一權限即可
+<Can permission={['products.edit', 'products.delete']}>
+  <div>管理操作</div>
+</Can>
+
+// 必須滿足所有權限
+import { CanAll } from "@/Components/Permission/Can";
+
+<CanAll permissions={['products.edit', 'products.delete']}>
+  <button>完整管理</button>
+</CanAll>
+```
+
+---
+
+## 10. 通知訊息規範
+
+### 10.1 使用 Toast 通知
+
+使用 `sonner` 的 `toast` 進行通知：
+
+```tsx
+import { toast } from 'sonner';
+
+// 成功訊息
+toast.success('操作成功');
+
+// 錯誤訊息
+toast.error('操作失敗');
+
+// 資訊訊息
+toast.info('提示訊息');
+
+// 警告訊息
+toast.warning('警告訊息');
+```
+
+### 10.2 常見操作的 Toast 訊息
+
+```tsx
+// 新增成功
+router.post(route('resource.store'), data, {
+  onSuccess: () => toast.success('新增成功'),
+  onError: () => toast.error('新增失敗，請檢查輸入內容'),
+});
+
+// 更新成功
+router.put(route('resource.update', id), data, {
+  onSuccess: () => toast.success('更新成功'),
+  onError: () => toast.error('更新失敗'),
+});
+
+// 刪除成功
+router.delete(route('resource.destroy', id), {
+  onSuccess: () => toast.success('已刪除'),
+  onError: () => toast.error('刪除失敗，請檢查權限'),
+});
+```
+
+---
+
+## 11. 表單規範
+
+### 11.1 表單容器
+
+```tsx
+<div className="bg-white rounded-xl border border-gray-200 p-6 space-y-6">
+  <form onSubmit={handleSubmit}>
+    {/* 表單欄位 */}
+  </form>
+</div>
+```
+
+### 11.2 表單欄位
+
+```tsx
+<div>
+  <label className="block text-sm font-medium text-slate-700 mb-2">
+    欄位名稱 <span className="text-red-500">*</span>
+  </label>
+  <input
+    type="text"
+    value={data.field}
+    onChange={(e) => setData("field", e.target.value)}
+    placeholder="請輸入..."
+    className="w-full px-4 py-2 border border-slate-300 rounded-lg focus:ring-2 focus:ring-primary-main focus:border-primary-main"
+  />
+  {errors.field && <p className="mt-1 text-sm text-red-500">{errors.field}</p>}
+</div>
+```
+
+### 11.3 下拉選單
+
+使用 `SearchableSelect` 元件：
+
+```tsx
+import { SearchableSelect } from "@/Components/ui/searchable-select";
+
+<SearchableSelect
+  value={data.category_id}
+  onValueChange={(value) => setData("category_id", value)}
+  options={categories.map(cat => ({ label: cat.name, value: String(cat.id) }))}
+  placeholder="請選擇分類"
+  searchThreshold={10}  // 超過 10 個選項才顯示搜尋框
+/>
+```
+
+---
+
+## 11.4 對話框 (Dialog) 滾動與佈局
+
+當對話框內容可能超出螢幕高度時（如長表單或詳細資料），**請勿使用 `ScrollArea`**，應直接在 `DialogContent` 使用原生的 `overflow-y-auto`。
+
+**原因**：`ScrollArea` 在 Flex 佈局計算高度時容易失效或導致雙重滾動條。以及與原生捲動行為不一致。
+
+```tsx
+// ❌ 錯誤：使用 ScrollArea 或固定高度計算
+<DialogContent className="max-w-3xl">
+  <ScrollArea className="h-[500px]">
+    {/* 內容 */}
+  </ScrollArea>
+</DialogContent>
+
+// ✅ 正確：直接使用 overflow-y-auto 與 max-h
+<DialogContent className="max-w-3xl max-h-[90vh] overflow-y-auto">
+  <DialogHeader>...</DialogHeader>
+  <form className="p-6">
+    {/* 內容會自動滾動 */}
+  </form>
+  <DialogFooter>...</DialogFooter>
+</DialogContent>
+```
+
+---
+
+## 11.5 輸入框尺寸 (Input Sizes)
+
+為確保介面整齊與統一，所有表單輸入元件標準高度應為 **`h-9`** (36px)，與標準按鈕尺寸對齊。
+
+- **Input**: 預設即為 `h-9` (由 `py-1` 與 `text-sm` 組合而成)
+- **Select / SearchableSelect**: 必須確保 Trigger 按鈕高度為 `h-9`
+- **禁止使用**: 除非有特殊設計需求，否則避免使用 `h-10` (40px) 或其他非標準高度。
+
+## 11.6 日期輸入框樣式 (Date Input Style)
+
+日期輸入框應採用「**左側裝飾圖示 + 右側原生操作**」的配置，以保持視覺一致性並保留瀏覽器原生便利性。
+
+**樣式規格**：
+1.  **容器**: 使用 `relative` 定位。
+2.  **圖標**: 使用 `Calendar` 圖標，放置於絕對位置 `absolute left-2.5 top-2.5`，顏色 `text-gray-400`，並設定 `pointer-events-none` 避免干擾點擊。
+3.  **輸入框**: 設定 `pl-9` (左內距) 以避開圖示，並使用原生 `type="date"` 或 `type="datetime-local"`。
+
+```tsx
+import { Calendar } from "lucide-react";
+import { Input } from "@/Components/ui/input";
+
+<div className="relative">
+  <Calendar className="absolute left-2.5 top-2.5 h-4 w-4 text-gray-400 pointer-events-none" />
+  <Input
+    type="date"
+    className="pl-9 block w-full"
+    value={date}
+    onChange={(e) => setDate(e.target.value)}
+  />
+</div>
+```
+
+## 11.7 搜尋選單樣式 (SearchableSelect Style)
+
+`SearchableSelect` 元件在表單或篩選列中使用時，高度必須設定為 `h-9` 以與輸入框對齊。
+
+```tsx
+<SearchableSelect
+  className="h-9" // 確保高度一致
+  // ...other props
+/>
+```
+
+## 11.8 篩選列規範 (Filter Bar Norms)
+
+列表頁面的篩選區域（Filter Bar）應遵循以下規範以節省空間並保持層級清晰：
+
+1.  **標籤文字 (Labels)**: 使用 **`text-xs`** (`12px`) 大小，顏色建議使用 `text-gray-500` 或 `text-grey-2`。這與一般表單 (`text-sm`) 不同，目的是降低篩選列的視覺權重。
+2.  **輸入元件高度**: 統一使用 **`h-9`** (`36px`)。
+3.  **佈局**:
+    - **容器內距**: 統一使用 **`p-5`** (`20px`)。
+    - **Grid 間距**: 建議使用 **`gap-4`** (`16px`) 或 `gap-6` (`24px`)，但同一專案內需統一。本專案推薦 **`gap-4`**。
+    - **垂直間距**: Label 與 Input 之間使用 **`space-y-1`** (`4px`)。
+    - **排版**: 建議使用 Grid 系統 (`grid-cols-12`) 進行排版。
+
+```tsx
+<div className="space-y-1">
+  <Label className="text-xs font-medium text-grey-2">關鍵字搜尋</Label>
+  <Input className="h-9" placeholder="..." />
+</div>
+```
+
+4.  **操作按鈕區 (Action Bar)**:
+    - **位置**: 位於篩選列最下方。
+    - **樣式**: 統一使用 `flex items-center justify-end border-t border-grey-4 pt-5 gap-3`。
+    - **說明**: `border-grey-4` 為標準通用邊框色，`pt-5` 與容器 padding (`p-5`) 呼應，維持視覺平衡。
+
+5.  **收合模式 (Collapsible Mode)**:
+    - **目的**: 節省垂直空間，預設隱藏較佔空間與低頻使用的篩選器（如日期區間）。
+    - **實作**:
+        - 預設狀態：若無相關篩選值，則預設為 **收合 (Collapsed)**。
+        - 切換按鈕：位於 Action Bar 左側 (`mr-auto`)。
+        - 樣式：Ghost Button + `ChevronDown`/`ChevronUp` Icon + 提示圓點 (Indicator)。
+    - **邏輯**: 若載入頁面時已有被隱藏的篩選值 (e.g. `date_start`)，則強制 **展開 (Expanded)** 或顯示提示。
+
+---
+
+## 12. 檢查清單
+
+在開發或審查頁面時，請確認以下項目：
+
+### ✅ 按鈕
+- [ ] 使用 `button-filled-*` 或 `button-outlined-*` 類別
+- [ ] 主要操作使用 `button-filled-primary`
+- [ ] 編輯操作使用 `button-outlined-primary`
+- [ ] 刪除操作使用 `button-outlined-error`
+- [ ] 按鈕尺寸正確（sm/default/lg）
+- [ ] 包含適當的圖標
+
+### ✅ 圖標
+- [ ] 全部使用 `lucide-react`
+- [ ] 尺寸正確（h-3/h-4/h-5/h-6）
+- [ ] 顏色與上下文一致
+
+### ✅ 表格
+- [ ] 使用 `@/Components/ui/table` 元件
+- [ ] 有 `bg-white rounded-xl border` 容器
+- [ ] 標題列有 `bg-gray-50` 背景
+- [ ] 序號欄固定寬度並置中
+- [ ] 操作欄使用 `flex justify-center gap-2`
+- [ ] 空狀態訊息置中顯示
+
+### ✅ 分頁
+- [ ] 使用 `@/Components/shared/Pagination`
+- [ ] 有每頁筆數選擇器（10/20/50/100）
+
+### ✅ 權限
+- [ ] 所有操作按鈕都用 `<Can>` 包裹
+- [ ] 權限命名符合 `resource.action` 格式
+
+### ✅ 通知
+- [ ] 使用 `toast` 提供操作反饋
+- [ ] 成功/錯誤訊息明確
+
+### ✅ 整體
+- [ ] 頁面有標準頭部（標題 + 圖標 + 說明 + 新增按鈕）
+- [ ] 容器寬度使用 `max-w-7xl`
+- [ ] 使用正確的佈局（`AuthenticatedLayout`）
+
+---
+
+## 13. 常見錯誤與修正
+
+### ❌ 錯誤：自定義按鈕樣式
+
+```tsx
+// ❌ 錯誤
+<Button className="bg-green-500 text-white hover:bg-green-600">
+  新增
+</Button>
+
+// ✅ 正確
+<Button className="button-filled-primary">
+  <Plus className="h-4 w-4 mr-2" />
+  新增
+</Button>
+```
+
+### ❌ 錯誤：混用圖標庫
+
+```tsx
+// ❌ 錯誤
+import { FaEdit } from 'react-icons/fa';
+<FaEdit />
+
+// ✅ 正確
+import { Pencil } from 'lucide-react';
+<Pencil className="h-4 w-4" />
+```
+
+### ❌ 錯誤：操作欄未置中
+
+```tsx
+// ❌ 錯誤
+<TableCell>
+  <Button>編輯</Button>
+  <Button>刪除</Button>
+</TableCell>
+
+// ✅ 正確
+<TableCell className="text-center">
+  <div className="flex items-center justify-center gap-2">
+    <Button variant="outline" size="sm" className="button-outlined-primary">
+      <Pencil className="h-4 w-4" />
+    </Button>
+    <Button variant="outline" size="sm" className="button-outlined-error">
+      <Trash2 className="h-4 w-4" />
+    </Button>
+  </div>
+</TableCell>
+```
+
+### ❌ 錯誤：缺少權限控制
+
+```tsx
+// ❌ 錯誤
+<Button onClick={handleDelete}>刪除</Button>
+
+// ✅ 正確
+<Can permission="resource.delete">
+  <Button 
+    variant="outline" 
+    size="sm" 
+    className="button-outlined-error"
+    onClick={handleDelete}
+  >
+    <Trash2 className="h-4 w-4" />
+  </Button>
+</Can>
+```
+
+---
+
+## 14. 參考範例
+
+以下頁面展示了完整的 UI 統一性實踐：
+
+- **使用者管理**：`resources/js/Pages/Admin/User/Index.tsx`
+- **角色管理**：`resources/js/Pages/Admin/Role/Index.tsx`
+- **產品管理**：`resources/js/Pages/Product/Index.tsx`
+- **倉庫管理**：`resources/js/Pages/Warehouse/Index.tsx`
+
+---
+
+## 總結
+
+遵循本規範可確保：
+
+1. ✅ **視覺一致性**：所有頁面看起來像同一個系統
+2. ✅ **維護效率**：使用統一組件，修改一處即可影響全局
+3. ✅ **開發速度**：有明確的模式可循，減少決策時間
+4. ✅ **使用者體驗**：一致的互動模式降低學習成本
+5. ✅ **安全性**：統一的權限控制確保資料安全
+
+當你在開發或審查 Star ERP 客戶端後台的 UI 時，請務必參考此規範！
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -9,13 +9,13 @@ on:
 jobs:
  # --- 1. Demo 環境部署 (103 本機) ---
  deploy-demo:
-    if: github.ref == 'refs/heads/demo'
+    if: false # github.ref == 'refs/heads/demo' (暫時停用)
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Code
        uses: actions/checkout@v3
        with:
-          github-server-url: http://192.168.0.103:3000
+          # github-server-url: ${{ github.server_url }} # 自動偵測
          repository: ${{ github.repository }}

      - name: Step 1 - Push Code to Demo
@@ -100,8 +100,12 @@ jobs:
            npm run build &&
            
            # 3. Laravel 初始化與優化
+            php artisan storage:link &&
            php artisan migrate --force &&
+            php artisan tenants:migrate --force &&
            php artisan db:seed --force &&
+            php artisan tenants:run db:seed --option="class=PermissionSeeder" --option="force=true" &&
+            php artisan permission:cache-reset &&
            php artisan optimize:clear &&
            php artisan optimize &&
            php artisan view:cache
@@ -116,7 +120,6 @@ jobs:
      - name: Checkout Code
        uses: actions/checkout@v3
        with:
-          github-server-url: http://192.168.0.103:3000 
          repository: ${{ github.repository }}

      - name: Step 1 - Push Code to Production
@@ -130,6 +133,7 @@ jobs:
            --exclude='.env' \
            --exclude='node_modules' \
            --exclude='vendor' \
+            --exclude='storage' \
            --exclude='public/build' \
            -e "ssh -p 2224 -i ~/.ssh/id_rsa_prod -o StrictHostKeyChecking=no" \
            ./ root@erp.koori.tw:/var/www/star-erp/
@@ -169,7 +173,6 @@ jobs:
          script: |
            cd /var/www/star-erp
            chown -R 1000:1000 .
-            
            # 檢查是否需要重建
            if git diff --name-only HEAD~1 HEAD 2>/dev/null | grep -qE '(Dockerfile|compose\.yaml|docker-compose\.yaml)'; then
              echo "🔄 偵測到 Docker 相關檔案變更，執行完整重建..."
@@ -192,7 +195,12 @@ jobs:
              npm install &&
              npm run build

+              php artisan storage:link &&
              php artisan migrate --force &&
+              php artisan tenants:migrate --force &&
+              php artisan db:seed --force &&
+              php artisan tenants:run db:seed --option="class=PermissionSeeder" --option="force=true" &&
+              php artisan permission:cache-reset &&
              php artisan optimize:clear &&
              php artisan optimize &&
              php artisan view:cache
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,6 @@ Thumbs.db
 智慧補貨系統分析報告.md

 /docs/pptx_build
+/docs/presentation
+docs/Monthly_Report_2026_01.pptx
+docs/f6_1770350984272.xlsx
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Star ERP 是一個基於 **Laravel 12**、**Inertia.js (React)** 與 **Tailwind

 ## 📂 系統功能詳細說明

-### 🌳 系統功能架構樹 (含 2.0 升級規劃)
+### 🌳 預計系統功能架構樹 (含 2.0 升級規劃)
 ```text
 Star ERP
 ├── 🏠 儀表板 (Dashboard)
@@ -107,6 +107,7 @@ Star ERP
 git clone <repository_url> star-erp
 cd star-erp

+
 # 2. 設定環境變數
 cp .env.example .env
 # 請檢查 .env 內容，本機開發預設配置：
@@ -179,4 +180,4 @@ docker compose down
 - **樣式**: 全面使用 Tailwind CSS，避免手寫 CSS。
 - **多租戶**: 
    - 中央邏輯 (Landlord) 與租戶邏輯 (Tenant) 分離。
-    - 租戶路由定義於 `routes/tenant.php` (但在本專案架構中，大部分路由在 `web.php` 並透過 Middleware 判斷環境)。
+    - 租戶路由定義於 `routes/tenant.php` (但在本專案架構中，大部分路由在 `web.php` 並透過 Middleware 判斷環境)。
--- a/app/Http/Controllers/Landlord/TenantController.php
+++ b/app/Http/Controllers/Landlord/TenantController.php
@@ -19,6 +19,7 @@ class TenantController extends Controller
            return [
                'id' => $tenant->id,
                'name' => $tenant->name ?? $tenant->id,
+                'short_name' => $tenant->short_name ?? null,
                'email' => $tenant->email ?? null,
                'is_active' => $tenant->is_active ?? true,
                'created_at' => $tenant->created_at->format('Y-m-d H:i'),
@@ -47,6 +48,7 @@ class TenantController extends Controller
        $validated = $request->validate([
            'id' => ['required', 'string', 'max:50', 'alpha_dash', Rule::unique('tenants', 'id')],
            'name' => ['required', 'string', 'max:100'],
+            'short_name' => ['nullable', 'string', 'max:50'],
            'email' => ['nullable', 'email', 'max:100'],
            'domain' => ['nullable', 'string', 'max:100'],
        ]);
@@ -54,8 +56,14 @@ class TenantController extends Controller
        $tenant = Tenant::create([
            'id' => $validated['id'],
            'name' => $validated['name'],
+            'short_name' => $validated['short_name'] ?? null,
            'email' => $validated['email'] ?? null,
            'is_active' => true,
+            'branding' => [
+                'logo_path' => 'defaults/logo.png', // 預設 Logo 路徑
+                'login_background_path' => 'defaults/login_bg.jpg', // 預設登入背景
+                'primary_color' => '#4F46E5', // 預設主色系 (Indigo-600)
+            ],
        ]);

        // 綁定網域（如果沒有輸入，使用預設網域）
@@ -76,10 +84,29 @@ class TenantController extends Controller
    {
        $tenant = Tenant::with('domains')->findOrFail($id);

+        $tokens = [];
+        try {
+            tenancy()->initialize($tenant);
+            $user = \App\Modules\Core\Models\User::first();
+            if ($user) {
+                $tokens = $user->tokens()->orderBy('created_at', 'desc')->get(['id', 'name', 'last_used_at', 'created_at'])->map(function($token) {
+                    return [
+                        'id' => $token->id,
+                        'name' => $token->name,
+                        'last_used_at' => $token->last_used_at ? $token->last_used_at->format('Y-m-d H:i') : '未使用',
+                        'created_at' => $token->created_at->format('Y-m-d H:i'),
+                    ];
+                });
+            }
+        } catch (\Exception $e) {
+            \Log::warning("Failed to fetch tokens for tenant {$id}: " . $e->getMessage());
+        }
+
        return Inertia::render('Landlord/Tenant/Show', [
            'tenant' => [
                'id' => $tenant->id,
                'name' => $tenant->name ?? $tenant->id,
+                'short_name' => $tenant->short_name ?? null,
                'email' => $tenant->email ?? null,
                'is_active' => $tenant->is_active ?? true,
                'created_at' => $tenant->created_at->format('Y-m-d H:i'),
@@ -89,6 +116,7 @@ class TenantController extends Controller
                    'domain' => $d->domain,
                ])->toArray(),
            ],
+            'tokens' => $tokens,
        ]);
    }

@@ -123,6 +151,7 @@ class TenantController extends Controller
            'tenant' => [
                'id' => $tenant->id,
                'name' => $tenant->name ?? $tenant->id,
+                'short_name' => $tenant->short_name ?? null,
                'email' => $tenant->email ?? null,
                'is_active' => $tenant->is_active ?? true,
            ],
@@ -138,6 +167,7 @@ class TenantController extends Controller

        $validated = $request->validate([
            'name' => ['required', 'string', 'max:100'],
+            'short_name' => ['nullable', 'string', 'max:50'],
            'email' => ['nullable', 'email', 'max:100'],
            'is_active' => ['boolean'],
        ]);
@@ -231,4 +261,58 @@ class TenantController extends Controller

        return redirect()->back()->with('success', '樣式設定已更新');
    }
+
+    /**
+     * 建立 API Token (用於 POS)
+     */
+    public function createToken(Request $request, Tenant $tenant)
+    {
+        $request->validate([
+            'name' => 'required|string|max:50',
+        ]);
+
+        try {
+            // 切換至租戶環境
+            tenancy()->initialize($tenant);
+
+            // 尋找超級管理員 (假設 ID 1, 或者根據 Role)
+            // 這裡簡單取第一個使用者，通常是 Admin
+            $user = \App\Modules\Core\Models\User::first();
+
+            if (!$user) {
+                return back()->with('error', '該租戶尚無使用者，無法建立 Token。');
+            }
+
+            // 建立 Token
+            $token = $user->createToken($request->name);
+
+            return back()->with('success', 'Token 建立成功')->with('new_token', $token->plainTextToken);
+        } catch (\Exception $e) {
+            \Log::error("Token creation failed: " . $e->getMessage());
+            return back()->with('error', 'Token 建立失敗');
+        } finally {
+             // tenancy()->end(); // Laravel Tenancy 自動處理 scope 結束? 通常 Controller request life-cycle?
+             // Landlord controller is Central. Tenancy initialization persists for request.
+             // We should explicit end if we want to be safe, but redirect ends request anyway.
+        }
+    }
+
+    /**
+     * 撤銷 API Token
+     */
+    public function revokeToken(Request $request, Tenant $tenant, string $tokenId)
+    {
+        try {
+            tenancy()->initialize($tenant);
+            $user = \App\Modules\Core\Models\User::first();
+            
+            if ($user) {
+                $user->tokens()->where('id', $tokenId)->delete();
+            }
+
+            return back()->with('success', 'Token 已撤銷');
+        } catch (\Exception $e) {
+            return back()->with('error', 'Token 撤銷失敗');
+        }
+    }
 }
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -37,8 +37,15 @@ class HandleInertiaRequests extends Middleware
    {
        $user = $request->user();
        
+        $tenant = tenancy()->tenant;
+        $appName = $tenant ? ($tenant->name ?? 'Star ERP') : 'Star ERP 中央後台';
+        
+        // 分享給 Blade View (給 app.blade.php 使用)
+        \Illuminate\Support\Facades\View::share('appName', $appName);
+
        return [
            ...parent::share($request),
+            'appName' => $appName,
            'auth' => [
                'user' => $user ? [
                    'id' => $user->id,
@@ -54,23 +61,34 @@ class HandleInertiaRequests extends Middleware
            'flash' => [
                'success' => $request->session()->get('success'),
                'error' => $request->session()->get('error'),
+                'new_token' => $request->session()->get('new_token'),
            ],
            'branding' => function () {
                $tenant = tenancy()->tenant;
-                if (!$tenant) {
-                    return null;
-                }
+                
+                // 決定名稱顯示邏輯
+                $fullName = $tenant ? ($tenant->name ?? 'Star ERP') : 'Star ERP 中央後台';
+                $shortName = $tenant ? ($tenant->short_name ?? $fullName) : 'Start ERP';

                $logoUrl = null;
-                if (isset($tenant->branding['logo_path'])) {
+                if ($tenant && isset($tenant->branding['logo_path'])) {
                    $logoUrl = \Storage::url($tenant->branding['logo_path']);
+                } elseif (!$tenant) {
+                    $logoUrl = \Storage::url('defaults/logo.png');
                }

-                return [
+                $brandingData = [
+                    'name' => $fullName,
+                    'short_name' => $shortName,
                    'logo_url' => $logoUrl,
-                    'primary_color' => $tenant->branding['primary_color'] ?? '#01ab83',
+                    'primary_color' => $tenant->branding['primary_color'] ?? ($tenant ? '#01ab83' : '#4F46E5'),
                    'text_color' => $tenant->branding['text_color'] ?? '#1a1a1a',
                ];
+
+                // 同步分享給 Blade View (給 app.blade.php 使用 Favicon)
+                \Illuminate\Support\Facades\View::share('branding', $brandingData);
+
+                return $brandingData;
            },
        ];
    }
--- a/app/Modules/Core/Controllers/ActivityLogController.php
+++ b/app/Modules/Core/Controllers/ActivityLogController.php
@@ -23,6 +23,14 @@ class ActivityLogController extends Controller
            'App\Modules\Inventory\Models\Warehouse' => '倉庫',
            'App\Modules\Inventory\Models\Inventory' => '庫存',
            'App\Modules\Finance\Models\UtilityFee' => '公共事業費',
+            'App\Modules\Inventory\Models\GoodsReceipt' => '進貨單',
+            'App\Modules\Production\Models\ProductionOrder' => '生產工單',
+            'App\Modules\Production\Models\Recipe' => '生產配方',
+            'App\Modules\Production\Models\RecipeItem' => '配方品項',
+            'App\Modules\Production\Models\ProductionOrderItem' => '工單品項',
+            'App\Modules\Inventory\Models\InventoryCountDoc' => '庫存盤點單',
+            'App\Modules\Inventory\Models\InventoryAdjustDoc' => '庫存盤調單',
+            'App\Modules\Inventory\Models\InventoryTransferOrder' => '庫存調撥單',
        ];
    }

@@ -76,6 +84,7 @@ class ActivityLogController extends Controller
        }

        $activities = $query->paginate($perPage)
+            ->withQueryString()
            ->through(function ($activity) {
        $subjectMap = $this->getSubjectMap();

--- a/app/Modules/Core/Controllers/Auth/LoginController.php
+++ b/app/Modules/Core/Controllers/Auth/LoginController.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
 use Illuminate\Validation\ValidationException;
+use Illuminate\Support\Facades\Cookie;

 class LoginController extends Controller
 {
@@ -42,17 +43,27 @@ class LoginController extends Controller
        $credentials = $request->only('username', 'password');

        if (Auth::attempt($credentials, $request->boolean('remember'))) {
+            // Check activation status
+            if (!Auth::user()->is_active) {
+                Auth::guard('web')->logout();
+                $request->session()->invalidate();
+                $request->session()->regenerateToken();
+
+                throw ValidationException::withMessages([
+                    'username' => '此帳號已被停用，請聯繫管理員。',
+                ]);
+            }
+
            $request->session()->regenerate();

-            $centralDomains = config('tenancy.central_domains', []);
            $centralDomains = config('tenancy.central_domains', []);
            // [Hack] Demo 環境特殊規則
            $demoPort = config('tenancy.demo_tenant_port');
            if ((!$demoPort || $request->getPort() != $demoPort) && in_array($request->getHost(), $centralDomains)) {
-                return redirect()->intended(route('landlord.dashboard'));
+                return Inertia::location(route('landlord.dashboard'));
            }

-            return redirect()->intended(route('dashboard'));
+            return Inertia::location(route('dashboard'));
        }

        throw ValidationException::withMessages([
@@ -70,6 +81,10 @@ class LoginController extends Controller
        $request->session()->invalidate();

        $request->session()->regenerateToken();
+        
+        // 強制清除 Session Cookie (對付 HTTPS/Proxy 環境下的殘留問題)
+        $sessionCookieName = config('session.cookie');
+        Cookie::queue(Cookie::forget($sessionCookieName));

        return redirect('/');
    }
--- a/app/Modules/Core/Controllers/DashboardController.php
+++ b/app/Modules/Core/Controllers/DashboardController.php
@@ -32,20 +32,16 @@ class DashboardController extends Controller
        }

        $invStats = $this->inventoryService->getDashboardStats();
-        $procStats = $this->procurementService->getDashboardStats();
-
-        $stats = [
-            'productsCount' => $invStats['productsCount'],
-            'vendorsCount' => $procStats['vendorsCount'],
-            'purchaseOrdersCount' => $procStats['purchaseOrdersCount'],
-            'warehousesCount' => $invStats['warehousesCount'],
-            'totalInventoryValue' => $invStats['totalInventoryQuantity'], // 原本前端命名是 totalInventoryValue 但實作是 Quantity，暫且保留欄位名以不破壞前端
-            'pendingOrdersCount' => $procStats['pendingOrdersCount'],
-            'lowStockCount' => $invStats['lowStockCount'],
-        ];

        return Inertia::render('Dashboard', [
-            'stats' => $stats,
+            'stats' => [
+                'totalItems' => $invStats['productsCount'],
+                'lowStockCount' => $invStats['lowStockCount'],
+                'negativeCount' => $invStats['negativeCount'] ?? 0,
+                'expiringCount' => $invStats['expiringCount'] ?? 0,
+            ],
+            'abnormalItems' => $invStats['abnormalItems'] ?? [],
        ]);
    }
 }
+
--- a/app/Modules/Core/Controllers/ProfileController.php
+++ b/app/Modules/Core/Controllers/ProfileController.php
@@ -4,6 +4,7 @@ namespace App\Modules\Core\Controllers;

 use App\Http\Controllers\Controller;

+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\Rules\Password;
 use Inertia\Inertia;
--- a/app/Modules/Core/Controllers/RoleController.php
+++ b/app/Modules/Core/Controllers/RoleController.php
@@ -123,7 +123,7 @@ class RoleController extends Controller
            $role->syncPermissions($validated['permissions']);
        }

-        return redirect()->route('roles.index')->with('success', '角色更新成功');
+        return back()->with('success', '角色更新成功');
    }

    /**
@@ -160,8 +160,13 @@ class RoleController extends Controller
            $action = $parts[1] ?? '';

            // 特定權限遷移邏輯
-            if ($permission->name === 'inventory.transfer') {
-                $group = 'warehouses'; // 調撥功能移至倉庫管理下
+            if ($permission->name === 'inventory.view_cost') {
+                $group = 'inventory'; 
+            }
+
+            // 移除不再使用的權限選項
+            if (in_array($permission->name, ['inventory.count', 'inventory.transfer'])) {
+                continue;
            }

            if (!isset($grouped[$group])) {
@@ -175,13 +180,22 @@ class RoleController extends Controller
        $groupDefinitions = [
            'products' => '商品資料管理',
            'warehouses' => '倉庫管理',
-            'inventory' => '庫存管理',
+            'inventory' => '庫存資料管理',
+            'inventory_count' => '庫存盤點管理',
+            'inventory_adjust' => '庫存盤調管理',
+            'inventory_transfer' => '庫存調撥管理',
+            'inventory_report' => '庫存報表',
            'vendors' => '廠商資料管理',
            'purchase_orders' => '採購單管理',
-            'users' => '使用者管理',
-            'roles' => '角色與權限',
+            'goods_receipts' => '進貨單管理',
+            'recipes' => '配方管理',
+            'production_orders' => '生產工單管理',
            'utility_fees' => '公共事業費管理',
            'accounting' => '會計報表',
+            'sales_imports' => '銷售單匯入管理',
+            'users' => '使用者管理',
+            'roles' => '角色與權限',
+            'system' => '系統管理',
        ];

        $result = [];
--- a/app/Modules/Core/Controllers/UserController.php
+++ b/app/Modules/Core/Controllers/UserController.php
@@ -22,9 +22,26 @@ class UserController extends Controller
        $sortBy = $request->input('sort_by', 'id');
        $sortOrder = $request->input('sort_order', 'asc');
        $search = $request->input('search');
-        $roleId = $request->input('role');

-        $query = User::with(['roles:id,name,display_name']);
+        $roleId = $request->input('role');
+        $isActive = $request->input('is_active'); // 'all', '1', '0'
+
+        $query = User::query();
+
+        // 隱藏超級管理員：若非 super-admin，則不可看到 super-admin 過往
+        if (!auth()->user()->hasRole('super-admin')) {
+            $query->whereDoesntHave('roles', function ($q) {
+                $q->where('name', 'super-admin');
+            });
+
+            // 預載入角色時也過濾掉 super-admin 標籤
+            $query->with(['roles' => function ($q) {
+                $q->select('id', 'name', 'display_name')
+                  ->where('name', '!=', 'super-admin');
+            }]);
+        } else {
+            $query->with(['roles:id,name,display_name']);
+        }

        // 處理搜尋
        if ($search) {
@@ -42,6 +59,11 @@ class UserController extends Controller
            });
        }

+        // 處理狀態篩選
+        if ($isActive !== null && $isActive !== 'all') {
+             $query->where('is_active', $isActive === '1' || $isActive === 'true');
+        }
+
         // 處理排序
        if (in_array($sortBy, ['name', 'created_at'])) {
           $query->orderBy($sortBy, $sortOrder);
@@ -50,12 +72,19 @@ class UserController extends Controller
        }

        $users = $query->paginate($perPage)->withQueryString();
-        $roles = Role::select('id', 'name', 'display_name')->get();
+        
+        // 只能看到自己權限以下的角色
+        $rolesQuery = Role::select('id', 'name', 'display_name');
+        if (!auth()->user()->hasRole('super-admin')) {
+            $rolesQuery->where('name', '!=', 'super-admin');
+        }
+        $roles = $rolesQuery->get();

        return Inertia::render('Admin/User/Index', [
+            'users' => $users,
            'users' => $users,
            'roles' => $roles,
-            'filters' => $request->only(['per_page', 'sort_by', 'sort_order', 'search', 'role']),
+            'filters' => $request->only(['per_page', 'sort_by', 'sort_order', 'search', 'role', 'is_active']),
        ]);
    }

@@ -64,7 +93,11 @@ class UserController extends Controller
     */
    public function create()
    {
-        $roles = Role::pluck('display_name', 'name');
+        $rolesQuery = Role::query();
+        if (!auth()->user()->hasRole('super-admin')) {
+            $rolesQuery->where('name', '!=', 'super-admin');
+        }
+        $roles = $rolesQuery->pluck('display_name', 'name');

        return Inertia::render('Admin/User/Create', [
            'roles' => $roles
@@ -80,8 +113,10 @@ class UserController extends Controller
            'name' => ['required', 'string', 'max:255'],
            'email' => ['nullable', 'string', 'email', 'max:255', 'unique:users'],
            'username' => ['required', 'string', 'max:255', 'unique:users'],
+
            'password' => ['required', 'string', 'min:8', 'confirmed'],
            'roles' => ['array'], 
+            'is_active' => ['boolean'],
        ], [
            'password.required' => '請輸入密碼',
            'password.min' => '密碼長度至少需 :min 個字元',
@@ -92,10 +127,16 @@ class UserController extends Controller
            'name' => $validated['name'],
            'email' => $validated['email'],
            'username' => $validated['username'],
+
            'password' => Hash::make($validated['password']),
+            'is_active' => $request->boolean('is_active', true),
        ]);

        if (!empty($validated['roles'])) {
+            // 安全檢查：非 super-admin 不能賦予 super-admin 角色
+            if (!auth()->user()->hasRole('super-admin') && in_array('super-admin', $validated['roles'])) {
+                abort(403, '您沒有權限指派系統管理員角色');
+            }
            $user->syncRoles($validated['roles']);

            // 更新 'created' 紀錄以包含角色資訊
@@ -123,7 +164,17 @@ class UserController extends Controller
    public function edit(string $id)
    {
        $user = User::with('roles')->findOrFail($id);
-        $roles = Role::get(['id', 'name', 'display_name']); 
+
+        // 安全檢查：非 super-admin 不能編輯 super-admin
+        if ($user->hasRole('super-admin') && !auth()->user()->hasRole('super-admin')) {
+            abort(403, '您沒有權限編輯系統管理員');
+        }
+
+        $rolesQuery = Role::select('id', 'name', 'display_name');
+        if (!auth()->user()->hasRole('super-admin')) {
+            $rolesQuery->where('name', '!=', 'super-admin');
+        }
+        $roles = $rolesQuery->get(); 

        return Inertia::render('Admin/User/Edit', [
            'user' => $user,
@@ -139,12 +190,19 @@ class UserController extends Controller
    {
        $user = User::findOrFail($id);
        
+        // 安全檢查：非 super-admin 不能更新 super-admin
+        if ($user->hasRole('super-admin') && !auth()->user()->hasRole('super-admin')) {
+            abort(403, '您沒有權限編輯系統管理員');
+        }
+        
        $validated = $request->validate([
            'name' => ['required', 'string', 'max:255'],
            'email' => ['nullable', 'string', 'email', 'max:255', Rule::unique('users')->ignore($user->id)],
            'username' => ['required', 'string', 'max:255', Rule::unique('users')->ignore($user->id)],
+
            'password' => ['nullable', 'string', 'min:8', 'confirmed'],
            'roles' => ['array'],
+            'is_active' => ['boolean'],
        ], [
            'password.min' => '密碼長度至少需 :min 個字元',
            'password.confirmed' => '密碼確認不符',
@@ -157,10 +215,6 @@ class UserController extends Controller
            'username' => $validated['username'],
        ];

-        if (!empty($validated['password'])) {
-            $userData['password'] = Hash::make($validated['password']);
-        }
-
        $user->fill($userData);

        // 捕捉變更屬性以進行手動記錄
@@ -179,6 +233,11 @@ class UserController extends Controller
        // 2. 處理角色
        $roleChanges = null;
        if (isset($validated['roles'])) {
+            // 安全檢查：非 super-admin 不能賦予 super-admin 角色
+            if (!auth()->user()->hasRole('super-admin') && in_array('super-admin', $validated['roles'])) {
+                abort(403, '您沒有權限指派系統管理員角色');
+            }
+
            $oldRoles = $user->roles()->pluck('display_name')->join(', ');
            $user->syncRoles($validated['roles']);
            $newRoles = $user->roles()->pluck('display_name')->join(', ');
@@ -230,6 +289,11 @@ class UserController extends Controller
    {
        $user = User::findOrFail($id);

+        // 安全檢查：非 super-admin 不能刪除 super-admin
+        if ($user->hasRole('super-admin') && !auth()->user()->hasRole('super-admin')) {
+            abort(403, '您沒有權限刪除系統管理員');
+        }
+
        if ($user->hasRole('super-admin')) {
             return back()->with('error', '無法刪除超級管理員帳號');
        }
@@ -240,6 +304,46 @@ class UserController extends Controller

        $user->delete();

-        return redirect()->route('users.index')->with('success', '使用者已刪除');
+        return redirect()->route('users.index')->with('success', "使用者「{$user->name}」已刪除");
+    }
+
+    /**
+     * 切換使用者啟用/停用狀態
+     */
+    public function toggleActive(string $id)
+    {
+        $user = User::findOrFail($id);
+
+        // 安全檢查：不能停用自己
+        if ($user->id === auth()->id() && $user->is_active) {
+            return back()->with('error', '無法停用自己的帳號');
+        }
+
+        // 安全檢查：非 super-admin 不能停用 super-admin
+        if ($user->hasRole('super-admin') && !auth()->user()->hasRole('super-admin')) {
+            abort(403, '您沒有權限變更系統管理員狀態');
+        }
+
+        $oldStatus = $user->is_active;
+        $user->is_active = !$oldStatus;
+        $user->save();
+
+        // 記錄活動
+        activity()
+            ->performedOn($user)
+            ->causedBy(auth()->user())
+            ->event('updated')
+            ->withProperties([
+                'attributes' => ['is_active' => $user->is_active],
+                'old' => ['is_active' => $oldStatus],
+                'snapshot' => [
+                    'name' => $user->name,
+                    'username' => $user->username,
+                ]
+            ])
+            ->log('updated');
+
+        $statusText = $user->is_active ? '已啟用' : '已停用';
+        return back()->with('success', "使用者「{$user->name}」{$statusText}");
    }
 }
--- a/app/Modules/Core/Models/User.php
+++ b/app/Modules/Core/Models/User.php
@@ -10,10 +10,12 @@ use Spatie\Permission\Traits\HasRoles;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Activitylog\LogOptions;

+use Laravel\Sanctum\HasApiTokens;
+
 class User extends Authenticatable
 {
    /** @use HasFactory<\Database\Factories\UserFactory> */
-    use HasFactory, Notifiable, HasRoles, LogsActivity;
+    use HasFactory, Notifiable, HasRoles, LogsActivity, HasApiTokens;

    /**
     * 可批量賦值的屬性。
@@ -35,6 +37,7 @@ class User extends Authenticatable
        'email',
        'username',
        'password',
+        'is_active',
    ];

    /**
@@ -56,7 +59,9 @@ class User extends Authenticatable
    {
        return [
            'email_verified_at' => 'datetime',
+
            'password' => 'hashed',
+            'is_active' => 'boolean',
        ];
    }

--- a/app/Modules/Core/Routes/web.php
+++ b/app/Modules/Core/Routes/web.php
@@ -43,6 +43,7 @@ Route::middleware('auth')->group(function () {
            });
            Route::get('/users/{user}/edit', [UserController::class, 'edit'])->middleware('permission:users.edit')->name('users.edit');
            Route::put('/users/{user}', [UserController::class, 'update'])->middleware('permission:users.edit')->name('users.update');
+            Route::patch('/users/{user}/toggle-active', [UserController::class, 'toggleActive'])->middleware('permission:users.activate')->name('users.toggle-active');
            Route::delete('/users/{user}', [UserController::class, 'destroy'])->middleware('permission:users.delete')->name('users.destroy');
        });

--- a/app/Modules/Integration/Controllers/OrderSyncController.php
+++ b/app/Modules/Integration/Controllers/OrderSyncController.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Modules\Integration\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Modules\Integration\Models\SalesOrder;
+use App\Modules\Integration\Models\SalesOrderItem;
+use App\Modules\Inventory\Services\InventoryService;
+use App\Modules\Inventory\Models\Product;
+use App\Modules\Inventory\Models\Warehouse;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class OrderSyncController extends Controller
+{
+    protected $inventoryService;
+
+    public function __construct(InventoryService $inventoryService)
+    {
+        $this->inventoryService = $inventoryService;
+    }
+
+    public function store(Request $request)
+    {
+        $request->validate([
+            'external_order_id' => 'required|string|unique:sales_orders,external_order_id',
+            'warehouse' => 'nullable|string',
+            'warehouse_id' => 'nullable|exists:warehouses,id',
+            'items' => 'required|array',
+            'items.*.pos_product_id' => 'required|string',
+            'items.*.qty' => 'required|numeric|min:0.0001',
+            'items.*.price' => 'required|numeric',
+        ]);
+
+        try {
+            return DB::transaction(function () use ($request) {
+                // 1. Create Order
+                $order = SalesOrder::create([
+                    'external_order_id' => $request->external_order_id,
+                    'status' => 'completed',
+                    'payment_method' => $request->payment_method ?? 'cash',
+                    'total_amount' => 0, // Will calculate
+                    'sold_at' => $request->sold_at ?? now(),
+                    'raw_payload' => $request->all(),
+                ]);
+
+                // Find Warehouse (Default to "銷售倉庫")
+                $warehouseId = $request->warehouse_id;
+                
+                if (empty($warehouseId)) {
+                    $warehouseName = $request->warehouse ?: '銷售倉庫';
+                    $warehouse = Warehouse::firstOrCreate(['name' => $warehouseName], [
+                        'code' => 'SALES-' . strtoupper(bin2hex(random_bytes(4))),
+                        'type' => 'system_sales',
+                        'is_active' => true,
+                    ]);
+                    $warehouseId = $warehouse->id;
+                }
+
+                $totalAmount = 0;
+
+                foreach ($request->items as $itemData) {
+                    // Find product by external ID (Strict Check)
+                    $product = Product::where('external_pos_id', $itemData['pos_product_id'])->first();
+
+                    if (!$product) {
+                        throw new \Exception("Product not found for POS ID: " . $itemData['pos_product_id'] . ". Please sync product first.");
+                    }
+
+                    $qty = $itemData['qty'];
+                    $price = $itemData['price'];
+                    $lineTotal = $qty * $price;
+                    $totalAmount += $lineTotal;
+
+                    // 2. Create Order Item
+                    SalesOrderItem::create([
+                        'sales_order_id' => $order->id,
+                        'product_id' => $product->id,
+                        'product_name' => $product->name, // Snapshot name
+                        'quantity' => $qty,
+                        'price' => $price,
+                        'total' => $lineTotal,
+                    ]);
+
+                    // 3. Deduct Stock (Force negative allowed for POS orders)
+                    $this->inventoryService->decreaseStock(
+                        $product->id,
+                        $warehouseId,
+                        $qty,
+                        "POS Order: " . $order->external_order_id,
+                        true // Force = true
+                    );
+                }
+
+                $order->update(['total_amount' => $totalAmount]);
+
+                return response()->json([
+                    'message' => 'Order synced and stock deducted successfully',
+                    'order_id' => $order->id,
+                ], 201);
+            });
+
+        } catch (\Exception $e) {
+            Log::error('Order Sync Failed', ['error' => $e->getMessage(), 'payload' => $request->all()]);
+            return response()->json(['message' => 'Sync failed: ' . $e->getMessage()], 400);
+        }
+    }
+}
--- a/app/Modules/Integration/Controllers/ProductSyncController.php
+++ b/app/Modules/Integration/Controllers/ProductSyncController.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Modules\Integration\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Modules\Inventory\Services\ProductService;
+use Illuminate\Support\Facades\Log;
+
+class ProductSyncController extends Controller
+{
+    protected $productService;
+
+    public function __construct(ProductService $productService)
+    {
+        $this->productService = $productService;
+    }
+
+    public function upsert(Request $request)
+    {
+        $request->validate([
+            'external_pos_id' => 'required|string',
+            'name' => 'required|string',
+            'price' => 'nullable|numeric',
+            'barcode' => 'nullable|string',
+            'category' => 'nullable|string',
+            'unit' => 'nullable|string',
+            'updated_at' => 'nullable|date',
+        ]);
+
+        try {
+            $product = $this->productService->upsertFromPos($request->all());
+
+            return response()->json([
+                'message' => 'Product synced successfully',
+                'data' => [
+                    'id' => $product->id,
+                    'external_pos_id' => $product->external_pos_id,
+                ]
+            ]);
+        } catch (\Exception $e) {
+            Log::error('Product Sync Failed', ['error' => $e->getMessage(), 'payload' => $request->all()]);
+            return response()->json(['message' => 'Sync failed'], 500);
+        }
+    }
+}
--- a/app/Modules/Integration/IntegrationServiceProvider.php
+++ b/app/Modules/Integration/IntegrationServiceProvider.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Modules\Integration;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Route;
+use App\Modules\Integration\Middleware\TenantIdentificationMiddleware;
+
+class IntegrationServiceProvider extends ServiceProvider
+{
+    public function boot()
+    {
+        $this->loadRoutesFrom(__DIR__ . '/Routes/api.php');
+        $this->loadMigrationsFrom(__DIR__ . '/Database/Migrations');
+
+        // Register Middleware Alias
+        Route::aliasMiddleware('integration.tenant', TenantIdentificationMiddleware::class);
+    }
+
+    public function register()
+    {
+        //
+    }
+}
--- a/app/Modules/Integration/Middleware/TenantIdentificationMiddleware.php
+++ b/app/Modules/Integration/Middleware/TenantIdentificationMiddleware.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Modules\Integration\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Stancl\Tenancy\Facades\Tenancy;
+use Symfony\Component\HttpFoundation\Response;
+
+class TenantIdentificationMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        // 1. Check for X-Tenant-Domain header
+        $domain = $request->header('X-Tenant-Domain');
+
+        if (! $domain) {
+            return response()->json([
+                'message' => 'Missing X-Tenant-Domain header.',
+            ], 400);
+        }
+
+        // 2. Find Tenant by domain
+        // Assuming domains are stored in 'domains' table and linked to tenants
+        // Or using Stancl's tenant finder. 
+        // Stancl Tenancy usually finds by domain automatically for web routes, but for API 
+        // we are doing manual identification because we might not be using subdomains for API calls (or maybe we are).
+        // If the API endpoint is centrally hosted (e.g. api.star-erp.com/v1/...), we need this header.
+        
+        // Let's try to initialize tenancy manually.
+        // We need to find the tenant model that has this domain.
+        try {
+             $tenant = \App\Modules\Core\Models\Tenant::whereHas('domains', function ($query) use ($domain) {
+                 $query->where('domain', $domain);
+             })->first();
+
+             if (! $tenant) {
+                 return response()->json([
+                     'message' => 'Tenant not found.',
+                 ], 404);
+             }
+
+             Tenancy::initialize($tenant);
+
+        } catch (\Exception $e) {
+            return response()->json([
+                'message' => 'Tenant initialization failed: ' . $e->getMessage(),
+            ], 500);
+        }
+
+        return $next($request);
+    }
+}
--- a/app/Modules/Integration/Models/SalesOrder.php
+++ b/app/Modules/Integration/Models/SalesOrder.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Modules\Integration\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class SalesOrder extends Model
+{
+    protected $table = 'sales_orders';
+
+    protected $fillable = [
+        'external_order_id',
+        'status',
+        'payment_method',
+        'total_amount',
+        'sold_at',
+        'raw_payload',
+    ];
+
+    protected $casts = [
+        'sold_at' => 'datetime',
+        'raw_payload' => 'array',
+        'total_amount' => 'decimal:4',
+    ];
+
+    public function items(): HasMany
+    {
+        return $this->hasMany(SalesOrderItem::class);
+    }
+}
--- a/app/Modules/Integration/Models/SalesOrderItem.php
+++ b/app/Modules/Integration/Models/SalesOrderItem.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Modules\Integration\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class SalesOrderItem extends Model
+{
+    protected $table = 'sales_order_items';
+
+    protected $fillable = [
+        'sales_order_id',
+        'product_id',
+        'product_name',
+        'quantity',
+        'price',
+        'total',
+    ];
+
+    protected $casts = [
+        'quantity' => 'decimal:4',
+        'price' => 'decimal:4',
+        'total' => 'decimal:4',
+    ];
+
+    public function order(): BelongsTo
+    {
+        return $this->belongsTo(SalesOrder::class, 'sales_order_id');
+    }
+}
--- a/app/Modules/Integration/Routes/api.php
+++ b/app/Modules/Integration/Routes/api.php
@@ -0,0 +1,12 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use App\Modules\Integration\Controllers\ProductSyncController;
+use App\Modules\Integration\Controllers\OrderSyncController;
+
+Route::prefix('api/v1/integration')
+    ->middleware(['api', 'integration.tenant', 'auth:sanctum']) // integration.tenant middleware to identify tenant
+    ->group(function () {
+        Route::post('products/upsert', [ProductSyncController::class, 'upsert']);
+        Route::post('orders', [OrderSyncController::class, 'store']);
+    });
--- a/app/Modules/Inventory/Contracts/InventoryServiceInterface.php
+++ b/app/Modules/Inventory/Contracts/InventoryServiceInterface.php
@@ -15,15 +15,15 @@ interface InventoryServiceInterface
    public function checkStock(int $productId, int $warehouseId, float $quantity): bool;

    /**
-     * Decrease stock for a product (e.g., when an order is placed).
-     * 
     * @param int $productId
     * @param int $warehouseId
     * @param float $quantity
     * @param string|null $reason
+     * @param bool $force
+     * @param string|null $slot
     * @return void
     */
-    public function decreaseStock(int $productId, int $warehouseId, float $quantity, ?string $reason = null): void;
+    public function decreaseStock(int $productId, int $warehouseId, float $quantity, ?string $reason = null, bool $force = false, ?string $slot = null): void;

    /**
     * Get all active warehouses.
@@ -106,6 +106,25 @@ interface InventoryServiceInterface
     */
    public function decreaseInventoryQuantity(int $inventoryId, float $quantity, ?string $reason = null, ?string $referenceType = null, $referenceId = null);

+    /**
+     * Find a specific inventory record by warehouse, product and batch.
+     * 
+     * @param int $warehouseId
+     * @param int $productId
+     * @param string|null $batchNumber
+     * @return object|null
+     */
+    public function findInventoryByBatch(int $warehouseId, int $productId, ?string $batchNumber);
+
+    /**
+     * 取得即時庫存查詢資料（含統計卡片 + 分頁明細）。
+     *
+     * @param array $filters 篩選條件
+     * @param int $perPage 每頁筆數
+     * @return array
+     */
+    public function getStockQueryData(array $filters = [], int $perPage = 10): array;
+
    /**
     * Get statistics for the dashboard.
     * 
--- a/app/Modules/Inventory/Controllers/AdjustDocController.php
+++ b/app/Modules/Inventory/Controllers/AdjustDocController.php
@@ -0,0 +1,242 @@
+<?php
+
+namespace App\Modules\Inventory\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Modules\Inventory\Models\InventoryAdjustDoc;
+use App\Modules\Inventory\Models\InventoryCountDoc;
+use App\Modules\Inventory\Models\Warehouse;
+use App\Modules\Inventory\Services\AdjustService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Inertia\Inertia;
+
+class AdjustDocController extends Controller
+{
+    protected $adjustService;
+
+    public function __construct(AdjustService $adjustService)
+    {
+        $this->adjustService = $adjustService;
+    }
+
+    public function index(Request $request)
+    {
+        $query = InventoryAdjustDoc::query()
+            ->with(['createdBy', 'postedBy', 'warehouse']);
+
+        // 搜尋
+        if ($request->filled('search')) {
+            $search = $request->search;
+            $query->where(function($q) use ($search) {
+                $q->where('doc_no', 'like', "%{$search}%")
+                  ->orWhere('reason', 'like', "%{$search}%")
+                  ->orWhere('remarks', 'like', "%{$search}%");
+            });
+        }
+
+        if ($request->filled('warehouse_id')) {
+            $query->where('warehouse_id', $request->warehouse_id);
+        }
+
+        $perPage = $request->input('per_page', 10);
+        $docs = $query->orderByDesc('created_at')
+            ->paginate($perPage)
+            ->withQueryString()
+            ->through(function ($doc) {
+                return [
+                    'id' => (string) $doc->id,
+                    'doc_no' => $doc->doc_no,
+                    'status' => $doc->status,
+                    'warehouse_name' => $doc->warehouse->name,
+                    'reason' => $doc->reason,
+                    'created_at' => $doc->created_at->format('Y-m-d H:i'),
+                    'posted_at' => $doc->posted_at ? $doc->posted_at->format('Y-m-d H:i') : '-',
+                    'created_by' => $doc->createdBy?->name,
+                    'remarks' => $doc->remarks,
+                ];
+            });
+
+        return Inertia::render('Inventory/Adjust/Index', [
+            'docs' => $docs,
+            'warehouses' => Warehouse::all()->map(fn($w) => ['id' => (string)$w->id, 'name' => $w->name]),
+            'filters' => $request->only(['warehouse_id', 'search', 'per_page']),
+        ]);
+    }
+
+    public function store(Request $request)
+    {
+        // 模式 1: 從盤點單建立
+        if ($request->filled('count_doc_id')) {
+            $countDoc = InventoryCountDoc::findOrFail($request->count_doc_id);
+            if ($countDoc->status !== 'completed') {
+                $errorMsg = $countDoc->status === 'no_adjust' 
+                    ? '此盤點單無庫存差異，無需建立盤調單' 
+                    : '只有已完成盤點的單據可以建立盤調單';
+                return redirect()->back()->with('error', $errorMsg);
+            }
+            
+            // 檢查是否已存在對應的盤調單 (避免重複建立)
+            if (InventoryAdjustDoc::where('count_doc_id', $countDoc->id)->exists()) {
+                return redirect()->back()->with('error', '此盤點單已建立過盤調單');
+            }
+
+            $doc = $this->adjustService->createFromCountDoc($countDoc, auth()->id());
+                
+            return redirect()->route('inventory.adjust.show', [$doc->id])
+                ->with('success', '已從盤點單生成盤調單');
+        }
+
+        // 模式 2: 一般手動調整 (保留原始邏輯但更新訊息)
+        $validated = $request->validate([
+            'warehouse_id' => 'required',
+            'reason' => 'required|string',
+            'remarks' => 'nullable|string',
+        ]);
+
+        $doc = $this->adjustService->createDoc(
+            $validated['warehouse_id'],
+            $validated['reason'],
+            $validated['remarks'],
+            auth()->id()
+        );
+
+        return redirect()->route('inventory.adjust.show', [$doc->id])
+            ->with('success', '已建立盤調單');
+    }
+
+    /**
+     * API: 獲取可盤調的已完成盤點單 (支援掃描單號)
+     */
+    public function getPendingCounts(Request $request)
+    {
+        $query = InventoryCountDoc::where('status', 'completed')
+            ->whereNotExists(function ($query) {
+                $query->select(DB::raw(1))
+                    ->from('inventory_adjust_docs')
+                    ->whereColumn('inventory_adjust_docs.count_doc_id', 'inventory_count_docs.id');
+            });
+
+        if ($request->filled('search')) {
+            $search = $request->search;
+            $query->where('doc_no', 'like', "%{$search}%");
+        }
+
+        $counts = $query->limit(10)->get()->map(function($c) {
+            return [
+                'id' => (string)$c->id,
+                'doc_no' => $c->doc_no,
+                'warehouse_name' => $c->warehouse->name,
+                'completed_at' => $c->completed_at->format('Y-m-d H:i'),
+            ];
+        });
+
+        return response()->json($counts);
+    }
+
+    public function update(Request $request, InventoryAdjustDoc $doc)
+    {
+        $action = $request->input('action', 'update');
+
+        if ($action === 'post') {
+            if ($doc->status !== 'draft') {
+                return redirect()->back()->with('error', '只有草稿狀態的單據可以過帳');
+            }
+            $this->adjustService->post($doc, auth()->id());
+            return redirect()->back()->with('success', '單據已過帳');
+        }
+
+        if ($action === 'void') {
+            if ($doc->status !== 'draft') {
+                return redirect()->back()->with('error', '只有草稿狀態的單據可以作廢');
+            }
+            $this->adjustService->void($doc, auth()->id());
+            return redirect()->back()->with('success', '單據已作廢');
+        }
+
+        // 一般更新 (更新品項與基本資訊)
+        if ($doc->status !== 'draft') {
+            return redirect()->back()->with('error', '只有草稿狀態的單據可以修改');
+        }
+
+        $request->validate([
+            'reason' => 'required|string',
+            'remarks' => 'nullable|string',
+            'items' => 'required|array|min:1',
+            'items.*.product_id' => 'required',
+            'items.*.adjust_qty' => 'required|numeric',
+        ]);
+
+        $doc->update([
+            'reason' => $request->reason,
+            'remarks' => $request->remarks,
+        ]);
+
+        $this->adjustService->updateItems($doc, $request->items);
+
+        return redirect()->back()->with('success', '單據已更新');
+    }
+
+    public function show(InventoryAdjustDoc $doc)
+    {
+        $doc->load(['items.product.baseUnit', 'createdBy', 'postedBy', 'warehouse', 'countDoc']);
+
+        // Pre-fetch relevant Inventory information (mainly for expiry date)
+        $inventoryMap = \App\Modules\Inventory\Models\Inventory::withTrashed()
+            ->where('warehouse_id', $doc->warehouse_id)
+            ->whereIn('product_id', $doc->items->pluck('product_id'))
+            ->whereIn('batch_number', $doc->items->pluck('batch_number'))
+            ->get()
+            ->mapWithKeys(function ($inv) {
+                return [$inv->product_id . '-' . $inv->batch_number => $inv];
+            });
+
+        $docData = [
+            'id' => (string) $doc->id,
+            'doc_no' => $doc->doc_no,
+            'warehouse_id' => (string) $doc->warehouse_id,
+            'warehouse_name' => $doc->warehouse->name,
+            'status' => $doc->status,
+            'reason' => $doc->reason,
+            'remarks' => $doc->remarks,
+            'created_at' => $doc->created_at->format('Y-m-d H:i'),
+            'created_by' => $doc->createdBy?->name,
+            'count_doc_id' => $doc->count_doc_id ? (string)$doc->count_doc_id : null,
+            'count_doc_no' => $doc->countDoc?->doc_no,
+            'items' => $doc->items->map(function ($item) use ($inventoryMap) {
+                $inv = $inventoryMap->get($item->product_id . '-' . $item->batch_number);
+                return [
+                    'id' => (string) $item->id,
+                    'product_id' => (string) $item->product_id,
+                    'product_name' => $item->product->name,
+                    'product_code' => $item->product->code,
+                    'batch_number' => $item->batch_number,
+                    'expiry_date' => $inv && $inv->expiry_date ? $inv->expiry_date->format('Y-m-d') : null,
+                    'unit' => $item->product->baseUnit?->name,
+                    'qty_before' => (float) $item->qty_before,
+                    'adjust_qty' => (float) $item->adjust_qty,
+                    'notes' => $item->notes,
+                ];
+            }),
+        ];
+
+        return Inertia::render('Inventory/Adjust/Show', [
+            'doc' => $docData,
+        ]);
+    }
+
+    public function destroy(InventoryAdjustDoc $doc)
+    {
+        if ($doc->status !== 'draft') {
+            return redirect()->back()->with('error', '只能刪除草稿狀態的單據');
+        }
+
+
+
+        $doc->items()->delete();
+        $doc->delete();
+
+        return redirect()->route('inventory.adjust.index')
+            ->with('success', '盤調單已刪除');
+    }
+}
--- a/app/Modules/Inventory/Controllers/CountDocController.php
+++ b/app/Modules/Inventory/Controllers/CountDocController.php
@@ -0,0 +1,237 @@
+<?php
+
+namespace App\Modules\Inventory\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Modules\Inventory\Models\InventoryCountDoc;
+use App\Modules\Inventory\Models\Warehouse;
+use App\Modules\Inventory\Services\CountService;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+
+class CountDocController extends Controller
+{
+    protected $countService;
+
+    public function __construct(CountService $countService)
+    {
+        $this->countService = $countService;
+    }
+
+    public function index(Request $request)
+    {
+        $query = InventoryCountDoc::query()
+            ->with(['createdBy', 'completedBy', 'warehouse']);
+
+        if ($request->filled('warehouse_id')) {
+            $query->where('warehouse_id', $request->warehouse_id);
+        }
+
+        if ($request->filled('search')) {
+            $search = $request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('doc_no', 'like', "%{$search}%")
+                  ->orWhere('remarks', 'like', "%{$search}%");
+            });
+        }
+
+        $perPage = $request->input('per_page', 10);
+        if (!in_array($perPage, [10, 20, 50, 100])) {
+            $perPage = 10;
+        }
+
+        $countQuery = function ($query) {
+            $query->whereNotNull('counted_qty');
+        };
+
+        $docs = $query->withCount(['items', 'items as counted_items_count' => $countQuery])
+            ->orderByDesc('created_at')
+            ->paginate($perPage)
+            ->withQueryString()
+            ->through(function ($doc) {
+                return [
+                    'id' => (string) $doc->id,
+                    'doc_no' => $doc->doc_no,
+                    'status' => $doc->status,
+                    'warehouse_name' => $doc->warehouse->name,
+                    'snapshot_date' => $doc->snapshot_date ? $doc->snapshot_date->format('Y-m-d H:i') : '-',
+                    'completed_at' => $doc->completed_at ? $doc->completed_at->format('Y-m-d H:i') : '-',
+                    'created_by' => $doc->createdBy?->name,
+                    'remarks' => $doc->remarks,
+                    'total_items' => $doc->items_count,
+                    'counted_items' => $doc->counted_items_count,
+                ];
+            });
+
+        return Inertia::render('Inventory/Count/Index', [
+            'docs' => $docs,
+            'warehouses' => Warehouse::all()->map(fn($w) => ['id' => (string)$w->id, 'name' => $w->name]),
+            'filters' => $request->only(['warehouse_id', 'search', 'per_page']),
+        ]);
+    }
+
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'warehouse_id' => 'required|exists:warehouses,id',
+            'remarks' => 'nullable|string|max:255',
+        ]);
+
+        $doc = $this->countService->createDoc(
+            $validated['warehouse_id'],
+            $validated['remarks'] ?? null,
+            auth()->id()
+        );
+
+        // 自動執行快照
+        $this->countService->snapshot($doc, false);
+
+        return redirect()->route('inventory.count.show', [$doc->id])
+            ->with('success', '已建立盤點單並完成庫存快照');
+    }
+
+    public function show(InventoryCountDoc $doc)
+    {
+        $doc->load(['items.product.baseUnit', 'createdBy', 'completedBy', 'warehouse']);
+
+        // 預先抓取相關的 Inventory 資訊 (主要為了取得效期)
+        $inventoryMap = \App\Modules\Inventory\Models\Inventory::withTrashed()
+            ->where('warehouse_id', $doc->warehouse_id)
+            ->whereIn('product_id', $doc->items->pluck('product_id'))
+            ->whereIn('batch_number', $doc->items->pluck('batch_number'))
+            ->get()
+            ->mapWithKeys(function ($inv) {
+                return [$inv->product_id . '-' . $inv->batch_number => $inv];
+            });
+
+        $docData = [
+            'id' => (string) $doc->id,
+            'doc_no' => $doc->doc_no,
+            'warehouse_id' => (string) $doc->warehouse_id,
+            'warehouse_name' => $doc->warehouse->name,
+            'status' => $doc->status,
+            'remarks' => $doc->remarks,
+            'snapshot_date' => $doc->snapshot_date ? $doc->snapshot_date->format('Y-m-d H:i') : null,
+            'created_by' => $doc->createdBy?->name,
+            'items' => $doc->items->map(function ($item) use ($inventoryMap) {
+                $key = $item->product_id . '-' . $item->batch_number;
+                $inv = $inventoryMap->get($key);
+                
+                return [
+                    'id' => (string) $item->id,
+                    'product_name' => $item->product->name,
+                    'product_code' => $item->product->code,
+                    'batch_number' => $item->batch_number,
+                    'expiry_date' => $inv && $inv->expiry_date ? $inv->expiry_date->format('Y-m-d') : null, // 新增效期
+                    'unit' => $item->product->baseUnit?->name,
+                    'system_qty' => (float) $item->system_qty,
+                    'counted_qty' => is_null($item->counted_qty) ? '' : (float) $item->counted_qty,
+                    'diff_qty' => (float) $item->diff_qty,
+                    'notes' => $item->notes,
+                ];
+            }),
+        ];
+
+        return Inertia::render('Inventory/Count/Show', [
+            'doc' => $docData,
+        ]);
+    }
+
+    public function print(InventoryCountDoc $doc)
+    {
+        $doc->load(['items.product.baseUnit', 'createdBy', 'completedBy', 'warehouse']);
+
+        $docData = [
+            'id' => (string) $doc->id,
+            'doc_no' => $doc->doc_no,
+            'warehouse_name' => $doc->warehouse->name,
+            'snapshot_date' => $doc->snapshot_date ? $doc->snapshot_date->format('Y-m-d') : date('Y-m-d'), // Use date only
+            'created_at' => $doc->created_at->format('Y-m-d'),
+            'print_date' => date('Y-m-d'),
+            'created_by' => $doc->createdBy?->name,
+            'items' => $doc->items->map(function ($item) {
+                return [
+                    'id' => (string) $item->id,
+                    'product_name' => $item->product->name,
+                    'product_code' => $item->product->code,
+                    'specification' => $item->product->specification,
+                    'unit' => $item->product->baseUnit?->name,
+                    'quantity' => (float) ($item->counted_qty ?? $item->system_qty), // Default to system qty if counted is null, or just counted? User wants "Count Sheet" -> maybe blank if not counted?
+                    // Actually, if it's "Completed", we show counted. If it's "Pending", we usually show blank or system.
+                    // The 'Show' page logic suggests we show counted_qty.
+                    'counted_qty' => $item->counted_qty,
+                    'notes' => $item->notes,
+                ];
+            }),
+        ];
+
+        return Inertia::render('Inventory/Count/Print', [
+            'doc' => $docData,
+        ]);
+    }
+
+    public function update(Request $request, InventoryCountDoc $doc)
+    {
+        if ($doc->status === 'completed') {
+            return redirect()->back()->with('error', '此盤點單已完成，無法修改');
+        }
+
+        $validated = $request->validate([
+            'items' => 'array',
+            'items.*.id' => 'required|exists:inventory_count_items,id',
+            'items.*.counted_qty' => 'nullable|numeric|min:0',
+            'items.*.notes' => 'nullable|string',
+        ]);
+
+        if (isset($validated['items'])) {
+            $this->countService->updateCount($doc, $validated['items']);
+        }
+
+        // 重新讀取以獲取最新狀態
+        $doc->refresh();
+
+        if ($doc->status === 'completed') {
+            return redirect()->route('inventory.count.index')
+                ->with('success', '盤點完成，單據已自動存檔並完成。');
+        }
+
+        return redirect()->back()->with('success', '盤點資料已暫存');
+    }
+
+    public function reopen(InventoryCountDoc $doc)
+    {
+        // 權限檢查 (通常僅允許有權限者執行，例如 inventory.adjust)
+        // 注意：前端已經用 <Can> 保護按鈕，後端這裡最好也加上檢查
+        if (!auth()->user()->can('inventory.adjust')) {
+            abort(403);
+        }
+
+        if (!in_array($doc->status, ['completed', 'no_adjust'])) {
+            return redirect()->back()->with('error', '僅能針對已完成或無需盤調的盤點單重新開啟盤點');
+        }
+        
+        // 執行取消核准邏輯
+        $doc->update([
+            'status' => 'counting',    // 回復為盤點中
+            'completed_at' => null,    // 清除完成時間
+            'completed_by' => null,    // 清除完成者
+        ]);
+
+        return redirect()->back()->with('success', '已重新開啟盤點，單據回復為盤點中狀態');
+    }
+
+    public function destroy(InventoryCountDoc $doc)
+    {
+        if ($doc->status === 'completed') {
+            return redirect()->back()->with('error', '已完成的盤點單無法刪除');
+        }
+
+        // Activity Log handled by Model Trait
+
+        $doc->items()->delete();
+        $doc->delete();
+
+        return redirect()->route('inventory.count.index')
+            ->with('success', '盤點單已刪除');
+    }
+}
--- a/app/Modules/Inventory/Controllers/GoodsReceiptController.php
+++ b/app/Modules/Inventory/Controllers/GoodsReceiptController.php
@@ -0,0 +1,248 @@
+<?php
+
+namespace App\Modules\Inventory\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Modules\Inventory\Services\GoodsReceiptService;
+use App\Modules\Inventory\Services\InventoryService;
+use App\Modules\Procurement\Contracts\ProcurementServiceInterface;
+use Illuminate\Http\Request;
+use App\Modules\Procurement\Models\Vendor;
+use Inertia\Inertia;
+use App\Modules\Inventory\Models\GoodsReceipt;
+
+class GoodsReceiptController extends Controller
+{
+    protected $goodsReceiptService;
+    protected $inventoryService;
+    protected $procurementService;
+
+    public function __construct(
+        GoodsReceiptService $goodsReceiptService,
+        InventoryService $inventoryService,
+        ProcurementServiceInterface $procurementService
+    ) {
+        $this->goodsReceiptService = $goodsReceiptService;
+        $this->inventoryService = $inventoryService;
+        $this->procurementService = $procurementService;
+    }
+
+    public function index(Request $request)
+    {
+        $query = GoodsReceipt::query()
+            ->select(['id', 'code', 'type', 'warehouse_id', 'vendor_id', 'received_date', 'status', 'created_at'])
+            ->with(['warehouse'])
+            ->withSum('items', 'total_amount');
+
+        // 關鍵字搜尋（單號）
+        if ($request->filled('search')) {
+            $search = $request->input('search');
+            $query->where('code', 'like', "%{$search}%");
+        }
+
+        // 狀態篩選
+        if ($request->filled('status') && $request->input('status') !== 'all') {
+            $query->where('status', $request->input('status'));
+        }
+
+        // 倉庫篩選
+        if ($request->filled('warehouse_id') && $request->input('warehouse_id') !== 'all') {
+            $query->where('warehouse_id', $request->input('warehouse_id'));
+        }
+
+        // 日期範圍篩選
+        if ($request->filled('date_start')) {
+            $query->whereDate('received_date', '>=', $request->input('date_start'));
+        }
+        if ($request->filled('date_end')) {
+            $query->whereDate('received_date', '<=', $request->input('date_end'));
+        }
+
+        // 每頁筆數
+        $perPage = $request->input('per_page', 10);
+
+        $receipts = $query->orderBy('created_at', 'desc')
+            ->paginate($perPage)
+            ->withQueryString();
+
+        // Manual Hydration for Vendors (Cross-Module)
+        $vendorIds = collect($receipts->items())->pluck('vendor_id')->unique()->filter()->toArray();
+        $vendors = $this->procurementService->getVendorsByIds($vendorIds)->keyBy('id');
+
+        $receipts->getCollection()->transform(function ($receipt) use ($vendors) {
+            $receipt->vendor = $vendors->get($receipt->vendor_id);
+            return $receipt;
+        });
+
+        // 取得倉庫列表用於篩選
+        $warehouses = $this->inventoryService->getAllWarehouses();
+
+        return Inertia::render('Inventory/GoodsReceipt/Index', [
+            'receipts' => $receipts,
+            'filters' => $request->only(['search', 'status', 'warehouse_id', 'date_start', 'date_end', 'per_page']),
+            'warehouses' => $warehouses,
+        ]);
+    }
+
+    public function show($id)
+    {
+        $receipt = GoodsReceipt::with([
+            'warehouse',
+            'items.product.category',
+            'items.product.baseUnit'
+        ])->findOrFail($id);
+
+        // Manual Hydration for Vendor (Cross-Module)
+        if ($receipt->vendor_id) {
+            $receipt->vendor = $this->procurementService->getVendorsByIds([$receipt->vendor_id])->first();
+        }
+
+        // 手動計算統計資訊 (如果 Model 沒有定義對應的 Attribute)
+        $receipt->items_sum_total_amount = $receipt->items->sum('total_amount');
+
+        return Inertia::render('Inventory/GoodsReceipt/Show', [
+            'receipt' => $receipt
+        ]);
+    }
+
+    public function create()
+    {
+        // 取得待進貨的採購單列表（用於標準採購類型選擇）
+        $pendingPOs = $this->procurementService->getPendingPurchaseOrders();
+        
+        // 提取所有產品 ID 以便跨模組水和資料
+        $productIds = $pendingPOs->flatMap(fn($po) => $po->items->pluck('product_id'))->unique()->filter()->toArray();
+        $products = $this->inventoryService->getProductsByIds($productIds)->keyBy('id');
+
+        // 處理採購單資料，計算剩餘可收貨數量
+        $formattedPOs = $pendingPOs->map(function ($po) use ($products) {
+            return [
+                'id' => $po->id,
+                'code' => $po->code,
+                'status' => $po->status,
+                'vendor_id' => $po->vendor_id,
+                'vendor_name' => $po->vendor?->name ?? '',
+                'warehouse_id' => $po->warehouse_id,
+                'order_date' => $po->order_date,
+                'items' => $po->items->map(function ($item) use ($products) {
+                    $product = $products->get($item->product_id);
+                    $remaining = max(0, $item->quantity - ($item->received_quantity ?? 0));
+                    return [
+                        'id' => $item->id,
+                        'product_id' => $item->product_id,
+                        'product_name' => $product?->name ?? '',
+                        'product_code' => $product?->code ?? '',
+                        'unit' => $product?->baseUnit?->name ?? '個',
+                        'quantity' => $item->quantity,
+                        'received_quantity' => $item->received_quantity ?? 0,
+                        'remaining' => $remaining,
+                        'unit_price' => $item->unit_price,
+                    ];
+                })->filter(fn($item) => $item['remaining'] > 0)->values(),
+            ];
+        })->filter(fn($po) => $po['items']->count() > 0)->values();
+
+        // 取得所有廠商列表（用於雜項入庫/其他類型選擇）
+        $vendors = $this->procurementService->getAllVendors();
+
+        return Inertia::render('Inventory/GoodsReceipt/Create', [
+            'warehouses' => $this->inventoryService->getAllWarehouses(),
+            'pendingPurchaseOrders' => $formattedPOs,
+            'vendors' => $vendors,
+        ]);
+    }
+
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'warehouse_id' => 'required|exists:warehouses,id',
+            'type' => 'required|in:standard,miscellaneous,other',
+            'purchase_order_id' => 'nullable|required_if:type,standard|exists:purchase_orders,id',
+            // Vendor ID is required if standard, but optional/nullable for misc/other? 
+            // Stick to existing logic: if standard, we infer vendor from PO usually, or frontend sends it.
+            // For now let's make vendor_id optional for misc/other or user must select one?
+            // "雜項入庫" might not have a vendor. Let's make it nullable.
+            'vendor_id' => 'nullable|integer',
+            'received_date' => 'required|date',
+            'remarks' => 'nullable|string',
+            'items' => 'required|array|min:1',
+            'items.*.product_id' => 'required|integer|exists:products,id',
+            'items.*.purchase_order_item_id' => 'nullable|required_if:type,standard|integer',
+            'items.*.quantity_received' => 'required|numeric|min:0',
+            'items.*.unit_price' => 'required|numeric|min:0',
+            'items.*.batch_number' => 'nullable|string',
+            'items.*.expiry_date' => 'nullable|date',
+        ]);
+
+        $this->goodsReceiptService->store($validated);
+
+        return redirect()->route('goods-receipts.index')->with('success', '進貨單已建立');
+    }
+
+    // API to search POs
+    public function searchPOs(Request $request)
+    {
+        $search = $request->input('query');
+        if (!$search) {
+            return response()->json([]);
+        }
+
+        $pos = $this->procurementService->searchPendingPurchaseOrders($search);
+        
+        return response()->json($pos);
+    }
+
+    // API to search Products for Manual Entry
+    public function searchProducts(Request $request)
+    {
+        $search = $request->input('query');
+        if (!$search) {
+            return response()->json([]);
+        }
+
+        $products = $this->inventoryService->getProductsByName($search);
+        
+        // Format for frontend
+        $mapped = $products->map(function($product) {
+            return [
+                'id' => $product->id,
+                'name' => $product->name,
+                'code' => $product->code,
+                'unit' => $product->baseUnit?->name ?? '個', // Ensure unit is included
+                'price' => $product->purchase_price ?? 0, // Suggest price from product info if available
+            ];
+        });
+
+        return response()->json($mapped);
+    }
+
+    // API to search Vendors
+    public function searchVendors(Request $request)
+    {
+        $search = $request->input('query');
+        if (!$search) {
+            return response()->json([]);
+        }
+
+        $vendors = $this->procurementService->searchVendors($search);
+        
+        return response()->json($vendors);
+    }
+
+    /**
+     * 刪除進貨單
+     */
+    public function destroy(GoodsReceipt $goodsReceipt)
+    {
+        // 只有有權限的人可以刪除
+        if (!auth()->user()->can('goods_receipts.delete')) {
+            return redirect()->back()->with('error', '您沒有權限刪除進貨單');
+        }
+
+        // 簡單刪除邏輯：刪除進貨單（品項由資料庫級聯刪除或手動處理）
+        // 注意：實務上可能需要處理已入庫的庫存回滾，但在這個簡易 ERP 中通常是行政刪除
+        $goodsReceipt->delete();
+
+        return redirect()->route('goods-receipts.index')->with('success', '進貨單已刪除');
+    }
+}
--- a/app/Modules/Inventory/Controllers/InventoryController.php
+++ b/app/Modules/Inventory/Controllers/InventoryController.php
@@ -10,7 +10,12 @@ use Inertia\Inertia;
 use App\Modules\Inventory\Models\Warehouse;
 use App\Modules\Inventory\Models\Product;
 use App\Modules\Inventory\Models\Inventory;
+use App\Modules\Inventory\Models\InventoryTransaction;
 use App\Modules\Inventory\Models\WarehouseProductSafetyStock;
+use App\Modules\Inventory\Imports\InventoryImport;
+use App\Modules\Inventory\Exports\InventoryTemplateExport;
+use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;

 use App\Modules\Core\Contracts\CoreServiceInterface;

@@ -48,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');
@@ -93,9 +104,10 @@ class InventoryController extends Controller
                        'safetyStock' => null, // 批號層級不再有安全庫存
                        'status' => '正常',
                        'batchNumber' => $inv->batch_number ?? 'BATCH-' . $inv->id,
+                        'location' => $inv->location,
                        'expiryDate' => $inv->expiry_date ? $inv->expiry_date->format('Y-m-d') : null,
-                        'lastInboundDate' => $inv->lastIncomingTransaction ? ($inv->lastIncomingTransaction->actual_time ? $inv->lastIncomingTransaction->actual_time->format('Y-m-d') : $inv->lastIncomingTransaction->created_at->format('Y-m-d')) : null,
-                        'lastOutboundDate' => $inv->lastOutgoingTransaction ? ($inv->lastOutgoingTransaction->actual_time ? $inv->lastOutgoingTransaction->actual_time->format('Y-m-d') : $inv->lastOutgoingTransaction->created_at->format('Y-m-d')) : null,
+                        'lastInboundDate' => $inv->lastIncomingTransaction ? ($inv->lastIncomingTransaction->actual_time ? substr($inv->lastIncomingTransaction->actual_time, 0, 10) : $inv->lastIncomingTransaction->created_at->format('Y-m-d')) : null,
+                        'lastOutboundDate' => $inv->lastOutgoingTransaction ? ($inv->lastOutgoingTransaction->actual_time ? substr($inv->lastOutgoingTransaction->actual_time, 0, 10) : $inv->lastOutgoingTransaction->created_at->format('Y-m-d')) : null,
                    ];
                })->values(),
            ];
@@ -130,16 +142,18 @@ class InventoryController extends Controller
    {
       // ... (unchanged) ...
        $products = Product::with(['baseUnit', 'largeUnit'])
-            ->select('id', 'name', 'code', 'base_unit_id', 'large_unit_id', 'conversion_rate')
+            ->select('id', 'name', 'code', 'barcode', 'base_unit_id', 'large_unit_id', 'conversion_rate', 'cost_price')
            ->get()
            ->map(function ($product) {
            return [
                'id' => (string) $product->id,
                'name' => $product->name,
                'code' => $product->code,
+                'barcode' => $product->barcode,
                'baseUnit' => $product->baseUnit?->name ?? '個',
                'largeUnit' => $product->largeUnit?->name, // 可能為 null
                'conversionRate' => (float) $product->conversion_rate,
+                'costPrice' => (float) $product->cost_price,
            ];
        });

@@ -160,10 +174,11 @@ class InventoryController extends Controller
            'items.*.productId' => 'required|exists:products,id',
            'items.*.quantity' => 'required|numeric|min:0.01',
            'items.*.unit_cost' => 'nullable|numeric|min:0', // 新增成本驗證
-            'items.*.batchMode' => 'required|in:existing,new',
+            'items.*.batchMode' => 'required|in:existing,new,none',
            'items.*.inventoryId' => 'required_if:items.*.batchMode,existing|nullable|exists:inventories,id',
            'items.*.originCountry' => 'required_if:items.*.batchMode,new|nullable|string|max:2',
            'items.*.expiryDate' => 'nullable|date',
+            'items.*.location' => 'nullable|string|max:50',
        ]);

        return DB::transaction(function () use ($validated, $warehouse) {
@@ -185,6 +200,26 @@ class InventoryController extends Controller
                    if (isset($item['unit_cost'])) {
                        $inventory->unit_cost = $item['unit_cost'];
                    }
+                } elseif ($item['batchMode'] === 'none') {
+                    // 模式 C：不使用批號 (自動累加至 NO-BATCH)
+                    $inventory = $warehouse->inventories()->withTrashed()->firstOrNew(
+                        [
+                            'product_id' => $item['productId'],
+                            'batch_number' => 'NO-BATCH'
+                        ],
+                        [
+                            'quantity' => 0,
+                            'unit_cost' => $item['unit_cost'] ?? 0,
+                            'total_value' => 0,
+                            'arrival_date' => $validated['inboundDate'],
+                            'expiry_date' => null,
+                            'origin_country' => 'TW',
+                        ]
+                    );
+
+                    if ($inventory->trashed()) {
+                        $inventory->restore();
+                    }
                } else {
                    // 模式 B：建立新批號
                    $originCountry = $item['originCountry'] ?? 'TW';
@@ -206,6 +241,7 @@ class InventoryController extends Controller
                            'quantity' => 0,
                            'unit_cost' => $item['unit_cost'] ?? 0, // 新增
                            'total_value' => 0, // 稍後計算
+                            'location' => $item['location'] ?? null,
                            'arrival_date' => $validated['inboundDate'],
                            'expiry_date' => $item['expiryDate'] ?? null,
                            'origin_country' => $originCountry,
@@ -259,7 +295,8 @@ class InventoryController extends Controller
                    'originCountry' => $inventory->origin_country,
                    'expiryDate' => $inventory->expiry_date ? $inventory->expiry_date->format('Y-m-d') : null,
                    'quantity' => (float) $inventory->quantity,
-                    'unitCost' => (float) $inventory->unit_cost, // 新增
+                    'unitCost' => (float) $inventory->unit_cost,
+                    'location' => $inventory->location,
                ];
            });

@@ -323,7 +360,7 @@ class InventoryController extends Controller
                'balanceAfter' => (float) $tx->balance_after,
                'reason' => $tx->reason,
                'userName' => $user ? $user->name : '系統', // 手動對應
-                'actualTime' => $tx->actual_time ? $tx->actual_time->format('Y-m-d H:i') : $tx->created_at->format('Y-m-d H:i'),
+                'actualTime' => $tx->actual_time ? substr($tx->actual_time, 0, 16) : $tx->created_at->format('Y-m-d H:i'),
            ];
        });

@@ -482,7 +519,61 @@ class InventoryController extends Controller
        $productId = $request->query('productId');

        if ($productId) {
-            // ... (略) ...
+            $product = Product::findOrFail($productId);
+            // 取得該倉庫中該商品的所有批號 ID
+            $inventoryIds = Inventory::where('warehouse_id', $warehouse->id)
+                ->where('product_id', $productId)
+                ->pluck('id')
+                ->toArray();
+
+            $transactionsRaw = InventoryTransaction::whereIn('inventory_id', $inventoryIds)
+                ->with('inventory') // 需要批號資訊
+                ->orderBy('actual_time', 'desc')
+                ->orderBy('id', 'desc')
+                ->get();
+
+            // 手動 Hydrate 使用者資料
+            $userIds = $transactionsRaw->pluck('user_id')->filter()->unique()->toArray();
+            $users = $this->coreService->getUsersByIds($userIds)->keyBy('id');
+
+            // 計算商品在該倉庫的總量（不分批號）
+            $currentRunningTotal = (float) Inventory::whereIn('id', $inventoryIds)->sum('quantity');
+
+            $transactions = $transactionsRaw->map(function ($tx) use ($users, &$currentRunningTotal) {
+                $user = $tx->user_id ? ($users[$tx->user_id] ?? null) : null;
+                $balanceAfter = $currentRunningTotal;
+                
+                // 為下一筆（較舊的）紀錄更新 Running Total
+                $currentRunningTotal -= (float) $tx->quantity;
+
+                return [
+                    'id' => (string) $tx->id,
+                    'type' => $tx->type,
+                    'quantity' => (float) $tx->quantity,
+                    'unit_cost' => (float) $tx->unit_cost, 
+                    'balanceAfter' => (float) $balanceAfter, // 顯示該商品在倉庫的累計結餘
+                    'reason' => $tx->reason,
+                    'userName' => $user ? $user->name : '系統',
+                    'actualTime' => $tx->actual_time ? substr($tx->actual_time, 0, 16) : $tx->created_at->format('Y-m-d H:i'),
+                    'batchNumber' => $tx->inventory?->batch_number ?? '-', // 補上批號資訊
+                    'slot' => $tx->inventory?->location, // 加入貨道資訊
+                ];
+            });
+
+            // 重新計算目前的總量（用於 Header 顯示，確保一致性）
+            $totalQuantity = Inventory::whereIn('id', $inventoryIds)->sum('quantity');
+
+            return Inertia::render('Warehouse/InventoryHistory', [
+                'warehouse' => $warehouse,
+                'inventory' => [
+                    'id' => null, // 跨批號查詢沒有單一 ID
+                    'productName' => $product->name,
+                    'productCode' => $product->code,
+                    'batchNumber' => '所有批號',
+                    'quantity' => (float) $totalQuantity,
+                ],
+                'transactions' => $transactions
+            ]);
        }

        if ($inventoryId) {
@@ -496,7 +587,7 @@ class InventoryController extends Controller
            $userIds = $inventory->transactions->pluck('user_id')->filter()->unique()->toArray();
            $users = $this->coreService->getUsersByIds($userIds)->keyBy('id');

-            $transactions = $inventory->transactions->map(function ($tx) use ($users) {
+            $transactions = $inventory->transactions->map(function ($tx) use ($users, $inventory) {
                $user = $tx->user_id ? ($users[$tx->user_id] ?? null) : null;
                return [
                    'id' => (string) $tx->id,
@@ -506,7 +597,8 @@ class InventoryController extends Controller
                    'balanceAfter' => (float) $tx->balance_after,
                    'reason' => $tx->reason,
                    'userName' => $user ? $user->name : '系統', // 手動對應
-                    'actualTime' => $tx->actual_time ? $tx->actual_time->format('Y-m-d H:i') : $tx->created_at->format('Y-m-d H:i'),
+                    'actualTime' => $tx->actual_time ? substr($tx->actual_time, 0, 16) : $tx->created_at->format('Y-m-d H:i'),
+                    'slot' => $inventory->location, // 加入貨道資訊
                ];
            });

@@ -527,4 +619,35 @@ class InventoryController extends Controller

        return redirect()->back()->with('error', '未提供查詢參數');
    }
+
+    /**
+     * 匯入入庫
+     */
+    public function import(Request $request, Warehouse $warehouse)
+    {
+        $request->validate([
+            'file' => 'required|mimes:xlsx,xls,csv',
+            'inboundDate' => 'required|date',
+            'notes' => 'nullable|string',
+        ]);
+
+        try {
+            Excel::import(
+                new InventoryImport($warehouse, $request->inboundDate, $request->notes),
+                $request->file('file')
+            );
+
+            return back()->with('success', '庫存資料匯入成功');
+        } catch (\Exception $e) {
+            return back()->withErrors(['file' => '匯入過程中發生錯誤: ' . $e->getMessage()]);
+        }
+    }
+
+    /**
+     * 下載匯入範本 (.xlsx)
+     */
+    public function template()
+    {
+        return Excel::download(new InventoryTemplateExport, '庫存匯入範本.xlsx');
+    }
 }
--- a/app/Modules/Inventory/Controllers/InventoryReportController.php
+++ b/app/Modules/Inventory/Controllers/InventoryReportController.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Modules\Inventory\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Modules\Inventory\Models\Category;
+use App\Modules\Inventory\Models\Warehouse;
+use App\Modules\Inventory\Services\InventoryReportService;
+use App\Modules\Inventory\Exports\InventoryReportExport;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use Maatwebsite\Excel\Facades\Excel;
+
+
+class InventoryReportController extends Controller
+{
+    protected $reportService;
+
+    public function __construct(InventoryReportService $reportService)
+    {
+        $this->reportService = $reportService;
+    }
+
+    public function index(Request $request)
+    {
+        $filters = $request->only([
+            'date_from', 'date_to', 'warehouse_id', 'category_id', 'search', 'per_page',
+            'sort_by', 'sort_order'
+        ]);
+
+        if (!isset($filters['date_from'])) {
+            $filters['date_from'] = date('Y-m-d');
+        }
+        if (!isset($filters['date_to'])) {
+            $filters['date_to'] = date('Y-m-d');
+        }
+
+        $reportData = $this->reportService->getReportData($filters, $request->input('per_page', 10));
+        $summary = $this->reportService->getSummary($filters);
+
+        return Inertia::render('Inventory/Report/Index', [
+            'reportData' => $reportData,
+            'summary' => $summary,
+            'warehouses' => Warehouse::select('id', 'name')->get(),
+            'categories' => Category::select('id', 'name')->get(),
+            'filters' => $filters,
+        ]);
+    }
+
+    public function export(Request $request)
+    {
+        $filters = $request->only([
+            'period', 'date_from', 'date_to', 'warehouse_id', 'category_id', 'search'
+        ]);
+
+        return Excel::download(new InventoryReportExport($this->reportService, $filters), 'inventory_report_' . date('YmdHis') . '.xlsx');
+    }
+
+    public function show(Request $request, $productId)
+    {
+        // 明細頁面自身使用的篩選條件
+        $filters = $request->only([
+            'date_from', 'date_to', 'warehouse_id'
+        ]);
+
+        // 報表頁面的完整篩選狀態（用於返回時恢復）
+        $reportFilters = $request->only([
+            'date_from', 'date_to', 'warehouse_id',
+            'category_id', 'search', 'per_page'
+        ]);
+        // 將傳入的 report_page 轉回 page 以便 Link 元件正確生成回報表頁的連結
+        if ($request->has('report_page')) {
+            $reportFilters['page'] = $request->input('report_page');
+        }
+
+        // 取得商品資訊 (用於顯示標題，含基本單位)
+        $product = \App\Modules\Inventory\Models\Product::with('baseUnit')->findOrFail($productId);
+        
+        $transactions = $this->reportService->getProductDetails($productId, $filters, 20);
+
+        return Inertia::render('Inventory/Report/Show', [
+            'product' => [
+                'id' => $product->id,
+                'code' => $product->code,
+                'name' => $product->name,
+                'unit_name' => $product->baseUnit?->name ?? '-',
+            ],
+            'transactions' => $transactions,
+            'filters' => $filters,
+            'reportFilters' => $reportFilters,
+            'warehouses' => Warehouse::select('id', 'name')->get(),
+        ]);
+    }
+}
--- a/app/Modules/Inventory/Controllers/ProductController.php
+++ b/app/Modules/Inventory/Controllers/ProductController.php
@@ -10,6 +10,9 @@ use App\Modules\Inventory\Models\Category;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Inertia\Response;
+use Maatwebsite\Excel\Facades\Excel;
+use App\Modules\Inventory\Exports\ProductTemplateExport;
+use App\Modules\Inventory\Imports\ProductImport;

 class ProductController extends Controller
 {
@@ -25,6 +28,7 @@ class ProductController extends Controller
            $query->where(function ($q) use ($search) {
                $q->where('name', 'like', "%{$search}%")
                  ->orWhere('code', 'like', "%{$search}%")
+                  ->orWhere('barcode', 'like', "%{$search}%")
                  ->orWhere('brand', 'like', "%{$search}%");
            });
        }
@@ -66,6 +70,7 @@ class ProductController extends Controller
            return (object) [
                'id' => (string) $product->id,
                'code' => $product->code,
+                'barcode' => $product->barcode,
                'name' => $product->name,
                'categoryId' => $product->category_id,
                'category' => $product->category ? (object) [
@@ -90,6 +95,12 @@ class ProductController extends Controller
                    'name' => $product->purchaseUnit->name,
                ] : null,
                'conversionRate' => (float) $product->conversion_rate,
+                'location' => $product->location,
+                'cost_price' => (float) $product->cost_price,
+                'price' => (float) $product->price,
+                'member_price' => (float) $product->member_price,
+                'wholesale_price' => (float) $product->wholesale_price,
+                'is_active' => (bool) $product->is_active,
            ];
        });

@@ -103,39 +114,126 @@ class ProductController extends Controller
        ]);
    }

+    /**
+     * 顯示指定的資源。
+     */
+    public function show(Product $product): Response
+    {
+        return Inertia::render('Product/Show', [
+            'product' => (object) [
+                'id' => (string) $product->id,
+                'code' => $product->code,
+                'barcode' => $product->barcode,
+                'name' => $product->name,
+                'categoryId' => $product->category_id,
+                'category' => $product->category ? (object) [
+                    'id' => $product->category->id,
+                    'name' => $product->category->name,
+                ] : null,
+                'brand' => $product->brand,
+                'specification' => $product->specification,
+                'baseUnitId' => $product->base_unit_id,
+                'baseUnit' => $product->baseUnit ? (object) [
+                    'id' => $product->baseUnit->id,
+                    'name' => $product->baseUnit->name,
+                ] : null,
+                'largeUnitId' => $product->large_unit_id,
+                'largeUnit' => $product->largeUnit ? (object) [
+                    'id' => $product->largeUnit->id,
+                    'name' => $product->largeUnit->name,
+                ] : null,
+                'purchaseUnitId' => $product->purchase_unit_id,
+                'purchaseUnit' => $product->purchaseUnit ? (object) [
+                    'id' => $product->purchaseUnit->id,
+                    'name' => $product->purchaseUnit->name,
+                ] : null,
+                'conversionRate' => (float) $product->conversion_rate,
+                'location' => $product->location,
+                'cost_price' => (float) $product->cost_price,
+                'price' => (float) $product->price,
+                'member_price' => (float) $product->member_price,
+                'wholesale_price' => (float) $product->wholesale_price,
+                'is_active' => (bool) $product->is_active,
+            ]
+        ]);
+    }
+
+    /**
+     * 顯示建立表單。
+     */
+    public function create(): Response
+    {
+        return Inertia::render('Product/Create', [
+            'categories' => Category::where('is_active', true)->get()->map(fn($c) => (object)['id' => $c->id, 'name' => $c->name]),
+            'units' => Unit::all()->map(fn($u) => (object)['id' => (string) $u->id, 'name' => $u->name, 'code' => $u->code]),
+        ]);
+    }
+
    /**
     * 將新建立的資源儲存到儲存體中。
     */
    public function store(Request $request)
    {
        $validated = $request->validate([
-            'code' => 'required|string|max:2|unique:products,code',
+            'code' => 'nullable|unique:products,code',
+            'barcode' => 'nullable|unique:products,barcode',
            'name' => 'required|string|max:255',
            'category_id' => 'required|exists:categories,id',
            'brand' => 'nullable|string|max:255',
            'specification' => 'nullable|string',
-
            'base_unit_id' => 'required|exists:units,id',
            'large_unit_id' => 'nullable|exists:units,id',
-            'conversion_rate' => 'required_with:large_unit_id|nullable|numeric|min:0.0001',
            'purchase_unit_id' => 'nullable|exists:units,id',
-        ], [
-            'code.required' => '商品代號為必填',
-            'code.max' => '商品代號最多 2 碼',
-            'code.unique' => '商品代號已存在',
-            'name.required' => '商品名稱為必填',
-            'category_id.required' => '請選擇分類',
-            'category_id.exists' => '所選分類不存在',
-            'base_unit_id.required' => '基本庫存單位為必填',
-            'base_unit_id.exists' => '所選基本單位不存在',
-            'conversion_rate.required_with' => '填寫大單位時，換算率為必填',
-            'conversion_rate.numeric' => '換算率必須為數字',
-            'conversion_rate.min' => '換算率最小為 0.0001',
+            'conversion_rate' => 'nullable|numeric|min:0',
+            'location' => 'nullable|string|max:255',
+            'cost_price' => 'nullable|numeric|min:0',
+            'price' => 'nullable|numeric|min:0',
+            'member_price' => 'nullable|numeric|min:0',
+            'wholesale_price' => 'nullable|numeric|min:0',
+            'is_active' => 'boolean',
        ]);
-        
+
+        if (empty($validated['code'])) {
+            $validated['code'] = $this->generateRandomCode();
+        }
+
+        if (empty($validated['barcode'])) {
+            $validated['barcode'] = $this->generateRandomBarcode();
+        }
+
        $product = Product::create($validated);

-        return redirect()->back()->with('success', '商品已建立');
+        return redirect()->route('products.index')->with('success', '商品已建立');
+    }
+
+    /**
+     * 顯示編輯表單。
+     */
+    public function edit(Product $product): Response
+    {
+        return Inertia::render('Product/Edit', [
+            'product' => (object) [
+                'id' => (string) $product->id,
+                'code' => $product->code,
+                'barcode' => $product->barcode,
+                'name' => $product->name,
+                'categoryId' => $product->category_id,
+                'brand' => $product->brand,
+                'specification' => $product->specification,
+                'baseUnitId' => $product->base_unit_id,
+                'largeUnitId' => $product->large_unit_id,
+                'conversionRate' => (float) $product->conversion_rate,
+                'purchaseUnitId' => $product->purchase_unit_id,
+                'location' => $product->location,
+                'cost_price' => (float) $product->cost_price,
+                'price' => (float) $product->price,
+                'member_price' => (float) $product->member_price,
+                'wholesale_price' => (float) $product->wholesale_price,
+                'is_active' => (bool) $product->is_active,
+            ],
+            'categories' => Category::where('is_active', true)->get()->map(fn($c) => (object)['id' => $c->id, 'name' => $c->name]),
+            'units' => Unit::all()->map(fn($u) => (object)['id' => (string) $u->id, 'name' => $u->name, 'code' => $u->code]),
+        ]);
    }

    /**
@@ -144,32 +242,39 @@ class ProductController extends Controller
    public function update(Request $request, Product $product)
    {
        $validated = $request->validate([
-            'code' => 'required|string|max:2|unique:products,code,' . $product->id,
+            'code' => 'nullable|unique:products,code,' . $product->id,
+            'barcode' => 'nullable|unique:products,barcode,' . $product->id,
            'name' => 'required|string|max:255',
            'category_id' => 'required|exists:categories,id',
            'brand' => 'nullable|string|max:255',
            'specification' => 'nullable|string',
            'base_unit_id' => 'required|exists:units,id',
            'large_unit_id' => 'nullable|exists:units,id',
-            'conversion_rate' => 'required_with:large_unit_id|nullable|numeric|min:0.0001',
            'purchase_unit_id' => 'nullable|exists:units,id',
-        ], [
-            'code.required' => '商品代號為必填',
-            'code.max' => '商品代號最多 2 碼',
-            'code.unique' => '商品代號已存在',
-            'name.required' => '商品名稱為必填',
-            'category_id.required' => '請選擇分類',
-            'category_id.exists' => '所選分類不存在',
-            'base_unit_id.required' => '基本庫存單位為必填',
-            'base_unit_id.exists' => '所選基本單位不存在',
-            'conversion_rate.required_with' => '填寫大單位時，換算率為必填',
-            'conversion_rate.numeric' => '換算率必須為數字',
-            'conversion_rate.min' => '換算率最小為 0.0001',
+            'conversion_rate' => 'nullable|numeric|min:0',
+            'location' => 'nullable|string|max:255',
+            'cost_price' => 'nullable|numeric|min:0',
+            'price' => 'nullable|numeric|min:0',
+            'member_price' => 'nullable|numeric|min:0',
+            'wholesale_price' => 'nullable|numeric|min:0',
+            'is_active' => 'boolean',
        ]);

+        if (empty($validated['code'])) {
+            $validated['code'] = $this->generateRandomCode();
+        }
+
+        if (empty($validated['barcode'])) {
+            $validated['barcode'] = $this->generateRandomBarcode();
+        }
+
        $product->update($validated);

-        return redirect()->back()->with('success', '商品已更新');
+        if ($request->input('from') === 'show') {
+            return redirect()->route('products.show', $product->id)->with('success', '商品已更新');
+        }
+
+        return redirect()->route('products.index')->with('success', '商品已更新');
    }

    /**
@@ -181,4 +286,71 @@ class ProductController extends Controller

        return redirect()->back()->with('success', '商品已刪除');
    }
+
+    /**
+     * 下載匯入範本
+     */
+    public function template()
+    {
+        return Excel::download(new ProductTemplateExport, 'products_template.xlsx');
+    }
+
+    /**
+     * 匯入商品
+     */
+    public function import(Request $request)
+    {
+        $request->validate([
+            'file' => 'required|file|mimes:xlsx,xls',
+        ]);
+
+        try {
+            Excel::import(new ProductImport, $request->file('file'));
+            return redirect()->back()->with('success', '商品匯入成功');
+        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+            $failures = $e->failures();
+            $messages = [];
+            foreach ($failures as $failure) {
+                $messages[] = '第 ' . $failure->row() . ' 行: ' . implode(', ', $failure->errors());
+            }
+            return redirect()->back()->withErrors(['file' => implode("\n", $messages)]);
+        } catch (\Exception $e) {
+            return redirect()->back()->withErrors(['file' => '匯入失敗: ' . $e->getMessage()]);
+        }
+    }
+
+    /**
+     * 生成隨機 8 碼代號 (大寫英文+數字)
+     */
+    private function generateRandomCode(): string
+    {
+        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        $code = '';
+        
+        do {
+            $code = '';
+            for ($i = 0; $i < 8; $i++) {
+                $code .= $characters[rand(0, strlen($characters) - 1)];
+            }
+        } while (Product::where('code', $code)->exists());
+
+        return $code;
+    }
+
+    /**
+     * 生成隨機 13 碼條碼 (純數字)
+     */
+    private function generateRandomBarcode(): string
+    {
+        $barcode = '';
+        
+        do {
+            $barcode = '';
+            for ($i = 0; $i < 13; $i++) {
+                $barcode .= rand(0, 9);
+            }
+        } while (Product::where('barcode', $barcode)->exists());
+
+        return $barcode;
+    }
 }
--- a/app/Modules/Inventory/Controllers/SafetyStockController.php
+++ b/app/Modules/Inventory/Controllers/SafetyStockController.php
@@ -31,7 +31,51 @@ class SafetyStockController extends Controller
            ];
        });

-        // 準備現有庫存列表 (用於庫存量對比)
+        // 獲取現有庫存 (用於抓取「已在倉庫中」的商品)
+        $inventoryProductIds = Inventory::where('warehouse_id', $warehouse->id)->pluck('product_id')->unique();
+
+        // 準備安全庫存設定列表 (從資料庫讀取)
+        $existingSettings = WarehouseProductSafetyStock::where('warehouse_id', $warehouse->id)
+            ->with(['product.category', 'product.baseUnit'])
+            ->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,
+                'productId' => (string) $setting->product_id,
+                'productName' => $setting->product->name,
+                'productType' => $setting->product->category ? $setting->product->category->name : '其他',
+                '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')
@@ -43,23 +87,6 @@ class SafetyStockController extends Controller
                ];
            });

-        // 準備安全庫存設定列表 (從新表格讀取)
-        $safetyStockSettings = WarehouseProductSafetyStock::where('warehouse_id', $warehouse->id)
-            ->with(['product.category', 'product.baseUnit'])
-            ->get()
-            ->map(function ($setting) {
-                return [
-                    'id' => (string) $setting->id,
-                    'warehouseId' => (string) $setting->warehouse_id,
-                    'productId' => (string) $setting->product_id,
-                    'productName' => $setting->product->name,
-                    'productType' => $setting->product->category ? $setting->product->category->name : '其他',
-                    'safetyStock' => (float) $setting->safety_stock,
-                    'unit' => $setting->product->baseUnit?->name ?? '個',
-                    'updatedAt' => $setting->updated_at->toIso8601String(),
-                ];
-            });
-
        return Inertia::render('Warehouse/SafetyStockSettings', [
            'warehouse' => $warehouse,
            'safetyStockSettings' => $safetyStockSettings,
--- a/app/Modules/Inventory/Controllers/StockQueryController.php
+++ b/app/Modules/Inventory/Controllers/StockQueryController.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Modules\Inventory\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Modules\Inventory\Contracts\InventoryServiceInterface;
+use App\Modules\Inventory\Models\Category;
+use App\Modules\Inventory\Models\Warehouse;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+
+class StockQueryController extends Controller
+{
+    protected InventoryServiceInterface $inventoryService;
+
+    public function __construct(InventoryServiceInterface $inventoryService)
+    {
+        $this->inventoryService = $inventoryService;
+    }
+
+    /**
+     * 即時庫存查詢頁面
+     */
+    public function index(Request $request)
+    {
+        $filters = $request->only(['warehouse_id', 'category_id', 'search', 'status', 'sort_by', 'sort_order', 'per_page']);
+        $perPage = (int) ($filters['per_page'] ?? 10);
+
+        $result = $this->inventoryService->getStockQueryData($filters, $perPage);
+
+        return Inertia::render('Inventory/StockQuery/Index', [
+            'filters' => $filters,
+            'summary' => $result['summary'],
+            'inventories' => [
+                'data' => $result['data'],
+                'total' => $result['pagination']['total'],
+                'per_page' => $result['pagination']['per_page'],
+                'current_page' => $result['pagination']['current_page'],
+                'last_page' => $result['pagination']['last_page'],
+                'links' => $result['pagination']['links'],
+            ],
+            'warehouses' => Warehouse::select('id', 'name')->orderBy('name')->get(),
+            'categories' => Category::select('id', 'name')->orderBy('name')->get(),
+        ]);
+    }
+
+    /**
+     * Excel 匯出
+     */
+    public function export(Request $request)
+    {
+        $filters = $request->only(['warehouse_id', 'category_id', 'search', 'status']);
+
+        return \Maatwebsite\Excel\Facades\Excel::download(
+            new \App\Modules\Inventory\Exports\StockQueryExport($filters),
+            '即時庫存查詢_' . now()->format('Ymd_His') . '.xlsx'
+        );
+    }
+}
--- a/app/Modules/Inventory/Controllers/TransferOrderController.php
+++ b/app/Modules/Inventory/Controllers/TransferOrderController.php
@@ -3,135 +3,225 @@
 namespace App\Modules\Inventory\Controllers;

 use App\Http\Controllers\Controller;
-
-use App\Modules\Inventory\Models\Inventory;
+use App\Modules\Inventory\Models\InventoryTransferOrder;
 use App\Modules\Inventory\Models\Warehouse;
+use App\Modules\Inventory\Models\Inventory;
+use App\Modules\Inventory\Services\TransferService;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Validation\ValidationException;
+use Inertia\Inertia;

 class TransferOrderController extends Controller
 {
-    /**
-     * 儲存撥補單（建立調撥單並執行庫存轉移）
-     */
+    protected $transferService;
+
+    public function __construct(TransferService $transferService)
+    {
+        $this->transferService = $transferService;
+    }
+
+    public function index(Request $request)
+    {
+        $query = InventoryTransferOrder::query()
+             ->with(['fromWarehouse', 'toWarehouse', 'createdBy', 'postedBy']);
+
+        // 篩選：若有選定倉庫，則顯示該倉庫作為來源或目的地的調撥單
+        if ($request->filled('warehouse_id')) {
+             $query->where(function ($q) use ($request) {
+                $q->where('from_warehouse_id', $request->warehouse_id)
+                  ->orWhere('to_warehouse_id', $request->warehouse_id);
+            });
+        }
+
+        $perPage = $request->input('per_page', 10);
+        $orders = $query->orderByDesc('created_at')
+            ->paginate($perPage)
+            ->withQueryString()
+            ->through(function ($order) {
+                return [
+                    'id' => (string) $order->id,
+                    'doc_no' => $order->doc_no,
+                    'from_warehouse_name' => $order->fromWarehouse->name,
+                    'to_warehouse_name' => $order->toWarehouse->name,
+                    'status' => $order->status,
+                    'created_at' => $order->created_at->format('Y-m-d H:i'),
+                    'posted_at' => $order->posted_at ? $order->posted_at->format('Y-m-d H:i') : '-',
+                    'created_by' => $order->createdBy?->name,
+                ];
+            });
+
+        return Inertia::render('Inventory/Transfer/Index', [
+            'orders' => $orders,
+            'warehouses' => Warehouse::all()->map(fn($w) => ['id' => (string)$w->id, 'name' => $w->name]),
+            'filters' => $request->only(['warehouse_id', 'per_page']),
+        ]);
+    }
+
    public function store(Request $request)
    {
+        // 兼容前端不同的參數命名 (from/source, to/target)
+        $fromId = $request->input('from_warehouse_id') ?? $request->input('sourceWarehouseId');
+        $toId = $request->input('to_warehouse_id') ?? $request->input('targetWarehouseId');
+        
        $validated = $request->validate([
-            'sourceWarehouseId' => 'required|exists:warehouses,id',
-            'targetWarehouseId' => 'required|exists:warehouses,id|different:sourceWarehouseId',
-            'productId' => 'required|exists:products,id',
-            'quantity' => 'required|numeric|min:0.01',
-            'transferDate' => 'required|date',
-            'status' => 'required|in:待處理,處理中,已完成,已取消', // 目前僅支援立即完成或單純記錄
+            'from_warehouse_id' => 'required_without:sourceWarehouseId|exists:warehouses,id',
+            'to_warehouse_id' => 'required_without:targetWarehouseId|exists:warehouses,id|different:from_warehouse_id',
+            'remarks' => 'nullable|string',
            'notes' => 'nullable|string',
-            'batchNumber' => 'nullable|string', // 暫時接收，雖然 DB 可能沒存
+            'instant_post' => 'boolean',
+            // 支援單筆商品直接建立 (撥補單模式)
+            'product_id' => 'nullable|exists:products,id',
+            'quantity' => 'nullable|numeric|min:0.01',
+            'batch_number' => 'nullable|string',
        ]);

-        return DB::transaction(function () use ($validated) {
-            // 1. 檢查來源倉庫庫存 (精確匹配產品與批號)
-            $sourceInventory = Inventory::where('warehouse_id', $validated['sourceWarehouseId'])
-                ->where('product_id', $validated['productId'])
-                ->where('batch_number', $validated['batchNumber'])
-                ->first();
-
-            if (!$sourceInventory || $sourceInventory->quantity < $validated['quantity']) {
-                throw ValidationException::withMessages([
-                    'quantity' => ['來源倉庫指定批號庫存不足'],
-                ]);
+        $remarks = $validated['remarks'] ?? $validated['notes'] ?? null;
+        $order = $this->transferService->createOrder(
+            $fromId,
+            $toId,
+            $remarks,
+            auth()->id()
+        );
+        
+        if ($request->input('instant_post') === true) {
+            try {
+                $this->transferService->post($order, auth()->id());
+                    
+                return redirect()->back()->with('success', '撥補成功，庫存已更新');
+            } catch (\Exception $e) {
+                // 如果過帳失敗，雖然單據已建立，但應回報錯誤
+                return redirect()->back()->withErrors(['items' => $e->getMessage()]);
            }
+        }

-            // 2. 獲取或建立目標倉庫庫存 (精確匹配產品與批號，並繼承效期與品質狀態)
-            $targetInventory = Inventory::firstOrCreate(
-                [
-                    'warehouse_id' => $validated['targetWarehouseId'],
-                    'product_id' => $validated['productId'],
-                    'batch_number' => $validated['batchNumber'],
-                ],
-                [
-                    'quantity' => 0,
-                    'unit_cost' => $sourceInventory->unit_cost, // 繼承成本
-                    'total_value' => 0,
-                    'expiry_date' => $sourceInventory->expiry_date,
-                    'quality_status' => $sourceInventory->quality_status,
-                    'origin_country' => $sourceInventory->origin_country,
-                ]
-            );
+        return redirect()->route('inventory.transfer.show', [$order->id])
+            ->with('success', '已建立調撥單');
+    }

-            $sourceWarehouse = Warehouse::find($validated['sourceWarehouseId']);
-            $targetWarehouse = Warehouse::find($validated['targetWarehouseId']);
+    public function show(InventoryTransferOrder $order)
+    {
+        $order->load(['items.product.baseUnit', 'fromWarehouse', 'toWarehouse', 'createdBy', 'postedBy']);

-            // 3. 執行庫存轉移 (扣除來源)
-            $oldSourceQty = $sourceInventory->quantity;
-            $newSourceQty = $oldSourceQty - $validated['quantity'];
-            
-            // 設定活動紀錄原因
-            $sourceInventory->activityLogReason = "撥補出庫 至 {$targetWarehouse->name}";
-            $sourceInventory->quantity = $newSourceQty;
-            $sourceInventory->total_value = $sourceInventory->quantity * $sourceInventory->unit_cost; // 更新總值
-            $sourceInventory->save();
+        $orderData = [
+            'id' => (string) $order->id,
+            'doc_no' => $order->doc_no,
+            'from_warehouse_id' => (string) $order->from_warehouse_id,
+            'from_warehouse_name' => $order->fromWarehouse->name,
+            'to_warehouse_id' => (string) $order->to_warehouse_id,
+            'to_warehouse_name' => $order->toWarehouse->name,
+            'to_warehouse_type' => $order->toWarehouse->type->value, // 用於判斷是否為販賣機
+            'status' => $order->status,
+            'remarks' => $order->remarks,
+            'created_at' => $order->created_at->format('Y-m-d H:i'),
+            'created_by' => $order->createdBy?->name,
+            'items' => $order->items->map(function ($item) use ($order) {
+                // 獲取來源倉庫的當前庫存
+                $stock = Inventory::where('warehouse_id', $order->from_warehouse_id)
+                    ->where('product_id', $item->product_id)
+                    ->where('batch_number', $item->batch_number)
+                    ->first();

-            // 記錄來源異動
-            $sourceInventory->transactions()->create([
-                'type' => '撥補出庫',
-                'quantity' => -$validated['quantity'],
-                'unit_cost' => $sourceInventory->unit_cost, // 記錄
-                'balance_before' => $oldSourceQty,
-                'balance_after' => $newSourceQty,
-                'reason' => "撥補至 {$targetWarehouse->name}" . ($validated['notes'] ? " ({$validated['notes']})" : ""),
-                'actual_time' => $validated['transferDate'],
-                'user_id' => auth()->id(),
+                return [
+                    'id' => (string) $item->id,
+                    'product_id' => (string) $item->product_id,
+                    'product_name' => $item->product->name,
+                    'product_code' => $item->product->code,
+                    'batch_number' => $item->batch_number,
+                    'expiry_date' => $stock && $stock->expiry_date ? $stock->expiry_date->format('Y-m-d') : null,
+                    'unit' => $item->product->baseUnit?->name,
+                    'quantity' => (float) $item->quantity,
+                    'position' => $item->position,
+                    'max_quantity' => $item->snapshot_quantity ? (float) $item->snapshot_quantity : ($stock ? (float) $stock->quantity : 0.0),
+                    'notes' => $item->notes,
+                ];
+            }),
+        ];
+
+        return Inertia::render('Inventory/Transfer/Show', [
+            'order' => $orderData,
+        ]);
+    }
+
+    public function update(Request $request, InventoryTransferOrder $order)
+    {
+        if ($order->status !== 'draft') {
+            return redirect()->back()->with('error', '只能修改草稿狀態的單據');
+        }
+
+        // 1. 先更新資料 (如果請求中包含 items，則先執行儲存)
+        $itemsChanged = false;
+        if ($request->has('items')) {
+            $validated = $request->validate([
+                'items' => 'array',
+                'items.*.product_id' => 'required|exists:products,id',
+                'items.*.quantity' => 'required|numeric|min:0.01',
+                'items.*.batch_number' => 'nullable|string',
+                'items.*.position' => 'nullable|string',
+                'items.*.notes' => 'nullable|string',
            ]);
+            $itemsChanged = $this->transferService->updateItems($order, $validated['items']);
+        }

-            // 4. 執行庫存轉移 (增加目標)
-            $oldTargetQty = $targetInventory->quantity;
-            $newTargetQty = $oldTargetQty + $validated['quantity'];
+        $remarksChanged = false;
+        if ($request->has('remarks')) {
+            $remarksChanged = $order->remarks !== $request->input('remarks');
+            $order->remarks = $request->input('remarks');
+        }

-            // 設定活動紀錄原因
-            $targetInventory->activityLogReason = "撥補入庫 來自 {$sourceWarehouse->name}";
-            // 確保目標庫存也有成本 (如果是繼承來的)
-            if ($targetInventory->unit_cost == 0 && $sourceInventory->unit_cost > 0) {
-                 $targetInventory->unit_cost = $sourceInventory->unit_cost;
+        if ($itemsChanged || $remarksChanged) {
+            // [IMPORTANT] 使用 touch() 確保即便只有品項異動，也會因為 updated_at 變更而觸發自動日誌
+            $order->touch(); 
+            $message = '儲存成功';
+        } else {
+            $message = '資料未變更';
+        }
+
+        // 2. 判斷是否需要過帳
+        if ($request->input('action') === 'post') {
+            try {
+                $this->transferService->post($order, auth()->id());
+                return redirect()->route('inventory.transfer.index')
+                    ->with('success', '調撥單已過帳完成');
+            } catch (ValidationException $e) {
+                return redirect()->back()->withErrors($e->errors());
+            } catch (\Exception $e) {
+                return redirect()->back()->withErrors(['items' => $e->getMessage()]);
            }
-            $targetInventory->quantity = $newTargetQty;
-            $targetInventory->total_value = $targetInventory->quantity * $targetInventory->unit_cost; // 更新總值
-            $targetInventory->save();
+        }

-            // 記錄目標異動
-            $targetInventory->transactions()->create([
-                'type' => '撥補入庫',
-                'quantity' => $validated['quantity'],
-                'unit_cost' => $targetInventory->unit_cost, // 記錄
-                'balance_before' => $oldTargetQty,
-                'balance_after' => $newTargetQty,
-                'reason' => "來自 {$sourceWarehouse->name} 的撥補" . ($validated['notes'] ? " ({$validated['notes']})" : ""),
-                'actual_time' => $validated['transferDate'],
-                'user_id' => auth()->id(),
-            ]);
+        return redirect()->back()->with('success', $message);
+    }

-            // TODO: 未來若有獨立的 TransferOrder 模型，可在此建立紀錄
+    public function destroy(InventoryTransferOrder $order)
+    {
+        if ($order->status !== 'draft') {
+            return redirect()->back()->with('error', '只能刪除草稿狀態的單據');
+        }

-            return redirect()->back()->with('success', '撥補單已建立且庫存已轉移');
-        });
+        $order->items()->delete();
+        $order->delete();
+
+        return redirect()->route('inventory.transfer.index')
+            ->with('success', '調撥單已刪除');
    }

    /**
-     * 獲取特定倉庫的庫存列表 (API)
+     * 獲取特定倉庫的庫存列表 (API) - 保留給前端選擇商品用
     */
    public function getWarehouseInventories(Warehouse $warehouse)
    {
        $inventories = $warehouse->inventories()
            ->with(['product.baseUnit', 'product.category'])
-            ->where('quantity', '>', 0) // 只回傳有庫存的
+            ->where('quantity', '>', 0) 
            ->get()
            ->map(function ($inv) {
                return [
                    'product_id' => (string) $inv->product_id,
                    'product_name' => $inv->product->name,
+                    'product_code' => $inv->product->code,
+                    'product_barcode' => $inv->product->barcode,
                    'batch_number' => $inv->batch_number,
                    'quantity' => (float) $inv->quantity,
-                    'unit_cost' => (float) $inv->unit_cost, // 新增
-                    'total_value' => (float) $inv->total_value, // 新增
+                    'unit_cost' => (float) $inv->unit_cost,
                    'unit_name' => $inv->product->baseUnit?->name ?? '個',
                    'expiry_date' => $inv->expiry_date ? $inv->expiry_date->format('Y-m-d') : null,
                ];
@@ -139,4 +229,30 @@ class TransferOrderController extends Controller

        return response()->json($inventories);
    }
+    public function importItems(Request $request, InventoryTransferOrder $order)
+    {
+        if ($order->status !== 'draft') {
+            return redirect()->back()->with('error', '只能在草稿狀態下匯入明細');
+        }
+
+        $request->validate([
+            'file' => 'required|file|mimes:xlsx,xls,csv',
+        ]);
+
+        try {
+            \Maatwebsite\Excel\Facades\Excel::import(new \App\Modules\Inventory\Imports\InventoryTransferItemImport($order), $request->file('file'));
+            return redirect()->back()->with('success', '匯入成功');
+        } catch (\Exception $e) {
+            return redirect()->back()->with('error', '匯入失敗：' . $e->getMessage());
+        }
+    }
+
+    public function template()
+    {
+        return \Maatwebsite\Excel\Facades\Excel::download(
+            new \App\Modules\Inventory\Exports\InventoryTransferTemplateExport(),
+            '調撥單明細匯入範本.xlsx'
+        );
+    }
 }
+
--- a/app/Modules/Inventory/Controllers/WarehouseController.php
+++ b/app/Modules/Inventory/Controllers/WarehouseController.php
@@ -24,69 +24,114 @@ class WarehouseController extends Controller
            });
        }

+        $perPage = $request->input('per_page', 10);
+        if (!in_array($perPage, [10, 20, 50, 100])) {
+            $perPage = 10;
+        }
+
        $warehouses = $query->withSum('inventories as book_stock', 'quantity') // 帳面庫存 = 所有庫存總和
+            ->withSum('inventories as book_amount', 'total_value') // 帳面金額
            ->withSum(['inventories as available_stock' => function ($query) {
-                // 可用庫存 = 庫存 > 0 且 品質正常 且 (未過期 或 無效期)
+                // 可用庫存條件
                $query->where('quantity', '>', 0)
                      ->where('quality_status', 'normal')
+                      ->whereHas('warehouse', function ($q) {
+                          $q->where('type', '!=', \App\Enums\WarehouseType::QUARANTINE);
+                      })
                      ->where(function ($q) {
                          $q->whereNull('expiry_date')
                            ->orWhere('expiry_date', '>=', now());
                      });
            }], 'quantity')
+            ->withSum(['inventories as available_amount' => function ($query) {
+                // 可用金額條件 (與可用庫存一致)
+                $query->where('quantity', '>', 0)
+                      ->where('quality_status', 'normal')
+                      ->whereHas('warehouse', function ($q) {
+                          $q->where('type', '!=', \App\Enums\WarehouseType::QUARANTINE);
+                      })
+                      ->where(function ($q) {
+                          $q->whereNull('expiry_date')
+                            ->orWhere('expiry_date', '>=', now());
+                      });
+            }], 'total_value')
+            ->withSum(['inventories as abnormal_amount' => function ($query) {
+                $query->where('quantity', '>', 0)
+                      ->where(function ($q) {
+                          $q->where('quality_status', '!=', 'normal')
+                            ->orWhere(function ($sq) {
+                                $sq->whereNotNull('expiry_date')
+                                   ->where('expiry_date', '<', now());
+                            })
+                            ->orWhereHas('warehouse', function ($wq) {
+                                $wq->where('type', \App\Enums\WarehouseType::QUARANTINE);
+                            });
+                      });
+            }], 'total_value')
+            ->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)
+            ->paginate($perPage)
            ->withQueryString();

-        // 修正各倉庫列表中的可用庫存計算：若倉庫不可銷售，則可用庫存為 0
-        $warehouses->getCollection()->transform(function ($w) {
-            if (!$w->is_sellable) {
-                $w->available_stock = 0;
-            }
-            return $w;
-        });
-
        // 計算全域總計 (不分頁)
        $totals = [
            'available_stock' => \App\Modules\Inventory\Models\Inventory::where('quantity', '>', 0)
                ->where('quality_status', 'normal')
                ->whereHas('warehouse', function ($q) {
-                    $q->where('is_sellable', true);
+                    $q->where('type', '!=', \App\Enums\WarehouseType::QUARANTINE);
                })
                ->where(function ($q) {
                    $q->whereNull('expiry_date')
                      ->orWhere('expiry_date', '>=', now());
                })->sum('quantity'),
+            'available_amount' => \App\Modules\Inventory\Models\Inventory::where('quantity', '>', 0)
+                ->where('quality_status', 'normal')
+                ->whereHas('warehouse', function ($q) {
+                    $q->where('type', '!=', \App\Enums\WarehouseType::QUARANTINE);
+                })
+                ->where(function ($q) {
+                    $q->whereNull('expiry_date')
+                      ->orWhere('expiry_date', '>=', now());
+                })->sum('total_value'),
+            'abnormal_amount' => \App\Modules\Inventory\Models\Inventory::where('quantity', '>', 0)
+                ->where(function ($q) {
+                    $q->where('quality_status', '!=', 'normal')
+                      ->orWhere(function ($sq) {
+                          $sq->whereNotNull('expiry_date')
+                             ->where('expiry_date', '<', now());
+                      })
+                      ->orWhereHas('warehouse', function ($wq) {
+                          $wq->where('type', \App\Enums\WarehouseType::QUARANTINE);
+                      });
+                })->sum('total_value'),
            'book_stock' => \App\Modules\Inventory\Models\Inventory::sum('quantity'),
+            'book_amount' => \App\Modules\Inventory\Models\Inventory::sum('total_value'),
        ];

        return Inertia::render('Warehouse/Index', [
            'warehouses' => $warehouses,
            'totals' => $totals,
-            'filters' => $request->only(['search']),
+            'filters' => $request->only(['search', 'per_page']),
        ]);
    }

    public function store(Request $request)
    {
        $validated = $request->validate([
+            'code' => 'required|string|max:20|unique:warehouses,code',
            'name' => 'required|string|max:50',
            'address' => 'nullable|string|max:255',
            'description' => 'nullable|string',
-            'is_sellable' => 'nullable|boolean',
            'type' => 'required|string',
            'license_plate' => 'nullable|string|max:20',
            'driver_name' => 'nullable|string|max:50',
        ]);

-        // 自動產生代碼
-        $prefix = 'WH';
-        $lastWarehouse = Warehouse::latest('id')->first();
-        $nextId = $lastWarehouse ? $lastWarehouse->id + 1 : 1;
-        $code = $prefix . str_pad($nextId, 3, '0', STR_PAD_LEFT);
-
-        $validated['code'] = $code;
-
        Warehouse::create($validated);

        return redirect()->back()->with('success', '倉庫已建立');
@@ -95,10 +140,10 @@ class WarehouseController extends Controller
    public function update(Request $request, Warehouse $warehouse)
    {
        $validated = $request->validate([
+            'code' => 'required|string|max:20|unique:warehouses,code,' . $warehouse->id,
            'name' => 'required|string|max:50',
            'address' => 'nullable|string|max:255',
            'description' => 'nullable|string',
-            'is_sellable' => 'nullable|boolean',
            'type' => 'required|string',
            'license_plate' => 'nullable|string|max:20',
            'driver_name' => 'nullable|string|max:50',
@@ -111,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/InstructionSheet.php
+++ b/app/Modules/Inventory/Exports/InstructionSheet.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Modules\Inventory\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithStyles;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class InstructionSheet implements FromCollection, WithHeadings, WithTitle, WithStyles
+{
+    public function title(): string
+    {
+        return '填寫說明';
+    }
+
+    public function headings(): array
+    {
+        return [
+            '欄位名稱',
+            '是否必填',
+            '填寫說明',
+        ];
+    }
+
+    public function collection()
+    {
+        return collect([
+            ['商品代號', '選填', '2-8 碼，若未填寫系統將自動生成。若代號已存在，將更新該商品資料。'],
+            ['條碼', '選填', '13 碼數字，若未填寫系統將自動生成。若條碼已存在（優先比對），將更新該商品資料。'],
+            ['商品名稱', '必填', '請填寫完整商品名稱。'],
+            ['類別名稱', '必填', '必須為系統中已存在的類別名稱（如：飲品）。'],
+            ['品牌', '選填', '商品品牌名稱。'],
+            ['規格', '選填', '商品規格描述（如：25kg/袋）。'],
+            ['基本單位', '必填', '必須為系統中已存在的單位名稱（如：瓶、個）。'],
+            ['大單位', '選填', '若有大單位換算請填寫（如：箱）。'],
+            ['換算率', '若有大單位則必填', '1 個大單位等於多少個基本單位。'],
+            ['成本價', '選填', '數字，預設為 0。'],
+            ['售價', '選填', '數字，預設為 0。'],
+            ['會員價', '選填', '數字，預設為 0。'],
+            ['批發價', '選填', '數字，預設為 0。'],
+        ]);
+    }
+
+    public function styles(Worksheet $sheet)
+    {
+        return [
+            // 第一行標題粗體
+            1 => ['font' => ['bold' => true]],
+            // 欄位寬度自動
+        ];
+    }
+}
--- a/app/Modules/Inventory/Exports/InventoryReportExport.php
+++ b/app/Modules/Inventory/Exports/InventoryReportExport.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Modules\Inventory\Exports;
+
+use App\Modules\Inventory\Services\InventoryReportService;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithStyles;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class InventoryReportExport implements FromCollection, WithHeadings, WithMapping, ShouldAutoSize, WithStyles
+{
+    protected $service;
+    protected $filters;
+
+    public function __construct(InventoryReportService $service, array $filters)
+    {
+        $this->service = $service;
+        $this->filters = $filters;
+    }
+
+    public function collection()
+    {
+        return $this->service->getReportData($this->filters, null); // perPage = null to get all
+    }
+
+    public function headings(): array
+    {
+        return [
+            '商品代碼',
+            '商品名稱',
+            '分類',
+            '進貨量',
+            '出貨量',
+            '調撥入',
+            '調撥出',
+            '調整量',
+            '淨變動',
+        ];
+    }
+
+    public function map($row): array
+    {
+        return [
+            $row->product_code,
+            $row->product_name,
+            $row->category_name ?? '-',
+            $row->inbound_qty,
+            $row->outbound_qty,
+            $row->transfer_in_qty,
+            $row->transfer_out_qty,
+            $row->adjust_qty,
+            $row->net_change,
+        ];
+    }
+
+    public function styles(Worksheet $sheet)
+    {
+        return [
+            1 => ['font' => ['bold' => true]],
+        ];
+    }
+}
--- a/app/Modules/Inventory/Exports/InventoryTemplateExport.php
+++ b/app/Modules/Inventory/Exports/InventoryTemplateExport.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Modules\Inventory\Exports;
+
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+use Maatwebsite\Excel\Concerns\FromArray;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+
+class InventoryTemplateExport implements WithMultipleSheets
+{
+    public function sheets(): array
+    {
+        return [
+            new InventoryDataSheet(),
+            new InventoryInstructionSheet(),
+        ];
+    }
+}
+
+class InventoryDataSheet implements FromArray, WithHeadings, WithTitle, ShouldAutoSize
+{
+    public function array(): array
+    {
+        // 資料分頁保持完全空白
+        return [];
+    }
+
+    public function headings(): array
+    {
+        return [
+            '商品條碼',
+            '商品代號',
+            '商品名稱',
+            '數量',
+            '入庫單價',
+            '儲位/貨道',
+            '批號',
+            '產地',
+            '效期',
+        ];
+    }
+
+    public function title(): string
+    {
+        return '資料填寫';
+    }
+}
+
+class InventoryInstructionSheet implements FromArray, WithHeadings, WithTitle, ShouldAutoSize
+{
+    public function array(): array
+    {
+        return [
+            ['商品條碼', '擇一輸入', '系統會「優先」依據條碼匹配商品。若有填寫，條碼必須存在於系統中'],
+            ['商品代號', '擇一輸入', '若條碼未填寫，系統會依據代號匹配商品'],
+            ['商品名稱', '選填', '僅供對照參考，匯入時系統會自動忽略此欄位內容'],
+            ['數量', '必填', '入庫的商品數量，須為大於 0 的數字'],
+            ['入庫單價', '選填', '未填寫時將預設使用商品的「採購成本價」'],
+            ['儲位/貨道', '選填', '一般倉庫請填寫「儲位(位址)」，販賣機倉庫請填寫「貨道編號」(如: A1)'],
+            ['批號', '選填', '如需批次控管請填寫，若留空系統會自動標記為 "NO-BATCH"'],
+            ['產地', '選填', '商品的生產地資訊 (如：TW)'],
+            ['效期', '選填', '格式請務必使用 YYYY-MM-DD (例如: 2026-12-31)'],
+            ['', '', ''],
+            ['倉庫類型參考', '', '系統支援以下倉庫性質：'],
+            ['標準倉', '', '一般總倉、儲備倉'],
+            ['生產倉', '', '加工廠、中央廚房、原材料存放處'],
+            ['門市倉', '', '前台通路、店舖銷售現場'],
+            ['販賣機', '', 'IoT 自動販賣機設備，建議搭配「貨道」填寫'],
+            ['', '', ''],
+            ['匹配與匯入規則', '', '1. 系統會優先比對「商品條碼」，其次為「商品代號」。'],
+            ['', '', '2. 庫存將匯入至您在匯入前於系統介面所選擇的目標倉庫。'],
+            ['', '', '3. 若需區分不同貨道或批次，請分行填寫。'],
+        ];
+    }
+
+    public function headings(): array
+    {
+        return ['欄位名稱', '必要性', '填寫說明'];
+    }
+
+    public function title(): string
+    {
+        return '填寫規則';
+    }
+}
--- a/app/Modules/Inventory/Exports/InventoryTransferTemplateExport.php
+++ b/app/Modules/Inventory/Exports/InventoryTransferTemplateExport.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Modules\Inventory\Exports;
+
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithStyles;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class InventoryTransferTemplateExport implements WithMultipleSheets
+{
+    use Exportable;
+
+    public function sheets(): array
+    {
+        return [
+            new class implements FromCollection, WithHeadings, WithTitle, WithStyles {
+                public function collection()
+                {
+                    return collect([
+                        ['P001', 'BATCH-2024001', '10', 'A1', '範例：請刪除此列後填寫'],
+                    ]);
+                }
+
+                public function headings(): array
+                {
+                    return ['商品代碼', '批號', '數量', '貨道/儲位', '備註'];
+                }
+
+                public function title(): string
+                {
+                    return '明細匯入';
+                }
+
+                public function styles(Worksheet $sheet)
+                {
+                    return [
+                        1 => ['font' => ['bold' => true]],
+                    ];
+                }
+            },
+            new class implements FromCollection, WithHeadings, WithTitle, WithStyles {
+                public function collection()
+                {
+                    return collect([
+                        ['商品代碼', '必填', '請填寫系統中已存在的商品代號'],
+                        ['數量', '必填', '必須為大於 0 的數字'],
+                        ['批號', '選填', '若不填寫將自動對應「NO-BATCH」庫存'],
+                        ['貨道/儲位', '選填', '主要用於目的倉庫為「販賣機」時指定貨道'],
+                        ['備註', '選填', '可填寫該筆明細的備註說明'],
+                        ['', '', ''],
+                        ['提示', '附加模式', '匯入的明細將附加至現有單據，不會覆蓋原有資料'],
+                    ]);
+                }
+
+                public function headings(): array
+                {
+                    return ['欄位名稱', '必要性', '說明'];
+                }
+
+                public function title(): string
+                {
+                    return '匯入規則說明';
+                }
+
+                public function styles(Worksheet $sheet)
+                {
+                    $sheet->getColumnDimension('A')->setWidth(15);
+                    $sheet->getColumnDimension('B')->setWidth(15);
+                    $sheet->getColumnDimension('C')->setWidth(50);
+                    return [
+                        1 => ['font' => ['bold' => true]],
+                    ];
+                }
+            },
+        ];
+    }
+}
--- a/app/Modules/Inventory/Exports/ProductImportSheet.php
+++ b/app/Modules/Inventory/Exports/ProductImportSheet.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Modules\Inventory\Exports;
+
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class ProductImportSheet implements WithHeadings, WithColumnFormatting, WithTitle
+{
+    public function title(): string
+    {
+        return '商品匯入';
+    }
+
+    public function headings(): array
+    {
+        return [
+            '商品代號(選填)',
+            '條碼(選填)',
+            '商品名稱',
+            '類別名稱',
+            '品牌',
+            '規格',
+            '基本單位',
+            '大單位',
+            '換算率',
+            '成本價',
+            '售價',
+            '會員價',
+            '批發價',
+        ];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'A' => NumberFormat::FORMAT_TEXT, // 商品代號
+            'B' => NumberFormat::FORMAT_TEXT, // 條碼
+        ];
+    }
+}
--- a/app/Modules/Inventory/Exports/ProductTemplateExport.php
+++ b/app/Modules/Inventory/Exports/ProductTemplateExport.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Modules\Inventory\Exports;
+
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+
+class ProductTemplateExport implements WithMultipleSheets
+{
+    public function sheets(): array
+    {
+        return [
+            new ProductImportSheet(),
+            new InstructionSheet(),
+        ];
+    }
+}
--- a/app/Modules/Inventory/Exports/StockQueryExport.php
+++ b/app/Modules/Inventory/Exports/StockQueryExport.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Modules\Inventory\Exports;
+
+use App\Modules\Inventory\Models\Inventory;
+use Illuminate\Support\Facades\DB;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithStyles;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class StockQueryExport implements FromCollection, WithHeadings, WithMapping, ShouldAutoSize, WithStyles
+{
+    protected array $filters;
+
+    public function __construct(array $filters = [])
+    {
+        $this->filters = $filters;
+    }
+
+    public function collection()
+    {
+        $today = now()->toDateString();
+        $expiryThreshold = now()->addDays(30)->toDateString();
+
+        $query = Inventory::query()
+            ->join('products', 'inventories.product_id', '=', 'products.id')
+            ->join('warehouses', 'inventories.warehouse_id', '=', 'warehouses.id')
+            ->leftJoin('categories', 'products.category_id', '=', 'categories.id')
+            ->leftJoin('warehouse_product_safety_stocks as ss', function ($join) {
+                $join->on('inventories.warehouse_id', '=', 'ss.warehouse_id')
+                     ->on('inventories.product_id', '=', 'ss.product_id');
+            })
+            ->whereNull('inventories.deleted_at')
+            ->select([
+                'inventories.id',
+                'inventories.quantity',
+                'inventories.batch_number',
+                'inventories.expiry_date',
+                'inventories.quality_status',
+                'products.code as product_code',
+                'products.name as product_name',
+                'categories.name as category_name',
+                'warehouses.name as warehouse_name',
+                'ss.safety_stock',
+            ]);
+
+        // 篩選
+        if (!empty($this->filters['warehouse_id'])) {
+            $query->where('inventories.warehouse_id', $this->filters['warehouse_id']);
+        }
+        if (!empty($this->filters['category_id'])) {
+            $query->where('products.category_id', $this->filters['category_id']);
+        }
+        if (!empty($this->filters['search'])) {
+            $search = $this->filters['search'];
+            $query->where(function ($q) use ($search) {
+                $q->where('products.code', 'like', "%{$search}%")
+                  ->orWhere('products.name', 'like', "%{$search}%");
+            });
+        }
+        if (!empty($this->filters['status'])) {
+            switch ($this->filters['status']) {
+                case 'low_stock':
+                    $query->whereNotNull('ss.safety_stock')
+                          ->whereRaw('inventories.quantity <= ss.safety_stock')
+                          ->where('inventories.quantity', '>=', 0);
+                    break;
+                case 'negative':
+                    $query->where('inventories.quantity', '<', 0);
+                    break;
+                case 'expiring':
+                    $query->whereNotNull('inventories.expiry_date')
+                          ->where('inventories.expiry_date', '>', $today)
+                          ->where('inventories.expiry_date', '<=', $expiryThreshold);
+                    break;
+                case 'expired':
+                    $query->whereNotNull('inventories.expiry_date')
+                          ->where('inventories.expiry_date', '<=', $today);
+                    break;
+                case 'abnormal':
+                    $query->where(function ($q) use ($today, $expiryThreshold) {
+                        $q->where('inventories.quantity', '<', 0)
+                          ->orWhere(function ($q2) {
+                              $q2->whereNotNull('ss.safety_stock')
+                                 ->whereRaw('inventories.quantity <= ss.safety_stock');
+                          })
+                          ->orWhere(function ($q2) use ($expiryThreshold) {
+                              $q2->whereNotNull('inventories.expiry_date')
+                                 ->where('inventories.expiry_date', '<=', $expiryThreshold);
+                          });
+                    });
+                    break;
+            }
+        }
+
+        return $query->orderBy('products.code', 'asc')->get();
+    }
+
+    public function headings(): array
+    {
+        return [
+            '商品代碼',
+            '商品名稱',
+            '分類',
+            '倉庫',
+            '批號',
+            '數量',
+            '安全庫存',
+            '到期日',
+            '品質狀態',
+            '狀態',
+        ];
+    }
+
+    public function map($row): array
+    {
+        $today = now()->toDateString();
+        $expiryThreshold = now()->addDays(30)->toDateString();
+
+        $statuses = [];
+        if ($row->quantity < 0) {
+            $statuses[] = '負庫存';
+        }
+        if ($row->safety_stock !== null && $row->quantity <= $row->safety_stock && $row->quantity >= 0) {
+            $statuses[] = '低庫存';
+        }
+        if ($row->expiry_date) {
+            if ($row->expiry_date <= $today) {
+                $statuses[] = '已過期';
+            } elseif ($row->expiry_date <= $expiryThreshold) {
+                $statuses[] = '即將過期';
+            }
+        }
+        if (empty($statuses)) {
+            $statuses[] = '正常';
+        }
+
+        $qualityLabels = [
+            'normal' => '正常',
+            'inspecting' => '檢驗中',
+            'rejected' => '不合格',
+        ];
+
+        return [
+            $row->product_code,
+            $row->product_name,
+            $row->category_name ?? '-',
+            $row->warehouse_name,
+            $row->batch_number ?? '-',
+            $row->quantity,
+            $row->safety_stock ?? '-',
+            $row->expiry_date ?? '-',
+            $qualityLabels[$row->quality_status] ?? $row->quality_status ?? '-',
+            implode('、', $statuses),
+        ];
+    }
+
+    public function styles(Worksheet $sheet): array
+    {
+        return [
+            1 => ['font' => ['bold' => true]],
+        ];
+    }
+}
--- a/app/Modules/Inventory/Imports/InventoryImport.php
+++ b/app/Modules/Inventory/Imports/InventoryImport.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace App\Modules\Inventory\Imports;
+
+use App\Modules\Inventory\Models\Product;
+use App\Modules\Inventory\Models\Inventory;
+use App\Modules\Inventory\Models\Warehouse;
+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, SkipsEmptyRows
+{
+    private $warehouse;
+    private $inboundDate;
+    private $notes;
+
+    public function __construct(Warehouse $warehouse, string $inboundDate, ?string $notes = null)
+    {
+        HeadingRowFormatter::default('none');
+        $this->warehouse = $warehouse;
+        $this->inboundDate = $inboundDate;
+        $this->notes = $notes;
+    }
+
+    public function map($row): array
+    {
+        // 處理條碼或代號為字串
+        if (isset($row['商品條碼'])) {
+            $row['商品條碼'] = (string) $row['商品條碼'];
+        }
+        if (isset($row['商品代號'])) {
+            $row['商品代號'] = (string) $row['商品代號'];
+        }
+        if (isset($row['儲位/貨道'])) {
+            $row['儲位/貨道'] = (string) $row['儲位/貨道'];
+        }
+        return $row;
+    }
+
+    public function model(array $row)
+    {
+        // 查找商品
+        $product = null;
+        if (!empty($row['商品條碼'])) {
+            $product = Product::where('barcode', $row['商品條碼'])->first();
+        }
+        if (!$product && !empty($row['商品代號'])) {
+            $product = Product::where('code', $row['商品代號'])->first();
+        }
+
+        if (!$product) {
+            return null; // 透過 Validation 攔截
+        }
+
+        $quantity = (float) $row['數量'];
+        $unitCost = isset($row['入庫單價']) ? (float) $row['入庫單價'] : ($product->cost_price ?? 0);
+        $location = $row['儲位/貨道'] ?? null;
+        
+        // 批號邏輯：若 Excel 留空則使用 NO-BATCH
+        $batchNumber = !empty($row['批號']) ? $row['批號'] : 'NO-BATCH';
+        $originCountry = $row['產地'] ?? 'TW';
+        $expiryDate = !empty($row['效期']) ? $row['效期'] : null;
+
+        return DB::transaction(function () use ($product, $quantity, $unitCost, $location, $batchNumber, $originCountry, $expiryDate) {
+            // 使用與 InventoryController 相同的 firstOrNew 邏輯
+            $inventory = $this->warehouse->inventories()->withTrashed()->firstOrNew(
+                [
+                    'product_id' => $product->id,
+                    'batch_number' => $batchNumber,
+                    'location' => $location, // 加入儲位/貨道作為區分關鍵字
+                ],
+                [
+                    'quantity' => 0,
+                    'unit_cost' => $unitCost,
+                    'total_value' => 0,
+                    'arrival_date' => $this->inboundDate,
+                    'expiry_date' => $expiryDate,
+                    'origin_country' => $originCountry,
+                ]
+            );
+
+            if ($inventory->trashed()) {
+                $inventory->restore();
+            }
+
+            // 更新數量
+            $oldQty = $inventory->quantity;
+            $inventory->quantity += $quantity;
+            
+            // 更新單價與總價值
+            $inventory->unit_cost = $unitCost;
+            $inventory->total_value = $inventory->quantity * $unitCost;
+            $inventory->save();
+
+            // 記錄交易歷史
+            $inventory->transactions()->create([
+                'warehouse_id' => $this->warehouse->id,
+                'product_id' => $product->id,
+                'batch_number' => $inventory->batch_number,
+                'quantity' => $quantity,
+                'unit_cost' => $unitCost,
+                'type' => '手動入庫',
+                'reason' => 'Excel 匯入入庫',
+                'balance_before' => $oldQty,
+                'balance_after' => $inventory->quantity,
+                'actual_time' => $this->inboundDate,
+                'notes' => $this->notes,
+                'expiry_date' => $inventory->expiry_date,
+            ]);
+
+            return $inventory;
+        });
+    }
+
+    public function rules(): array
+    {
+        return [
+            '商品條碼' => ['nullable', 'string'],
+            '商品代號' => ['nullable', 'string'],
+            '數量' => [
+                'required_with:商品條碼,商品代號', // 只有在有商品資訊時，數量才是必填
+                'numeric',
+                'min:0' // 允許數量為 0
+            ],
+            '入庫單價' => ['nullable', 'numeric', 'min:0'],
+            '儲位/貨道' => ['nullable', 'string', 'max:50'],
+            '批號' => ['nullable', 'string'],
+            '效期' => ['nullable', 'date'],
+            '產地' => ['nullable', 'string', 'max:2'],
+        ];
+    }
+}
--- a/app/Modules/Inventory/Imports/InventoryTransferItemImport.php
+++ b/app/Modules/Inventory/Imports/InventoryTransferItemImport.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Modules\Inventory\Imports;
+
+use App\Modules\Inventory\Models\InventoryTransferItem;
+use App\Modules\Inventory\Models\InventoryTransferOrder;
+use App\Modules\Inventory\Models\Product;
+use Illuminate\Support\Collection;
+use Maatwebsite\Excel\Concerns\ToCollection;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+use Exception;
+
+class InventoryTransferItemImport implements ToCollection, WithMultipleSheets
+{
+    protected $transferOrder;
+
+    public function __construct(InventoryTransferOrder $transferOrder)
+    {
+        $this->transferOrder = $transferOrder;
+    }
+
+    public function collection(Collection $rows)
+    {
+        if ($rows->isEmpty()) {
+            throw new Exception("檔案中沒有資料。");
+        }
+
+        // 移除標題列並解析索引
+        $headerRow = $rows->shift();
+        $headers = $headerRow->toArray();
+        
+        // 建立標題對應索引 (支援中文與英文)
+        $colMap = [
+            'product_code' => -1,
+            'batch_number' => -1,
+            'quantity' => -1,
+            'position' => -1,
+            'notes' => -1,
+        ];
+
+        foreach ($headers as $index => $label) {
+            $label = trim((string)$label);
+            if (in_array($label, ['商品代碼', 'product_code', 'shang_pin_dai_ma'])) $colMap['product_code'] = $index;
+            if (in_array($label, ['批號', 'batch_number', 'pi_hao'])) $colMap['batch_number'] = $index;
+            if (in_array($label, ['數量', 'quantity', 'shu_liang'])) $colMap['quantity'] = $index;
+            if (in_array($label, ['貨道/儲位', '貨道', 'position', 'slot', 'huo_dao'])) $colMap['position'] = $index;
+            if (in_array($label, ['備註', 'notes', 'bei_zhu'])) $colMap['notes'] = $index;
+        }
+
+        // 檢查必要欄位是否有找到
+        if ($colMap['product_code'] === -1 || $colMap['quantity'] === -1) {
+            $foundHeaders = implode(', ', array_filter($headers));
+            throw new Exception("找不到必要的欄位「商品代碼」或「數量」。讀取到的標題為：{$foundHeaders}。請確認使用的是正確的範本。");
+        }
+
+        // 預先載入商品 (優化效能)
+        $productCodes = $rows->map(fn($row) => trim((string)($row[$colMap['product_code']] ?? '')))->filter()->unique()->toArray();
+        $products = Product::whereIn('code', $productCodes)->get()->keyBy('code');
+
+        $newItems = [];
+        $errors = [];
+
+        foreach ($rows as $index => $row) {
+            $productCode = trim((string)($row[$colMap['product_code']] ?? ''));
+            $quantity = $row[$colMap['quantity']] ?? null;
+            $batchNumber = $colMap['batch_number'] !== -1 ? trim((string)($row[$colMap['batch_number']] ?? '')) : '';
+            $position = $colMap['position'] !== -1 ? trim((string)($row[$colMap['position']] ?? '')) : null;
+            $notes = $colMap['notes'] !== -1 ? ($row[$colMap['notes']] ?? null) : null;
+
+            // 跳過全空行
+            if (empty($productCode) && ($quantity === null || $quantity === '')) {
+                continue;
+            }
+
+            $lineNum = $index + 2; // 因為 shift 過，且 Excel 從 1 開始
+
+            if (empty($productCode)) {
+                $errors[] = "第 {$lineNum} 行：商品代碼不能為空";
+                continue;
+            }
+
+            $product = $products->get($productCode);
+            if (!$product) {
+                $errors[] = "第 {$lineNum} 行：找不到商品代碼 '{$productCode}'";
+                continue;
+            }
+
+            if (!is_numeric($quantity) || (float)$quantity <= 0) {
+                $errors[] = "第 {$lineNum} 行：數量必須為大於 0 的數字 (目前值: " . ($quantity ?? '空') . ")";
+                continue;
+            }
+
+            if (empty($batchNumber)) {
+                $batchNumber = 'NO-BATCH';
+            }
+
+            $newItems[] = [
+                'transfer_order_id' => $this->transferOrder->id,
+                'product_id' => $product->id,
+                'batch_number' => $batchNumber,
+                'quantity' => (float)$quantity,
+                'position' => $position,
+                'notes' => $notes,
+                'created_at' => now(),
+                'updated_at' => now(),
+            ];
+        }
+
+        if (count($errors) > 0) {
+            throw new Exception(implode("\n", $errors));
+        }
+
+        if (count($newItems) === 0) {
+            throw new Exception("檔案中沒有可匯入的有效資料。");
+        }
+
+        InventoryTransferItem::insert($newItems);
+        $this->transferOrder->touch();
+    }
+
+    /**
+     * 指定只匯入第一個分頁 (明細匯入)
+     */
+    public function sheets(): array
+    {
+        return [
+            0 => $this,
+        ];
+    }
+}
--- a/app/Modules/Inventory/Imports/ProductImport.php
+++ b/app/Modules/Inventory/Imports/ProductImport.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace App\Modules\Inventory\Imports;
+
+use App\Modules\Inventory\Models\Category;
+use App\Modules\Inventory\Models\Product;
+use App\Modules\Inventory\Models\Unit;
+use Illuminate\Validation\Rule;
+use Maatwebsite\Excel\Concerns\ToModel;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithValidation;
+use Maatwebsite\Excel\Imports\HeadingRowFormatter;
+
+class ProductImport implements ToModel, WithHeadingRow, WithValidation, WithMapping
+{
+    private $categories;
+    private $units;
+
+    public function __construct()
+    {
+        // 禁用標題格式化，保留中文標題
+        HeadingRowFormatter::default('none');
+
+        // 快取所有類別與單位，避免 N+1 查詢
+        $this->categories = Category::pluck('id', 'name');
+        $this->units = Unit::pluck('id', 'name');
+    }
+
+    /**
+    * @param mixed $row
+    *
+    * @return array
+    */
+    public function map($row): array
+    {
+        // 強制將代號與條碼轉為字串，避免純數字被當作整數處理導致 max:5 驗證錯誤
+        if (isset($row['商品代號'])) {
+            $row['商品代號'] = (string) $row['商品代號'];
+        }
+        if (isset($row['條碼'])) {
+            $row['條碼'] = (string) $row['條碼'];
+        }
+        
+        return $row;
+    }
+
+    /**
+    * @param array $row
+    *
+    * @return \Illuminate\Database\Eloquent\Model|null
+    */
+    public function model(array $row)
+    {
+        // 查找關聯 ID
+        $categoryId = $this->categories[$row['類別名稱']] ?? null;
+        $baseUnitId = $this->units[$row['基本單位']] ?? null;
+        $largeUnitId = isset($row['大單位']) ? ($this->units[$row['大單位']] ?? null) : null;
+
+        // 若必要關聯找不到，理論上 Validation 會攔截，但此處做防禦性編程
+        if (!$categoryId || !$baseUnitId) {
+            return null;
+        }
+
+        $code = $row['商品代號'] ?? null;
+        $barcode = $row['條碼'] ?? null;
+
+        // Upsert 邏輯：優先以條碼查找，次之以商品代號查找
+        $product = null;
+        if (!empty($barcode)) {
+            $product = Product::where('barcode', $barcode)->first();
+        }
+
+        if (!$product && !empty($code)) {
+            $product = Product::where('code', $code)->first();
+        }
+
+        $data = [
+            'name' => $row['商品名稱'],
+            'category_id' => $categoryId,
+            'brand' => $row['品牌'] ?? null,
+            'specification' => $row['規格'] ?? null,
+            'base_unit_id' => $baseUnitId,
+            'large_unit_id' => $largeUnitId,
+            'conversion_rate' => $row['換算率'] ?? null,
+            'purchase_unit_id' => null,
+            'cost_price' => $row['成本價'] ?? null,
+            'price' => $row['售價'] ?? null,
+            'member_price' => $row['會員價'] ?? null,
+            'wholesale_price' => $row['批發價'] ?? null,
+        ];
+
+        if ($product) {
+            // 更新現有商品
+            $product->update($data);
+            return null; // 返回 null 以避免 Maatwebsite/Excel 嘗試再次 insert
+        }
+
+        // 建立新商品：處理代碼與條碼自動生成
+        if (empty($code)) {
+            $code = $this->generateRandomCode();
+        }
+        if (empty($barcode)) {
+            $barcode = $this->generateRandomBarcode();
+        }
+
+        $data['code'] = $code;
+        $data['barcode'] = $barcode;
+
+        return new Product($data);
+    }
+
+    /**
+     * 生成隨機 8 碼代號 (大寫英文+數字)
+     */
+    private function generateRandomCode(): string
+    {
+        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        $code = '';
+        
+        do {
+            $code = '';
+            for ($i = 0; $i < 8; $i++) {
+                $code .= $characters[rand(0, strlen($characters) - 1)];
+            }
+        } while (Product::where('code', $code)->exists());
+
+        return $code;
+    }
+
+    /**
+     * 生成隨機 13 碼條碼 (純數字)
+     */
+    private function generateRandomBarcode(): string
+    {
+        $barcode = '';
+        
+        do {
+            $barcode = '';
+            for ($i = 0; $i < 13; $i++) {
+                $barcode .= rand(0, 9);
+            }
+        } while (Product::where('barcode', $barcode)->exists());
+
+        return $barcode;
+    }
+
+    public function rules(): array
+    {
+        return [
+            '商品代號' => ['nullable', 'string', 'min:2', 'max:8'],
+            '條碼' => ['nullable', 'string'],
+            '商品名稱' => ['required', 'string'],
+            '類別名稱' => ['required', function($attribute, $value, $fail) {
+                if (!isset($this->categories[$value])) {
+                    $fail("找不到類別: " . $value);
+                }
+            }],
+            '基本單位' => ['required', function($attribute, $value, $fail) {
+                if (!isset($this->units[$value])) {
+                    $fail("找不到單位: " . $value);
+                }
+            }],
+            '大單位' => ['nullable', function($attribute, $value, $fail) {
+                if ($value && !isset($this->units[$value])) {
+                    $fail("找不到單位: " . $value);
+                }
+            }],
+
+            '換算率' => ['nullable', 'numeric', 'min:0.0001', 'required_with:大單位'],
+            '成本價' => ['nullable', 'numeric', 'min:0'],
+            '售價' => ['nullable', 'numeric', 'min:0'],
+            '會員價' => ['nullable', 'numeric', 'min:0'],
+            '批發價' => ['nullable', 'numeric', 'min:0'],
+        ];
+    }
+}
--- a/app/Modules/Inventory/Models/GoodsReceipt.php
+++ b/app/Modules/Inventory/Models/GoodsReceipt.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Modules\Inventory\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class GoodsReceipt extends Model
+{
+    use HasFactory, SoftDeletes;
+    use \Spatie\Activitylog\Traits\LogsActivity;
+
+    protected $fillable = [
+        'code',
+        'type',
+        'warehouse_id',
+        'purchase_order_id',
+        'vendor_id',
+        'received_date',
+        'status',
+        'remarks',
+        'user_id',
+    ];
+
+    protected $casts = [
+        'received_date' => 'date:Y-m-d',
+    ];
+
+    public function getActivitylogOptions(): \Spatie\Activitylog\LogOptions
+    {
+        return \Spatie\Activitylog\LogOptions::defaults()
+            ->logAll()
+            ->logOnlyDirty()
+            ->dontSubmitEmptyLogs();
+    }
+
+    public function items()
+    {
+        return $this->hasMany(GoodsReceiptItem::class);
+    }
+    
+    // Strict Mode: relationships to Warehouse is allowed (same module).
+    public function warehouse()
+    {
+        return $this->belongsTo(Warehouse::class);
+    }
+    
+    // Strict Mode: cross-module relationship to Vendor/User/PurchaseOrder is restricted.
+    // They are accessed via IDs or Services.
+}
--- a/app/Modules/Inventory/Models/GoodsReceiptItem.php
+++ b/app/Modules/Inventory/Models/GoodsReceiptItem.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Modules\Inventory\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GoodsReceiptItem extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'goods_receipt_id',
+        'product_id',
+        'purchase_order_item_id',
+        'quantity_received',
+        'unit_price',
+        'total_amount',
+        'batch_number',
+        'expiry_date',
+    ];
+
+    protected $casts = [
+        'quantity_received' => 'decimal:2',
+        'unit_price' => 'decimal:2', // 暫定價格
+        'total_amount' => 'decimal:2',
+        'expiry_date' => 'date:Y-m-d',
+    ];
+
+    public function goodsReceipt()
+    {
+        return $this->belongsTo(GoodsReceipt::class);
+    }
+
+    public function product()
+    {
+        return $this->belongsTo(Product::class);
+    }
+}
--- a/app/Modules/Inventory/Models/InventoryAdjustDoc.php
+++ b/app/Modules/Inventory/Models/InventoryAdjustDoc.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace App\Modules\Inventory\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use App\Modules\Core\Models\User;
+
+use Spatie\Activitylog\Traits\LogsActivity;
+use Spatie\Activitylog\LogOptions;
+
+class InventoryAdjustDoc extends Model
+{
+    use HasFactory, LogsActivity;
+
+    protected $fillable = [
+        'doc_no',
+        'count_doc_id',
+        'warehouse_id',
+        'status',
+        'reason',
+        'remarks',
+        'posted_at',
+        'created_by',
+        'updated_by',
+        'posted_by',
+    ];
+
+    protected $casts = [
+        'posted_at' => 'datetime',
+    ];
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            if (empty($model->doc_no)) {
+                $today = date('Ymd');
+                $prefix = 'ADJ-' . $today . '-';
+                
+                $lastDoc = static::where('doc_no', 'like', $prefix . '%')
+                    ->orderBy('doc_no', 'desc')
+                    ->first();
+
+                if ($lastDoc) {
+                    $lastNumber = substr($lastDoc->doc_no, -2);
+                    $nextNumber = str_pad((int)$lastNumber + 1, 2, '0', STR_PAD_LEFT);
+                } else {
+                    $nextNumber = '01';
+                }
+
+                $model->doc_no = $prefix . $nextNumber;
+            }
+        });
+    }
+
+    public function warehouse(): BelongsTo
+    {
+        return $this->belongsTo(Warehouse::class);
+    }
+
+    public function countDoc(): BelongsTo
+    {
+        return $this->belongsTo(InventoryCountDoc::class, 'count_doc_id');
+    }
+
+    public function items(): HasMany
+    {
+        return $this->hasMany(InventoryAdjustItem::class, 'adjust_doc_id');
+    }
+
+    public function createdBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
+
+    public function postedBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'posted_by');
+    }
+
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logFillable()
+            ->dontSubmitEmptyLogs();
+    }
+
+    public function tapActivity(\Spatie\Activitylog\Contracts\Activity $activity, string $eventName)
+    {
+        // 確保為陣列以進行修改
+        $properties = $activity->properties instanceof \Illuminate\Support\Collection 
+            ? $activity->properties->toArray() 
+            : $activity->properties;
+
+        $snapshot = $properties['snapshot'] ?? [];
+
+        // Snapshot key information
+        $snapshot['doc_no'] = $this->doc_no;
+        $snapshot['warehouse_name'] = $this->warehouse ? $this->warehouse->name : null;
+        $snapshot['posted_at'] = $this->posted_at ? $this->posted_at->format('Y-m-d H:i:s') : null;
+        $snapshot['status'] = $this->status;
+        $snapshot['created_by_name'] = $this->createdBy ? $this->createdBy->name : null;
+        $snapshot['posted_by_name'] = $this->postedBy ? $this->postedBy->name : null;
+
+        $properties['snapshot'] = $snapshot;
+
+        // 全域 ID 轉名稱邏輯 (用於 attributes 與 old)
+        $convertIdsToNames = function (&$data) {
+            if (empty($data) || !is_array($data)) return;
+
+            // 倉庫 ID 轉換
+            if (isset($data['warehouse_id']) && is_numeric($data['warehouse_id'])) {
+                $warehouse = \App\Modules\Inventory\Models\Warehouse::find($data['warehouse_id']);
+                if ($warehouse) {
+                    $data['warehouse_id'] = $warehouse->name;
+                }
+            }
+
+            // 使用者 ID 轉換
+            $userFields = ['created_by', 'updated_by', 'posted_by'];
+            foreach ($userFields as $field) {
+                if (isset($data[$field]) && is_numeric($data[$field])) {
+                    $user = \App\Modules\Core\Models\User::find($data[$field]);
+                    if ($user) {
+                        $data[$field] = $user->name;
+                    }
+                }
+            }
+        };
+
+        if (isset($properties['attributes'])) {
+            $convertIdsToNames($properties['attributes']);
+        }
+        if (isset($properties['old'])) {
+            $convertIdsToNames($properties['old']);
+        }
+
+        $activity->properties = $properties;
+    }
+}
--- a/app/Modules/Inventory/Models/InventoryAdjustItem.php
+++ b/app/Modules/Inventory/Models/InventoryAdjustItem.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Modules\Inventory\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class InventoryAdjustItem extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'adjust_doc_id',
+        'product_id',
+        'batch_number',
+        'qty_before',
+        'adjust_qty', // 增減數量
+        'notes',
+    ];
+
+    protected $casts = [
+        'qty_before' => 'decimal:2',
+        'adjust_qty' => 'decimal:2',
+    ];
+
+    public function doc(): BelongsTo
+    {
+        return $this->belongsTo(InventoryAdjustDoc::class, 'adjust_doc_id');
+    }
+
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(Product::class);
+    }
+}
--- a/app/Modules/Inventory/Models/InventoryCountDoc.php
+++ b/app/Modules/Inventory/Models/InventoryCountDoc.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Modules\Inventory\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use App\Modules\Core\Models\User;
+use Spatie\Activitylog\Traits\LogsActivity;
+use Spatie\Activitylog\LogOptions;
+
+class InventoryCountDoc extends Model
+{
+    use HasFactory;
+    use LogsActivity;
+
+    protected $fillable = [
+        'doc_no',
+        'warehouse_id',
+        'status',
+        'snapshot_date',
+        'completed_at',
+        'remarks',
+        'created_by',
+        'updated_by',
+        'completed_by',
+    ];
+
+    protected $casts = [
+        'snapshot_date' => 'datetime',
+        'completed_at' => 'datetime',
+    ];
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            if (empty($model->doc_no)) {
+                $today = date('Ymd');
+                $prefix = 'CNT-' . $today . '-';
+                
+                // 查詢當天編號最大的單據
+                $lastDoc = static::where('doc_no', 'like', $prefix . '%')
+                    ->orderBy('doc_no', 'desc')
+                    ->first();
+
+                if ($lastDoc) {
+                    // 取得最後兩位序號並遞增
+                    $lastNumber = substr($lastDoc->doc_no, -2);
+                    $nextNumber = str_pad((int)$lastNumber + 1, 2, '0', STR_PAD_LEFT);
+                } else {
+                    $nextNumber = '01';
+                }
+
+                $model->doc_no = $prefix . $nextNumber;
+            }
+        });
+    }
+
+    public function warehouse(): BelongsTo
+    {
+        return $this->belongsTo(Warehouse::class);
+    }
+
+    public function items(): HasMany
+    {
+        return $this->hasMany(InventoryCountItem::class, 'count_doc_id');
+    }
+
+    public function createdBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
+    
+    public function completedBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'completed_by');
+    }
+
+    public function getActivitylogOptions(): \Spatie\Activitylog\LogOptions
+    {
+        return \Spatie\Activitylog\LogOptions::defaults()
+            ->logFillable()
+            ->dontSubmitEmptyLogs();
+    }
+
+    public function tapActivity(\Spatie\Activitylog\Contracts\Activity $activity, string $eventName)
+    {
+        // 確保為陣列以進行修改
+        $properties = $activity->properties instanceof \Illuminate\Support\Collection 
+            ? $activity->properties->toArray() 
+            : $activity->properties;
+
+        $snapshot = $properties['snapshot'] ?? [];
+
+        // Snapshot key information
+        $snapshot['doc_no'] = $this->doc_no;
+        $snapshot['warehouse_name'] = $this->warehouse ? $this->warehouse->name : null;
+        $snapshot['completed_at'] = $this->completed_at ? $this->completed_at->format('Y-m-d H:i:s') : null;
+        $snapshot['status'] = $this->status;
+        $snapshot['created_by_name'] = $this->createdBy ? $this->createdBy->name : null;
+        $snapshot['completed_by_name'] = $this->completedBy ? $this->completedBy->name : null;
+
+        $properties['snapshot'] = $snapshot;
+
+        // 全域 ID 轉名稱邏輯 (用於 attributes 與 old)
+        $convertIdsToNames = function (&$data) {
+            if (empty($data) || !is_array($data)) return;
+
+            // 倉庫 ID 轉換
+            if (isset($data['warehouse_id']) && is_numeric($data['warehouse_id'])) {
+                $warehouse = \App\Modules\Inventory\Models\Warehouse::find($data['warehouse_id']);
+                if ($warehouse) {
+                    $data['warehouse_id'] = $warehouse->name;
+                }
+            }
+
+            // 使用者 ID 轉換
+            $userFields = ['created_by', 'updated_by', 'completed_by'];
+            foreach ($userFields as $field) {
+                if (isset($data[$field]) && is_numeric($data[$field])) {
+                    $user = \App\Modules\Core\Models\User::find($data[$field]);
+                    if ($user) {
+                        $data[$field] = $user->name;
+                    }
+                }
+            }
+        };
+
+        if (isset($properties['attributes'])) {
+            $convertIdsToNames($properties['attributes']);
+        }
+        if (isset($properties['old'])) {
+            $convertIdsToNames($properties['old']);
+        }
+
+        $activity->properties = $properties;
+    }
+}
--- a/app/Modules/Inventory/Models/InventoryCountItem.php
+++ b/app/Modules/Inventory/Models/InventoryCountItem.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Modules\Inventory\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class InventoryCountItem extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'count_doc_id',
+        'product_id',
+        'batch_number',
+        'system_qty',
+        'counted_qty',
+        'diff_qty',
+        'notes',
+    ];
+
+    protected $casts = [
+        'system_qty' => 'decimal:2',
+        'counted_qty' => 'decimal:2',
+        'diff_qty' => 'decimal:2',
+    ];
+
+    public function doc(): BelongsTo
+    {
+        return $this->belongsTo(InventoryCountDoc::class, 'count_doc_id');
+    }
+
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(Product::class);
+    }
+}
--- a/app/Modules/Inventory/Models/InventoryTransaction.php
+++ b/app/Modules/Inventory/Models/InventoryTransaction.php
@@ -26,7 +26,9 @@ class InventoryTransaction extends Model
    ];

    protected $casts = [
-        'actual_time' => 'datetime',
+        // actual_time 不做時區轉換，保留原始字串格式（台北時間）
+        // 原因：資料庫儲存的是台北時間，但 MySQL 時區為 UTC
+        // 若使用 datetime cast，Laravel 會誤當作 UTC 再轉回台北時間，造成偏移
        'unit_cost' => 'decimal:4',
    ];

--- a/app/Modules/Inventory/Models/InventoryTransferItem.php
+++ b/app/Modules/Inventory/Models/InventoryTransferItem.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Modules\Inventory\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class InventoryTransferItem extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'transfer_order_id',
+        'product_id',
+        'batch_number',
+        'quantity',
+        'position',
+        'snapshot_quantity',
+        'notes',
+    ];
+
+    protected $casts = [
+        'quantity' => 'decimal:2',
+    ];
+
+    public function order(): BelongsTo
+    {
+        return $this->belongsTo(InventoryTransferOrder::class, 'transfer_order_id');
+    }
+
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(Product::class);
+    }
+}
--- a/app/Modules/Inventory/Models/InventoryTransferOrder.php
+++ b/app/Modules/Inventory/Models/InventoryTransferOrder.php
@@ -0,0 +1,170 @@
+<?php
+namespace App\Modules\Inventory\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Spatie\Activitylog\Traits\LogsActivity;
+use Spatie\Activitylog\LogOptions;
+use App\Modules\Core\Models\User;
+
+class InventoryTransferOrder extends Model
+{
+    use HasFactory, LogsActivity;
+
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logFillable()
+            ->dontSubmitEmptyLogs();
+    }
+
+    /**
+     * @var array 暫存的活動紀錄屬性 (不會存入資料庫)
+     */
+    public $activityProperties = [];
+
+    /**
+     * 自定義日誌屬性名稱解析
+     */
+    public function tapActivity(\Spatie\Activitylog\Models\Activity $activity, string $eventName)
+    {
+        $properties = $activity->properties->toArray();
+
+        // 處置日誌事件說明
+        if ($eventName === 'created') {
+            $activity->description = 'created';
+        } elseif ($eventName === 'updated') {
+            // 如果屬性中有 status 且變更為 completed，將描述改為 posted
+            if (isset($properties['attributes']['status']) && $properties['attributes']['status'] === 'completed') {
+                $activity->description = 'posted';
+                $eventName = 'posted'; // 供後續快照邏輯判定
+            } else {
+                $activity->description = 'updated';
+            }
+        }
+
+        // 處理倉庫 ID 轉名稱
+        $idToNameFields = [
+            'from_warehouse_id' => 'fromWarehouse',
+            'to_warehouse_id' => 'toWarehouse',
+            'created_by' => 'createdBy',
+            'posted_by' => 'postedBy',
+        ];
+
+        foreach (['attributes', 'old'] as $part) {
+            if (isset($properties[$part])) {
+                foreach ($idToNameFields as $idField => $relation) {
+                    if (isset($properties[$part][$idField])) {
+                        $id = $properties[$part][$idField];
+                        $nameField = str_replace('_id', '_name', $idField);
+                        
+                        $name = null;
+                        if ($this->relationLoaded($relation) && $this->$relation && $this->$relation->id == $id) {
+                            $name = $this->$relation->name;
+                        } else {
+                            $model = $this->$relation()->getRelated()->find($id);
+                            $name = $model ? $model->name : "ID: $id";
+                        }
+                        $properties[$part][$nameField] = $name;
+                    }
+                }
+            }
+        }
+
+        // 基本單據資訊快照 (包含單號、來源、目的地)
+        if (in_array($eventName, ['created', 'updated', 'posted', 'deleted'])) {
+            $properties['snapshot'] = [
+                'doc_no' => $this->doc_no,
+                'from_warehouse_name' => $this->fromWarehouse?->name,
+                'to_warehouse_name' => $this->toWarehouse?->name,
+                'status' => $this->status,
+            ];
+        }
+
+        // 移除輔助欄位與雜訊
+        if (isset($properties['attributes'])) {
+            unset($properties['attributes']['from_warehouse_name']);
+            unset($properties['attributes']['to_warehouse_name']);
+            unset($properties['attributes']['activityProperties']);
+            unset($properties['attributes']['updated_at']);
+        }
+        if (isset($properties['old'])) {
+            unset($properties['old']['updated_at']);
+        }
+
+        // 合併暫存屬性 (例如 items_diff)
+        if (!empty($this->activityProperties)) {
+            $properties = array_merge($properties, $this->activityProperties);
+        }
+
+        $activity->properties = collect($properties);
+    }
+
+    protected $fillable = [
+        'doc_no',
+        'from_warehouse_id',
+        'to_warehouse_id',
+        'status',
+        'remarks',
+        'posted_at',
+        'created_by',
+        'updated_by',
+        'posted_by',
+    ];
+
+    protected $casts = [
+        'posted_at' => 'datetime',
+    ];
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            if (empty($model->doc_no)) {
+                $today = date('Ymd');
+                $prefix = 'TRF-' . $today . '-';
+
+                $lastDoc = static::where('doc_no', 'like', $prefix . '%')
+                    ->orderBy('doc_no', 'desc')
+                    ->first();
+
+                if ($lastDoc) {
+                    $lastNumber = substr($lastDoc->doc_no, -2);
+                    $nextNumber = str_pad((int)$lastNumber + 1, 2, '0', STR_PAD_LEFT);
+                } else {
+                    $nextNumber = '01';
+                }
+
+                $model->doc_no = $prefix . $nextNumber;
+            }
+        });
+    }
+
+    public function fromWarehouse(): BelongsTo
+    {
+        return $this->belongsTo(Warehouse::class, 'from_warehouse_id');
+    }
+
+    public function toWarehouse(): BelongsTo
+    {
+        return $this->belongsTo(Warehouse::class, 'to_warehouse_id');
+    }
+
+    public function items(): HasMany
+    {
+        return $this->hasMany(InventoryTransferItem::class, 'transfer_order_id');
+    }
+
+    public function createdBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
+
+    public function postedBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'posted_by');
+    }
+}
--- a/app/Modules/Inventory/Models/Product.php
+++ b/app/Modules/Inventory/Models/Product.php
@@ -17,7 +17,9 @@ class Product extends Model

    protected $fillable = [
        'code',
+        'barcode',
        'name',
+        'external_pos_id',
        'category_id',
        'brand',
        'specification',
@@ -25,10 +27,17 @@ class Product extends Model
        'large_unit_id',
        'conversion_rate',
        'purchase_unit_id',
+        'location',
+        'cost_price',
+        'price',
+        'member_price',
+        'wholesale_price',
+        'is_active',
    ];

    protected $casts = [
        'conversion_rate' => 'decimal:4',
+        'is_active' => 'boolean',
    ];

    /**
--- a/app/Modules/Inventory/Models/Unit.php
+++ b/app/Modules/Inventory/Models/Unit.php
@@ -12,7 +12,7 @@ class Unit extends Model
 {
    use HasFactory, LogsActivity;

-    protected $fillable = ['name', 'abbreviation'];
+    protected $fillable = ['name', 'code'];

    public function productsAsBase(): HasMany
    {
--- a/app/Modules/Inventory/Models/Warehouse.php
+++ b/app/Modules/Inventory/Models/Warehouse.php
@@ -18,13 +18,11 @@ class Warehouse extends Model
        'type',
        'address',
        'description',
-        'is_sellable',
        'license_plate',
        'driver_name',
    ];

    protected $casts = [
-        'is_sellable' => 'boolean',
        'type' => \App\Enums\WarehouseType::class,
    ];

--- a/app/Modules/Inventory/Routes/web.php
+++ b/app/Modules/Inventory/Routes/web.php
@@ -8,9 +8,30 @@ use App\Modules\Inventory\Controllers\WarehouseController;
 use App\Modules\Inventory\Controllers\InventoryController;
 use App\Modules\Inventory\Controllers\SafetyStockController;
 use App\Modules\Inventory\Controllers\TransferOrderController;
+use App\Modules\Inventory\Controllers\CountDocController;
+use App\Modules\Inventory\Controllers\AdjustDocController;
+
+use App\Modules\Inventory\Controllers\InventoryReportController;
+
+use App\Modules\Inventory\Controllers\StockQueryController;

 Route::middleware('auth')->group(function () {
    
+    // 即時庫存查詢
+    Route::middleware('permission:inventory.view')->group(function () {
+        Route::get('/inventory/stock-query', [StockQueryController::class, 'index'])->name('inventory.stock-query.index');
+        Route::get('/inventory/stock-query/export', [StockQueryController::class, 'export'])->name('inventory.stock-query.export');
+    });
+
+    // 庫存報表
+    Route::middleware('permission:inventory_report.view')->group(function () {
+        Route::get('/inventory/report', [InventoryReportController::class, 'index'])->name('inventory.report.index');
+        Route::get('/inventory/report/export', [InventoryReportController::class, 'export'])
+            ->middleware('permission:inventory_report.export')
+            ->name('inventory.report.export');
+        Route::get('/inventory/report/{product}', [InventoryReportController::class, 'show'])->name('inventory.report.show');
+    });
+
    // 類別管理 (用於商品對話框) - 需要商品權限
    Route::middleware('permission:products.view')->group(function () {
        Route::get('/categories', [CategoryController::class, 'index'])->name('categories.index');
@@ -20,15 +41,20 @@ Route::middleware('auth')->group(function () {
    });

    // 單位管理 - 需要商品權限
-    Route::middleware('permission:products.create|products.edit')->group(function () {
-        Route::post('/units', [UnitController::class, 'store'])->name('units.store');
-        Route::put('/units/{unit}', [UnitController::class, 'update'])->name('units.update');
-        Route::delete('/units/{unit}', [UnitController::class, 'destroy'])->name('units.destroy');
+    Route::middleware('permission:products.view')->group(function () {
+        Route::post('/units', [UnitController::class, 'store'])->middleware('permission:products.create')->name('units.store');
+        Route::put('/units/{unit}', [UnitController::class, 'update'])->middleware('permission:products.edit')->name('units.update');
+        Route::delete('/units/{unit}', [UnitController::class, 'destroy'])->middleware('permission:products.delete')->name('units.destroy');
    });

    // 商品管理
    Route::middleware('permission:products.view')->group(function () {
+        Route::get('/products/template', [ProductController::class, 'template'])->name('products.template');
+        Route::post('/products/import', [ProductController::class, 'import'])->middleware('permission:products.create')->name('products.import');
        Route::get('/products', [ProductController::class, 'index'])->name('products.index');
+        Route::get('/products/create', [ProductController::class, 'create'])->middleware('permission:products.create')->name('products.create');
+        Route::get('/products/{product}', [ProductController::class, 'show'])->name('products.show');
+        Route::get('/products/{product}/edit', [ProductController::class, 'edit'])->middleware('permission:products.edit')->name('products.edit');
        Route::post('/products', [ProductController::class, 'store'])->middleware('permission:products.create')->name('products.store');
        Route::put('/products/{product}', [ProductController::class, 'update'])->middleware('permission:products.edit')->name('products.update');
        Route::delete('/products/{product}', [ProductController::class, 'destroy'])->middleware('permission:products.delete')->name('products.destroy');
@@ -49,12 +75,14 @@ Route::middleware('auth')->group(function () {
            Route::middleware('permission:inventory.adjust')->group(function () {
                Route::get('/warehouses/{warehouse}/inventory/create', [InventoryController::class, 'create'])->name('warehouses.inventory.create');
                Route::post('/warehouses/{warehouse}/inventory', [InventoryController::class, 'store'])->name('warehouses.inventory.store');
+                Route::get('/warehouses/inventory/template', [InventoryController::class, 'template'])->name('warehouses.inventory.template');
+                Route::post('/warehouses/{warehouse}/inventory/import', [InventoryController::class, 'import'])->name('warehouses.inventory.import');
                Route::get('/warehouses/{warehouse}/inventory/{inventoryId}/edit', [InventoryController::class, 'edit'])->name('warehouses.inventory.edit');
                Route::put('/warehouses/{warehouse}/inventory/{inventoryId}', [InventoryController::class, 'update'])->name('warehouses.inventory.update');
                Route::delete('/warehouses/{warehouse}/inventory/{inventoryId}', [InventoryController::class, 'destroy'])->name('warehouses.inventory.destroy');
            });

-            // API: 取得商品在特定倉庫的所有批號
+        // API: 取得商品在特定倉庫的所有批號
            Route::get('/api/warehouses/{warehouse}/inventory/batches/{productId}', [InventoryController::class, 'getBatches'])
                ->name('api.warehouses.inventory.batches');
        });
@@ -70,11 +98,57 @@ Route::middleware('auth')->group(function () {
        });
    });

-    // 撥補單 (在庫存調撥時使用)
-    Route::middleware('permission:inventory.transfer')->group(function () {
-        Route::post('/transfer-orders', [TransferOrderController::class, 'store'])->name('transfer-orders.store');
+    // 庫存盤點 (Stock Counting) - Global
+    Route::middleware('permission:inventory_count.view')->group(function () {
+        Route::get('/inventory/count-docs', [CountDocController::class, 'index'])->name('inventory.count.index');
+        Route::get('/inventory/count-docs/{doc}', [CountDocController::class, 'show'])->name('inventory.count.show');
+        Route::get('/inventory/count-docs/{doc}/print', [CountDocController::class, 'print'])->name('inventory.count.print');
    });
+    Route::post('/inventory/count-docs', [CountDocController::class, 'store'])->middleware('permission:inventory_count.create')->name('inventory.count.store');
+    Route::put('/inventory/count-docs/{doc}', [CountDocController::class, 'update'])->middleware('permission:inventory_count.edit')->name('inventory.count.update');
+    Route::delete('/inventory/count-docs/{doc}', [CountDocController::class, 'destroy'])->middleware('permission:inventory_count.delete')->name('inventory.count.destroy');
+    Route::put('/inventory/count-docs/{doc}/reopen', [CountDocController::class, 'reopen'])->middleware('permission:inventory_count.edit')->name('inventory.count.reopen');
+
+    // 庫存盤調 (Stock Adjustment) - Global
+    Route::middleware('permission:inventory_adjust.view')->group(function () {
+        Route::get('/inventory/adjust-docs', [AdjustDocController::class, 'index'])->name('inventory.adjust.index');
+        Route::get('/inventory/adjust-docs/get-pending-counts', [AdjustDocController::class, 'getPendingCounts'])->name('inventory.adjust.pending-counts');
+        Route::get('/inventory/adjust-docs/{doc}', [AdjustDocController::class, 'show'])->name('inventory.adjust.show');
+    });
+    Route::post('/inventory/adjust-docs', [AdjustDocController::class, 'store'])->middleware('permission:inventory_adjust.create')->name('inventory.adjust.store');
+    Route::put('/inventory/adjust-docs/{doc}', [AdjustDocController::class, 'update'])->middleware('permission:inventory_adjust.edit')->name('inventory.adjust.update');
+    Route::delete('/inventory/adjust-docs/{doc}', [AdjustDocController::class, 'destroy'])->middleware('permission:inventory_adjust.delete')->name('inventory.adjust.destroy');
+
+    // 撥補單/調撥單 (Transfer Order) - Global
+    Route::middleware('permission:inventory_transfer.view')->group(function () {
+        Route::get('/inventory/transfer-orders', [TransferOrderController::class, 'index'])->name('inventory.transfer.index');
+        Route::get('/inventory/transfer-orders/{order}', [TransferOrderController::class, 'show'])->name('inventory.transfer.show');
+    });
+    Route::post('/inventory/transfer-orders', [TransferOrderController::class, 'store'])->middleware('permission:inventory_transfer.create')->name('inventory.transfer.store');
+    Route::put('/inventory/transfer-orders/{order}', [TransferOrderController::class, 'update'])->middleware('permission:inventory_transfer.edit')->name('inventory.transfer.update');
+    Route::delete('/inventory/transfer-orders/{order}', [TransferOrderController::class, 'destroy'])->middleware('permission:inventory_transfer.delete')->name('inventory.transfer.destroy');
    Route::get('/api/warehouses/{warehouse}/inventories', [TransferOrderController::class, 'getWarehouseInventories'])
        ->middleware('permission:inventory.view')
        ->name('api.warehouses.inventories');
+
+    // 調撥單匯入明細
+    Route::post('/inventory/transfer-orders/{order}/import', [TransferOrderController::class, 'importItems'])
+        ->middleware('permission:inventory_transfer.edit')
+        ->name('inventory.transfer.import-items');
+    
+    // 下載調撥單匯入範本
+    Route::get('/inventory/transfer-orders/template/download', [TransferOrderController::class, 'template'])
+        ->middleware('permission:inventory_transfer.view')
+        ->name('inventory.transfer.template');
+
+    // 進貨單 (Goods Receipts)
+    Route::middleware('permission:goods_receipts.view')->group(function () {
+        Route::get('/goods-receipts', [\App\Modules\Inventory\Controllers\GoodsReceiptController::class, 'index'])->name('goods-receipts.index');
+        Route::get('/goods-receipts/create', [\App\Modules\Inventory\Controllers\GoodsReceiptController::class, 'create'])->middleware('permission:goods_receipts.create')->name('goods-receipts.create');
+        Route::get('/goods-receipts/{goods_receipt}', [\App\Modules\Inventory\Controllers\GoodsReceiptController::class, 'show'])->name('goods-receipts.show');
+        Route::post('/goods-receipts', [\App\Modules\Inventory\Controllers\GoodsReceiptController::class, 'store'])->middleware('permission:goods_receipts.create')->name('goods-receipts.store');
+        Route::get('/api/goods-receipts/search-pos', [\App\Modules\Inventory\Controllers\GoodsReceiptController::class, 'searchPOs'])->name('goods-receipts.search-pos');
+        Route::get('/api/goods-receipts/search-products', [\App\Modules\Inventory\Controllers\GoodsReceiptController::class, 'searchProducts'])->name('goods-receipts.search-products');
+        Route::get('/api/goods-receipts/search-vendors', [\App\Modules\Inventory\Controllers\GoodsReceiptController::class, 'searchVendors'])->name('goods-receipts.search-vendors');
+    });
 });
--- a/app/Modules/Inventory/Services/AdjustService.php
+++ b/app/Modules/Inventory/Services/AdjustService.php
@@ -0,0 +1,265 @@
+<?php
+namespace App\Modules\Inventory\Services;
+
+use App\Modules\Inventory\Models\Inventory;
+use App\Modules\Inventory\Models\InventoryCountDoc;
+use App\Modules\Inventory\Models\InventoryAdjustDoc;
+use App\Modules\Inventory\Models\InventoryAdjustItem;
+use Illuminate\Support\Facades\DB;
+
+class AdjustService
+{
+    public function createDoc(string $warehouseId, string $reason, ?string $remarks = null, int $userId, ?int $countDocId = null): InventoryAdjustDoc
+    {
+        return InventoryAdjustDoc::create([
+            'warehouse_id' => $warehouseId,
+            'count_doc_id' => $countDocId,
+            'status' => 'draft',
+            'reason' => $reason,
+            'remarks' => $remarks,
+            'created_by' => $userId,
+        ]);
+    }
+
+    /**
+     * 從盤點單建立盤調單
+     */
+    public function createFromCountDoc(InventoryCountDoc $countDoc, int $userId): InventoryAdjustDoc
+    {
+        return DB::transaction(function () use ($countDoc, $userId) {
+            // 1. 建立盤調單頭
+            $adjDoc = $this->createDoc(
+                $countDoc->warehouse_id,
+                "盤點調整: " . $countDoc->doc_no,
+                "由盤點單 {$countDoc->doc_no} 自動生成",
+                $userId,
+                $countDoc->id
+            );
+
+            // 2. 抓取有差異的明細 (diff_qty != 0)
+            foreach ($countDoc->items as $item) {
+                if (abs($item->diff_qty) < 0.0001) continue;
+
+                $adjDoc->items()->create([
+                    'product_id' => $item->product_id,
+                    'batch_number' => $item->batch_number,
+                    'qty_before' => $item->system_qty,
+                    'adjust_qty' => $item->diff_qty,
+                    'notes' => "盤點差異: " . $item->diff_qty,
+                ]);
+            }
+
+            return $adjDoc;
+        });
+    }
+
+    /**
+     * 更新盤調單內容 (Items)
+     * 此處採用 "全量更新" 方式處理 items (先刪後加)，簡單可靠
+     */
+    public function updateItems(InventoryAdjustDoc $doc, array $itemsData): void
+    {
+        DB::transaction(function () use ($doc, $itemsData) {
+            $updatedItems = [];
+            $oldItems = $doc->items()->with('product')->get();
+            
+            // 記錄舊品項狀態 (用於標註異動)
+            foreach ($oldItems as $oldItem) {
+                $updatedItems[] = [
+                    'product_name' => $oldItem->product->name,
+                    'old' => [
+                        'adjust_qty' => (float)$oldItem->adjust_qty,
+                        'notes' => $oldItem->notes,
+                    ],
+                    'new' => null // 標記為刪除或待更新
+                ];
+            }
+
+            $doc->items()->delete();
+
+            foreach ($itemsData as $data) {
+                // 取得當前庫存作為 qty_before 參考 (僅參考，實際扣減以過帳當下為準)
+                $inventory = Inventory::where('warehouse_id', $doc->warehouse_id)
+                    ->where('product_id', $data['product_id'])
+                    ->where('batch_number', $data['batch_number'] ?? null)
+                    ->first();
+                
+                $qtyBefore = $inventory ? $inventory->quantity : 0;
+
+                $newItem = $doc->items()->create([
+                    'product_id' => $data['product_id'],
+                    'batch_number' => $data['batch_number'] ?? null,
+                    'qty_before' => $qtyBefore,
+                    'adjust_qty' => $data['adjust_qty'],
+                    'notes' => $data['notes'] ?? null,
+                ]);
+
+                // 更新日誌中的品項列表
+                $productName = \App\Modules\Inventory\Models\Product::find($data['product_id'])?->name;
+                $found = false;
+                foreach ($updatedItems as $idx => $ui) {
+                    if ($ui['product_name'] === $productName && $ui['new'] === null) {
+                        $updatedItems[$idx]['new'] = [
+                            'adjust_qty' => (float)$data['adjust_qty'],
+                            'notes' => $data['notes'] ?? null,
+                        ];
+                        $found = true;
+                        break;
+                    }
+                }
+                if (!$found) {
+                    $updatedItems[] = [
+                        'product_name' => $productName,
+                        'old' => null,
+                        'new' => [
+                            'adjust_qty' => (float)$data['adjust_qty'],
+                            'notes' => $data['notes'] ?? null,
+                        ]
+                    ];
+                }
+            }
+
+            // 清理沒被更新到的舊品項 (即真正被刪除的)
+            $finalUpdatedItems = [];
+            foreach ($updatedItems as $ui) {
+                if ($ui['old'] === null && $ui['new'] === null) continue;
+                // 比對是否有實質變動
+                if ($ui['old'] != $ui['new']) {
+                    $finalUpdatedItems[] = $ui;
+                }
+            }
+
+            if (!empty($finalUpdatedItems)) {
+                activity()
+                    ->performedOn($doc)
+                    ->causedBy(auth()->user())
+                    ->event('updated')
+                    ->withProperties([
+                        'items_diff' => [
+                            'updated' => $finalUpdatedItems,
+                        ]
+                    ])
+                    ->log('updated');
+            }
+        });
+    }
+
+    /**
+     * 過帳 (Post) - 生效庫存異動
+     */
+    public function post(InventoryAdjustDoc $doc, int $userId): void
+    {
+        DB::transaction(function () use ($doc, $userId) {
+            $oldStatus = $doc->status;
+            
+            foreach ($doc->items as $item) {
+                if ($item->adjust_qty == 0) continue;
+
+                $inventory = Inventory::firstOrNew([
+                    'warehouse_id' => $doc->warehouse_id,
+                    'product_id' => $item->product_id,
+                    'batch_number' => $item->batch_number,
+                ]);
+
+                // 如果是新建立的 object (id 為空)，需要初始化 default
+                if (!$inventory->exists) {
+                     $inventory->unit_cost = $item->product->cost ?? 0;
+                     $inventory->quantity = 0; 
+                }
+
+                $oldQty = $inventory->quantity;
+                $newQty = $oldQty + $item->adjust_qty;
+                
+                $inventory->quantity = $newQty;
+                $inventory->total_value = $newQty * $inventory->unit_cost;
+                $inventory->save();
+
+                // 建立 Transaction
+                $inventory->transactions()->create([
+                    'type' => '庫存調整',
+                    'quantity' => $item->adjust_qty,
+                    'unit_cost' => $inventory->unit_cost,
+                    'balance_before' => $oldQty,
+                    'balance_after' => $newQty,
+                    'reason' => "盤調單 {$doc->doc_no}: " . ($doc->reason ?? '手動調整'),
+                    'actual_time' => now(),
+                    'user_id' => $userId,
+                ]);
+            }
+
+            // 使用 saveQuietly 避免重複產生自動日誌
+            $doc->status = 'posted';
+            $doc->posted_at = now();
+            $doc->posted_by = $userId;
+            $doc->saveQuietly();
+
+            // 準備品項快照供日誌使用
+            $itemsSnapshot = $doc->items->map(function($item) {
+                return [
+                    'product_name' => $item->product->name,
+                    'old' => null, // 過帳視為整單生效，不顯示個別欄位差異
+                    'new' => [
+                        'adjust_qty' => (float)$item->adjust_qty,
+                        'notes' => $item->notes,
+                    ]
+                ];
+            })->toArray();
+
+            // 手動產生過帳日誌
+            activity()
+                ->performedOn($doc)
+                ->causedBy(auth()->user())
+                ->event('updated')
+                ->withProperties([
+                    'attributes' => [
+                        'status' => 'posted',
+                        'posted_at' => $doc->posted_at->format('Y-m-d H:i:s'),
+                        'posted_by' => $userId,
+                    ],
+                    'old' => [
+                        'status' => $oldStatus,
+                        'posted_at' => null,
+                        'posted_by' => null,
+                    ],
+                    'items_diff' => [
+                        'updated' => $itemsSnapshot,
+                    ]
+                ])
+                ->log('posted');
+
+            // 4. 若關聯盤點單，連動更新盤點單狀態
+            if ($doc->count_doc_id) {
+                $countDoc = InventoryCountDoc::find($doc->count_doc_id);
+                if ($countDoc) {
+                    $countDoc->status = 'adjusted';
+                    $countDoc->saveQuietly(); // 盤點單也靜默更新
+                }
+            }
+        });
+    }
+    
+    /**
+     * 作廢 (Void)
+     */
+    public function void(InventoryAdjustDoc $doc, int $userId): void 
+    {
+         if ($doc->status !== 'draft') {
+             throw new \Exception('只能作廢草稿狀態的單據');
+         }
+
+         $oldStatus = $doc->status;
+         $doc->status = 'voided';
+         $doc->updated_by = $userId;
+         $doc->saveQuietly();
+
+         activity()
+            ->performedOn($doc)
+            ->causedBy(auth()->user())
+            ->event('updated')
+            ->withProperties([
+                'attributes' => ['status' => 'voided'],
+                'old' => ['status' => $oldStatus]
+            ])
+            ->log('voided');
+    }
+}
--- a/app/Modules/Inventory/Services/CountService.php
+++ b/app/Modules/Inventory/Services/CountService.php
@@ -0,0 +1,208 @@
+<?php
+
+namespace App\Modules\Inventory\Services;
+
+use App\Modules\Inventory\Models\Inventory;
+use App\Modules\Inventory\Models\InventoryCountDoc;
+use App\Modules\Inventory\Models\InventoryCountItem;
+use App\Modules\Inventory\Models\Warehouse;
+use App\Modules\Inventory\Models\Product;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+class CountService
+{
+    /**
+     * 建立新的盤點單並執行快照
+     */
+    public function createDoc(string $warehouseId, string $remarks = null, int $userId): InventoryCountDoc
+    {
+        return DB::transaction(function () use ($warehouseId, $remarks, $userId) {
+            $doc = InventoryCountDoc::create([
+                'warehouse_id' => $warehouseId,
+                'status' => 'counting',
+                'snapshot_date' => now(),
+                'remarks' => $remarks,
+                'created_by' => $userId,
+            ]);
+
+            return $doc;
+        });
+    }
+
+    /**
+     * 執行快照：鎖定當前庫存量
+     */
+    public function snapshot(InventoryCountDoc $doc, bool $updateDoc = true): void
+    {
+        DB::transaction(function () use ($doc, $updateDoc) {
+            // 清除舊的 items (如果有)
+            $doc->items()->delete();
+
+            // 取得該倉庫所有庫存 (包含 quantity = 0 但未軟刪除的)
+            // 這裡可以根據需求決定是否要過濾掉 0 庫存，通常盤點單會希望能看到所有 "帳上有紀錄" 的東西
+            $inventories = Inventory::where('warehouse_id', $doc->warehouse_id)
+                ->whereNull('deleted_at') 
+                ->get();
+
+            $items = [];
+            foreach ($inventories as $inv) {
+                $items[] = [
+                    'count_doc_id' => $doc->id,
+                    'product_id' => $inv->product_id,
+                    'batch_number' => $inv->batch_number,
+                    'system_qty' => $inv->quantity,
+                    'counted_qty' => null, // 預設未盤點
+                    'diff_qty' => 0,
+                    'created_at' => now(),
+                    'updated_at' => now(),
+                ];
+            }
+
+            if (!empty($items)) {
+                InventoryCountItem::insert($items);
+            }
+
+            if ($updateDoc) {
+                $doc->update([
+                    'status' => 'counting',
+                    'snapshot_date' => now(),
+                ]);
+            }
+        });
+    }
+
+    /**
+     * 完成盤點：過帳差異
+     */
+    public function complete(InventoryCountDoc $doc, int $userId): void
+    {
+        DB::transaction(function () use ($doc, $userId) {
+            // 僅更新單據狀態為「已完成」，不執行庫存入庫/調整
+            // 盤點單僅作為記錄，後續調整由盤調單 (AdjustDoc) 執行
+            $doc->update([
+                'status' => 'completed',
+                'completed_at' => now(),
+                'completed_by' => $userId,
+            ]);
+        });
+    }
+
+    /**
+     * 更新盤點數量
+     */
+    public function updateCount(InventoryCountDoc $doc, array $itemsData): void
+    {
+        DB::transaction(function () use ($doc, $itemsData) {
+            $updatedItems = [];
+            $hasChanges = false;
+            $oldDocAttributes = [
+                'status' => $doc->status,
+                'completed_at' => $doc->completed_at ? $doc->completed_at->format('Y-m-d H:i:s') : null,
+                'completed_by' => $doc->completed_by,
+            ];
+
+            foreach ($itemsData as $data) {
+                $item = $doc->items()->with('product')->find($data['id']);
+                if ($item) {
+                    $oldQty = $item->counted_qty;
+                    $newQty = $data['counted_qty'];
+                    $oldNotes = $item->notes;
+                    $newNotes = $data['notes'] ?? $item->notes;
+                    
+                    $isQtyChanged = $oldQty != $newQty;
+                    $isNotesChanged = $oldNotes !== $newNotes;
+
+                    if ($isQtyChanged || $isNotesChanged) {
+                        $updatedItems[] = [
+                            'product_name' => $item->product->name,
+                            'old' => [
+                                'counted_qty' => $oldQty,
+                                'notes' => $oldNotes,
+                            ],
+                            'new' => [
+                                'counted_qty' => $newQty,
+                                'notes' => $newNotes,
+                            ]
+                        ];
+
+                        $countedQty = $data['counted_qty'];
+                        $diff = is_numeric($countedQty) ? ($countedQty - $item->system_qty) : 0;
+                        
+                        $item->update([
+                            'counted_qty' => $countedQty,
+                            'diff_qty' => $diff,
+                            'notes' => $newNotes,
+                        ]);
+                        $hasChanges = true;
+                    }
+                }
+            }
+
+            // 檢查是否完成
+            $doc->refresh();
+            $isAllCounted = $doc->items()->whereNull('counted_qty')->count() === 0;
+            $newDocAttributesLog = [];
+
+            if ($isAllCounted) {
+                // 檢查是否有任何差異
+                $hasDiff = $doc->items()->where('diff_qty', '!=', 0)->exists();
+                $targetStatus = $hasDiff ? 'completed' : 'no_adjust';
+
+                if ($doc->status !== $targetStatus) {
+                    $doc->status = $targetStatus;
+                    $doc->completed_at = now();
+                    $doc->completed_by = auth()->id();
+                    $doc->saveQuietly();
+                    
+                    $doc->refresh();
+                    
+                    $newDocAttributesLog = [
+                        'status' => $targetStatus,
+                        'completed_at' => $doc->completed_at->format('Y-m-d H:i:s'),
+                        'completed_by' => $doc->completed_by,
+                    ];
+                    $hasChanges = true;
+                }
+            } else {
+                if ($doc->status === 'completed') {
+                    $doc->status = 'counting';
+                    $doc->completed_at = null;
+                    $doc->completed_by = null;
+                    $doc->saveQuietly();
+
+                    $newDocAttributesLog = [
+                        'status' => 'counting',
+                        'completed_at' => null,
+                        'completed_by' => null,
+                    ];
+                    $hasChanges = true;
+                }
+            }
+
+            // 記錄操作日誌
+            if ($hasChanges) {
+                $properties = [
+                    'items_diff' => [
+                        'added' => [],
+                        'removed' => [],
+                        'updated' => $updatedItems,
+                    ],
+                ];
+
+                // 如果有文件層級的屬性變更 (狀態)，併入 log
+                if (!empty($newDocAttributesLog)) {
+                    $properties['attributes'] = $newDocAttributesLog;
+                    $properties['old'] = array_intersect_key($oldDocAttributes, $newDocAttributesLog);
+                }
+
+                activity()
+                    ->performedOn($doc)
+                    ->causedBy(auth()->user())
+                    ->event('updated')
+                    ->withProperties($properties)
+                    ->log('updated');
+            }
+        });
+    }
+}
--- a/app/Modules/Inventory/Services/GoodsReceiptService.php
+++ b/app/Modules/Inventory/Services/GoodsReceiptService.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Modules\Inventory\Services;
+
+use App\Modules\Inventory\Models\GoodsReceipt;
+use App\Modules\Inventory\Models\GoodsReceiptItem;
+use App\Modules\Inventory\Contracts\InventoryServiceInterface;
+use App\Modules\Procurement\Contracts\ProcurementServiceInterface;
+use Illuminate\Support\Facades\DB;
+
+class GoodsReceiptService
+{
+    protected $inventoryService;
+    protected $procurementService;
+
+    public function __construct(
+        InventoryServiceInterface $inventoryService,
+        ProcurementServiceInterface $procurementService
+    ) {
+        $this->inventoryService = $inventoryService;
+        $this->procurementService = $procurementService;
+    }
+
+    /**
+     * Store a new Goods Receipt and process inventory.
+     *
+     * @param array $data
+     * @return GoodsReceipt
+     * @throws \Exception
+     */
+    public function store(array $data)
+    {
+        return DB::transaction(function () use ($data) {
+            // 1. Generate Code
+            $data['code'] = $this->generateCode($data['received_date']);
+            $data['user_id'] = auth()->id();
+            $data['status'] = 'completed'; // Direct completion for now
+
+            // 2. Create Header
+            $goodsReceipt = GoodsReceipt::create($data);
+
+            // 3. Process Items
+            foreach ($data['items'] as $itemData) {
+                // Create GR Item
+                $grItem = new GoodsReceiptItem([
+                    'product_id' => $itemData['product_id'],
+                    'purchase_order_item_id' => $itemData['purchase_order_item_id'] ?? null,
+                    'quantity_received' => $itemData['quantity_received'],
+                    'unit_price' => $itemData['unit_price'],
+                    'total_amount' => $itemData['quantity_received'] * $itemData['unit_price'],
+                    'batch_number' => $itemData['batch_number'] ?? null,
+                    'expiry_date' => $itemData['expiry_date'] ?? null,
+                ]);
+                $goodsReceipt->items()->save($grItem);
+
+                // 4. Update Inventory
+                $reason = match($goodsReceipt->type) {
+                    'standard' => '採購進貨',
+                    'miscellaneous' => '雜項入庫',
+                    'other' => '其他入庫',
+                    default => '進貨入庫',
+                };
+
+                $this->inventoryService->createInventoryRecord([
+                    'warehouse_id' => $goodsReceipt->warehouse_id,
+                    'product_id' => $grItem->product_id,
+                    'quantity' => $grItem->quantity_received,
+                    'unit_cost' => $grItem->unit_price,
+                    'batch_number' => $grItem->batch_number,
+                    'expiry_date' => $grItem->expiry_date,
+                    'reason' => $reason,
+                    'reference_type' => GoodsReceipt::class,
+                    'reference_id' => $goodsReceipt->id,
+                    'source_purchase_order_id' => $goodsReceipt->purchase_order_id,
+                    'arrival_date' => $goodsReceipt->received_date,
+                ]);
+
+                // 5. Update PO if linked and type is standard
+                if ($goodsReceipt->type === 'standard' && $goodsReceipt->purchase_order_id && $grItem->purchase_order_item_id) {
+                    $this->procurementService->updateReceivedQuantity(
+                        $grItem->purchase_order_item_id,
+                        $grItem->quantity_received
+                    );
+                }
+            }
+
+            return $goodsReceipt;
+        });
+    }
+
+    private function generateCode(string $date)
+    {
+        // Format: GR-YYYYMMDD-NN
+        $prefix = 'GR-' . date('Ymd', strtotime($date)) . '-';
+        
+        $last = GoodsReceipt::where('code', 'like', $prefix . '%')
+            ->orderBy('id', 'desc')
+            ->lockForUpdate()
+            ->first();
+
+        if ($last) {
+            $seq = intval(substr($last->code, -2)) + 1;
+        } else {
+            $seq = 1;
+        }
+
+        return $prefix . str_pad($seq, 2, '0', STR_PAD_LEFT);
+    }
+}
--- a/app/Modules/Inventory/Services/InventoryReportService.php
+++ b/app/Modules/Inventory/Services/InventoryReportService.php
@@ -0,0 +1,248 @@
+<?php
+
+namespace App\Modules\Inventory\Services;
+
+use App\Modules\Inventory\Models\InventoryTransaction;
+use App\Modules\Inventory\Models\Product; // Use Inventory module's Product if available, or Core's? Usually Product is in Inventory/Models? No, let's check. 
+// Checking Product model location... likely App\Modules\Product\Models\Product or App\Modules\Inventory\Models\Product.
+// From previous context: "products.create" permission suggests a Products module.
+// But stock query uses `products` table join.
+// Let's assume standard Laravel query builder or check existing models.
+// StockQueryController uses `InventoryService`.
+// I will use DB facade or InventoryTransaction model for aggregation.
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Eloquent\Builder;
+
+class InventoryReportService
+{
+    /**
+     * 取得庫存報表資料
+     *
+     * @param array $filters 篩選條件
+     * @param int|null $perPage 每頁筆數
+     * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Support\Collection
+     */
+    public function getReportData(array $filters, ?int $perPage = 10)
+    {
+        $dateFrom = $filters['date_from'] ?? null;
+        $dateTo = $filters['date_to'] ?? null;
+        $warehouseId = $filters['warehouse_id'] ?? null;
+        $categoryId = $filters['category_id'] ?? null;
+        $search = $filters['search'] ?? null;
+        $sortBy = $filters['sort_by'] ?? 'product_code';
+        $sortOrder = $filters['sort_order'] ?? 'asc';
+
+        // 若無任何篩選條件，直接回傳空資料
+        if (!$dateFrom && !$dateTo && !$warehouseId && !$categoryId && !$search) {
+             return new \Illuminate\Pagination\LengthAwarePaginator([], 0, $perPage ?: 10);
+        }
+
+        // 定義時間欄位轉換 (UTC -> Asia/Taipei)
+        // 日期欄位：Laravel 時區已設為 Asia/Taipei，直接使用 actual_time
+        $timeColumn = "inventory_transactions.actual_time";
+
+        // 建立查詢
+        // 我們需要針對每個 品項 在選定區間內 進行彙總
+        // 來源：inventory_transactions -> inventory -> product
+        
+        $query = InventoryTransaction::query()
+            ->select([
+                'products.code as product_code',
+                'products.name as product_name',
+                'categories.name as category_name',
+                'products.id as product_id',
+                // 進貨量：type 為 入庫, 手動入庫 (排除 調撥入庫)
+                DB::raw("SUM(CASE WHEN inventory_transactions.type IN ('入庫', '手動入庫') AND inventory_transactions.quantity > 0 THEN inventory_transactions.quantity ELSE 0 END) as inbound_qty"),
+                // 出貨量：type 為 出庫 (排除 調撥出庫) (取絕對值)
+                DB::raw("ABS(SUM(CASE WHEN inventory_transactions.type IN ('出庫') AND inventory_transactions.quantity < 0 THEN inventory_transactions.quantity ELSE 0 END)) as outbound_qty"),
+                // 調撥入：type 為 調撥入庫
+                DB::raw("SUM(CASE WHEN inventory_transactions.type = '調撥入庫' AND inventory_transactions.quantity > 0 THEN inventory_transactions.quantity ELSE 0 END) as transfer_in_qty"),
+                // 調撥出：type 為 調撥出庫 (取絕對值)
+                DB::raw("ABS(SUM(CASE WHEN inventory_transactions.type = '調撥出庫' AND inventory_transactions.quantity < 0 THEN inventory_transactions.quantity ELSE 0 END)) as transfer_out_qty"),
+                // 調整量：type 為 庫存調整, 手動編輯
+                DB::raw("SUM(CASE WHEN inventory_transactions.type IN ('庫存調整', '手動編輯') THEN inventory_transactions.quantity ELSE 0 END) as adjust_qty"),
+                // 淨變動：總和 (包含所有類型：進貨、出貨、調整、調撥)
+                DB::raw("SUM(inventory_transactions.quantity) as net_change"),
+            ])
+            ->join('inventories', 'inventory_transactions.inventory_id', '=', 'inventories.id')
+            ->join('products', 'inventories.product_id', '=', 'products.id')
+            ->leftJoin('categories', 'products.category_id', '=', 'categories.id');
+
+        // 日期篩選：資料庫儲存的是台北時間，直接用字串比對
+        if ($dateFrom && $dateTo) {
+            $query->whereRaw("$timeColumn >= ? AND $timeColumn <= ?", [
+                $dateFrom . ' 00:00:00',
+                $dateTo . ' 23:59:59'
+            ]);
+        } elseif ($dateFrom) {
+            $query->whereRaw("$timeColumn >= ?", [$dateFrom . ' 00:00:00']);
+        } elseif ($dateTo) {
+            $query->whereRaw("$timeColumn <= ?", [$dateTo . ' 23:59:59']);
+        }
+
+        // 應用篩選
+        if ($warehouseId) {
+            $query->where('inventories.warehouse_id', $warehouseId);
+        }
+
+        if ($categoryId) {
+            $query->where('products.category_id', $categoryId);
+        }
+
+        if ($search) {
+            $query->where(function ($q) use ($search) {
+                $q->where('products.name', 'like', "%{$search}%")
+                  ->orWhere('products.code', 'like', "%{$search}%");
+            });
+        }
+
+        // 分組
+        $query->groupBy([
+            'products.id',
+            'products.code',
+            'products.name',
+            'categories.name'
+        ]);
+
+        // 動態排序
+        $allowedSortFields = [
+            'product_code' => 'products.code',
+            'product_name' => 'products.name',
+            'inbound_qty' => 'inbound_qty',
+            'outbound_qty' => 'outbound_qty',
+            'transfer_in_qty' => 'transfer_in_qty',
+            'transfer_out_qty' => 'transfer_out_qty',
+            'adjust_qty' => 'adjust_qty',
+            'net_change' => 'net_change',
+        ];
+
+        $sortColumn = $allowedSortFields[$sortBy] ?? 'products.code';
+        $query->orderBy($sortColumn, $sortOrder === 'desc' ? 'desc' : 'asc');
+
+
+        if ($perPage) {
+            return $query->paginate($perPage)->withQueryString();
+        }
+
+        return $query->get();
+    }
+
+    /**
+     * 取得報表統計數據 (不分頁，針對篩選條件的全量統計)
+     */
+    public function getSummary(array $filters)
+    {
+        $dateFrom = $filters['date_from'] ?? null;
+        $dateTo = $filters['date_to'] ?? null;
+        $warehouseId = $filters['warehouse_id'] ?? null;
+        $categoryId = $filters['category_id'] ?? null;
+        $search = $filters['search'] ?? null;
+
+        // 若無任何篩選條件，直接回傳零值
+        if (!$dateFrom && !$dateTo && !$warehouseId && !$categoryId && !$search) {
+            return (object)[
+                'total_inbound' => 0,
+                'total_outbound' => 0,
+                'total_adjust' => 0,
+                'total_net_change' => 0,
+            ];
+        }
+        // 日期欄位：Laravel 時區已設為 Asia/Taipei，直接使用 actual_time
+        $timeColumn = "inventory_transactions.actual_time";
+
+        $query = InventoryTransaction::query()
+            ->join('inventories', 'inventory_transactions.inventory_id', '=', 'inventories.id')
+            ->join('products', 'inventories.product_id', '=', 'products.id')
+            ->leftJoin('categories', 'products.category_id', '=', 'categories.id');
+
+        // 日期篩選：資料庫儲存的是台北時間，直接用字串比對
+        if ($dateFrom && $dateTo) {
+            $query->whereRaw("$timeColumn >= ? AND $timeColumn <= ?", [
+                $dateFrom . ' 00:00:00',
+                $dateTo . ' 23:59:59'
+            ]);
+        } elseif ($dateFrom) {
+            $query->whereRaw("$timeColumn >= ?", [$dateFrom . ' 00:00:00']);
+        } elseif ($dateTo) {
+            $query->whereRaw("$timeColumn <= ?", [$dateTo . ' 23:59:59']);
+        }
+
+        if ($warehouseId) {
+            $query->where('inventories.warehouse_id', $warehouseId);
+        }
+
+        if ($categoryId) {
+            $query->where('products.category_id', $categoryId);
+        }
+
+        if ($search) {
+            $query->where(function ($q) use ($search) {
+                $q->where('products.name', 'like', "%{$search}%")
+                  ->orWhere('products.code', 'like', "%{$search}%");
+            });
+        }
+
+        // 直接聚合所有符合條件的交易
+        return $query->select([
+            DB::raw("SUM(CASE WHEN inventory_transactions.type IN ('入庫', '手動入庫') AND inventory_transactions.quantity > 0 THEN inventory_transactions.quantity ELSE 0 END) as total_inbound"),
+            DB::raw("ABS(SUM(CASE WHEN inventory_transactions.type IN ('出庫') AND inventory_transactions.quantity < 0 THEN inventory_transactions.quantity ELSE 0 END)) as total_outbound"),
+            DB::raw("SUM(CASE WHEN inventory_transactions.type = '調撥入庫' AND inventory_transactions.quantity > 0 THEN inventory_transactions.quantity ELSE 0 END) as total_transfer_in"),
+            DB::raw("ABS(SUM(CASE WHEN inventory_transactions.type = '調撥出庫' AND inventory_transactions.quantity < 0 THEN inventory_transactions.quantity ELSE 0 END)) as total_transfer_out"),
+            DB::raw("SUM(CASE WHEN inventory_transactions.type IN ('庫存調整', '手動編輯') THEN inventory_transactions.quantity ELSE 0 END) as total_adjust"),
+            DB::raw("SUM(inventory_transactions.quantity) as total_net_change"),
+        ])->first();
+    }
+
+    /**
+     * 取得特定商品的庫存異動明細
+     */
+    public function getProductDetails($productId, array $filters, ?int $perPage = 20)
+    {
+        $dateFrom = $filters['date_from'] ?? null;
+        $dateTo = $filters['date_to'] ?? null;
+        $warehouseId = $filters['warehouse_id'] ?? null;
+        // 日期欄位：Laravel 時區已設為 Asia/Taipei，直接使用 actual_time
+        $timeColumn = "inventory_transactions.actual_time";
+
+        $query = InventoryTransaction::query()
+            ->select([
+                'inventory_transactions.*',
+                'inventories.warehouse_id',
+                'inventories.batch_number as batch_no',
+                'warehouses.name as warehouse_name',
+                'users.name as user_name',
+                'products.code as product_code',
+                'products.name as product_name',
+                'units.name as unit_name'
+            ])
+            ->join('inventories', 'inventory_transactions.inventory_id', '=', 'inventories.id')
+            ->join('products', 'inventories.product_id', '=', 'products.id')
+            ->leftJoin('units', 'products.base_unit_id', '=', 'units.id')
+            ->leftJoin('warehouses', 'inventories.warehouse_id', '=', 'warehouses.id')
+            ->leftJoin('users', 'inventory_transactions.user_id', '=', 'users.id')
+            ->where('products.id', $productId);
+
+        // 日期篩選：資料庫儲存的是台北時間，直接用字串比對
+        if ($dateFrom && $dateTo) {
+            $query->whereRaw("$timeColumn >= ? AND $timeColumn <= ?", [
+                $dateFrom . ' 00:00:00',
+                $dateTo . ' 23:59:59'
+            ]);
+        } elseif ($dateFrom) {
+            $query->whereRaw("$timeColumn >= ?", [$dateFrom . ' 00:00:00']);
+        } elseif ($dateTo) {
+            $query->whereRaw("$timeColumn <= ?", [$dateTo . ' 23:59:59']);
+        }
+
+        if ($warehouseId) {
+            $query->where('inventories.warehouse_id', $warehouseId);
+        }
+
+        // 排序：最新的在最上面
+        $query->orderBy('inventory_transactions.actual_time', 'desc')
+              ->orderBy('inventory_transactions.id', 'desc');
+
+        return $query->paginate($perPage)->withQueryString();
+    }
+}
--- a/app/Modules/Inventory/Services/InventoryService.php
+++ b/app/Modules/Inventory/Services/InventoryService.php
@@ -17,7 +17,7 @@ class InventoryService implements InventoryServiceInterface

    public function getAllProducts()
    {
-        return Product::with(['baseUnit'])->get();
+        return Product::with(['baseUnit', 'largeUnit'])->get();
    }

    public function getUnits()
@@ -32,17 +32,17 @@ class InventoryService implements InventoryServiceInterface

    public function getProduct(int $id)
    {
-        return Product::find($id);
+        return Product::with(['baseUnit', 'largeUnit'])->find($id);
    }

    public function getProductsByIds(array $ids)
    {
-        return Product::whereIn('id', $ids)->get();
+        return Product::whereIn('id', $ids)->with(['baseUnit', 'largeUnit'])->get();
    }

    public function getProductsByName(string $name)
    {
-        return Product::where('name', 'like', "%{$name}%")->get();
+        return Product::where('name', 'like', "%{$name}%")->with(['baseUnit', 'largeUnit'])->get();
    }

    public function getWarehouse(int $id)
@@ -59,13 +59,18 @@ class InventoryService implements InventoryServiceInterface
        return $stock >= $quantity;
    }

-    public function decreaseStock(int $productId, int $warehouseId, float $quantity, ?string $reason = null): void
+    public function decreaseStock(int $productId, int $warehouseId, float $quantity, ?string $reason = null, bool $force = false, ?string $slot = null): void
    {
-        DB::transaction(function () use ($productId, $warehouseId, $quantity, $reason) {
-            $inventories = Inventory::where('product_id', $productId)
+        DB::transaction(function () use ($productId, $warehouseId, $quantity, $reason, $force, $slot) {
+            $query = Inventory::where('product_id', $productId)
                ->where('warehouse_id', $warehouseId)
-                ->where('quantity', '>', 0)
-                ->orderBy('arrival_date', 'asc')
+                ->where('quantity', '>', 0);
+            
+            if ($slot) {
+                $query->where('location', $slot);
+            }
+
+            $inventories = $query->orderBy('arrival_date', 'asc')
                ->get();

            $remainingToDecrease = $quantity;
@@ -79,8 +84,36 @@ class InventoryService implements InventoryServiceInterface
            }

            if ($remainingToDecrease > 0) {
-                // 這裡可以選擇報錯或允許負庫存，目前為了嚴謹拋出異常
-                throw new \Exception("庫存不足，無法扣除所有請求的數量。");
+                if ($force) {
+                    // Find any existing inventory record in this warehouse/slot to subtract from, or create one
+                    $query = Inventory::where('product_id', $productId)
+                        ->where('warehouse_id', $warehouseId);
+                    
+                    if ($slot) {
+                        $query->where('location', $slot);
+                    }
+
+                    $inventory = $query->first();
+                    
+                    if (!$inventory) {
+                        $inventory = Inventory::create([
+                            'warehouse_id' => $warehouseId,
+                            'product_id' => $productId,
+                            'location' => $slot,
+                            'quantity' => 0,
+                            'unit_cost' => 0,
+                            'total_value' => 0,
+                            'batch_number' => 'POS-AUTO-' . ($slot ? $slot . '-' : '') . time(),
+                            'arrival_date' => now(),
+                            'origin_country' => 'TW',
+                            'quality_status' => 'normal',
+                        ]);
+                    }
+                    
+                    $this->decreaseInventoryQuantity($inventory->id, $remainingToDecrease, $reason);
+                } else {
+                    throw new \Exception("庫存不足，無法扣除所有請求的數量。");
+                }
            }
        });
    }
@@ -188,23 +221,371 @@ class InventoryService implements InventoryServiceInterface
        });
    }

-    public function getDashboardStats(): array
+    public function findInventoryByBatch(int $warehouseId, int $productId, ?string $batchNumber)
    {
-        // 庫存總表 join 安全庫存表，計算低庫存
-        $lowStockCount = DB::table('warehouse_product_safety_stocks as ss')
-            ->join(DB::raw('(SELECT warehouse_id, product_id, SUM(quantity) as total_qty FROM inventories WHERE deleted_at IS NULL GROUP BY warehouse_id, product_id) as inv'),
-                function ($join) {
-                    $join->on('ss.warehouse_id', '=', 'inv.warehouse_id')
-                         ->on('ss.product_id', '=', 'inv.product_id');
-                })
-            ->whereRaw('inv.total_qty <= ss.safety_stock')
+        return Inventory::where('warehouse_id', $warehouseId)
+            ->where('product_id', $productId)
+            ->where('batch_number', $batchNumber)
+            ->first();
+    }
+
+    /**
+     * 即時庫存查詢：統計卡片 + 分頁明細
+     */
+    public function getStockQueryData(array $filters = [], int $perPage = 10): array
+    {
+        $today = now()->toDateString();
+        $expiryThreshold = now()->addDays(30)->toDateString();
+
+        // 基礎查詢
+        $query = Inventory::query()
+            ->join('products', 'inventories.product_id', '=', 'products.id')
+            ->join('warehouses', 'inventories.warehouse_id', '=', 'warehouses.id')
+            ->leftJoin('categories', 'products.category_id', '=', 'categories.id')
+            ->leftJoin('warehouse_product_safety_stocks as ss', function ($join) {
+                $join->on('inventories.warehouse_id', '=', 'ss.warehouse_id')
+                     ->on('inventories.product_id', '=', 'ss.product_id');
+            })
+            ->whereNull('inventories.deleted_at')
+            ->select([
+                'inventories.id',
+                'inventories.warehouse_id',
+                'inventories.product_id',
+                'inventories.quantity',
+                'inventories.batch_number',
+                'inventories.expiry_date',
+                'inventories.location',
+                'inventories.quality_status',
+                'products.code as product_code',
+                'products.name as product_name',
+                'categories.name as category_name',
+                'warehouses.name as warehouse_name',
+                'ss.safety_stock',
+            ]);
+
+        // 篩選：倉庫
+        if (!empty($filters['warehouse_id'])) {
+            $query->where('inventories.warehouse_id', $filters['warehouse_id']);
+        }
+
+        // 篩選：分類
+        if (!empty($filters['category_id'])) {
+            $query->where('products.category_id', $filters['category_id']);
+        }
+
+        // 篩選：關鍵字（商品代碼或名稱）
+        if (!empty($filters['search'])) {
+            $search = $filters['search'];
+            $query->where(function ($q) use ($search) {
+                $q->where('products.code', 'like', "%{$search}%")
+                  ->orWhere('products.name', 'like', "%{$search}%");
+            });
+        }
+
+        // 篩選：狀態 (改為對齊聚合統計的判斷標準)
+        if (!empty($filters['status'])) {
+            switch ($filters['status']) {
+                case 'low_stock':
+                    $query->whereIn(DB::raw('(inventories.warehouse_id, inventories.product_id)'), function ($sub) {
+                        $sub->select('i2.warehouse_id', 'i2.product_id')
+                            ->from('inventories as i2')
+                            ->join('warehouse_product_safety_stocks as ss2', function ($join) {
+                                $join->on('i2.warehouse_id', '=', 'ss2.warehouse_id')
+                                     ->on('i2.product_id', '=', 'ss2.product_id');
+                            })
+                            ->whereNull('i2.deleted_at')
+                            ->groupBy('i2.warehouse_id', 'i2.product_id', 'ss2.safety_stock')
+                            ->havingRaw('SUM(i2.quantity) <= ss2.safety_stock');
+                    });
+                    break;
+                case 'negative':
+                    $query->whereIn(DB::raw('(inventories.warehouse_id, inventories.product_id)'), function ($sub) {
+                        $sub->select('i2.warehouse_id', 'i2.product_id')
+                            ->from('inventories as i2')
+                            ->whereNull('i2.deleted_at')
+                            ->groupBy('i2.warehouse_id', 'i2.product_id')
+                            ->havingRaw('SUM(i2.quantity) < 0');
+                    });
+                    break;
+                case 'expiring':
+                    $query->whereNotNull('inventories.expiry_date')
+                          ->where('inventories.expiry_date', '>', $today)
+                          ->where('inventories.expiry_date', '<=', $expiryThreshold);
+                    break;
+                case 'expired':
+                    $query->whereNotNull('inventories.expiry_date')
+                          ->where('inventories.expiry_date', '<=', $today);
+                    break;
+                case 'abnormal':
+                    // 只要該「倉庫-品項」對應的總庫存有低庫存、負庫存，或該批次已過期/即將過期
+                    $query->where(function ($q) use ($today, $expiryThreshold) {
+                        // 1. 低庫存或負庫存 (依聚合判斷)
+                        $q->whereIn(DB::raw('(inventories.warehouse_id, inventories.product_id)'), function ($sub) {
+                            $sub->select('i3.warehouse_id', 'i3.product_id')
+                                ->from('inventories as i3')
+                                ->leftJoin('warehouse_product_safety_stocks as ss3', function ($join) {
+                                    $join->on('i3.warehouse_id', '=', 'ss3.warehouse_id')
+                                         ->on('i3.product_id', '=', 'ss3.product_id');
+                                })
+                                ->whereNull('i3.deleted_at')
+                                ->groupBy('i3.warehouse_id', 'i3.product_id', 'ss3.safety_stock')
+                                ->havingRaw('SUM(i3.quantity) < 0 OR (ss3.safety_stock IS NOT NULL AND SUM(i3.quantity) <= ss3.safety_stock)');
+                        })
+                        // 2. 或該批次效期異常
+                        ->orWhere(function ($q_batch) use ($expiryThreshold) {
+                            $q_batch->whereNotNull('inventories.expiry_date')
+                                    ->where('inventories.expiry_date', '<=', $expiryThreshold);
+                        });
+                    });
+                    break;
+            }
+        }
+
+        // 排序
+        $sortBy = $filters['sort_by'] ?? 'products.code';
+        $sortOrder = $filters['sort_order'] ?? 'asc';
+        $allowedSorts = ['products.code', 'products.name', 'warehouses.name', 'inventories.quantity', 'inventories.expiry_date'];
+        if (in_array($sortBy, $allowedSorts)) {
+            $query->orderBy($sortBy, $sortOrder);
+        } else {
+            $query->orderBy('products.code', 'asc');
+        }
+
+        // 統計卡片（預設無篩選條件下的全域統計，改為明細筆數計數以對齊顯示）
+        // 1. 庫存明細總數
+        $totalItems = DB::table('inventories')
+            ->whereNull('deleted_at')
            ->count();

+        // 2. 低庫存明細數：只要該明細所屬的「倉庫+商品」總量低於安全庫存，則所有相關明細都計入
+        $lowStockCount = DB::table('inventories as i')
+            ->join('warehouse_product_safety_stocks as ss', function ($join) {
+                $join->on('i.warehouse_id', '=', 'ss.warehouse_id')
+                     ->on('i.product_id', '=', 'ss.product_id');
+            })
+            ->whereNull('i.deleted_at')
+            ->whereIn(DB::raw('(i.warehouse_id, i.product_id)'), function ($sub) {
+                $sub->select('i2.warehouse_id', 'i2.product_id')
+                    ->from('inventories as i2')
+                    ->whereNull('i2.deleted_at')
+                    ->groupBy('i2.warehouse_id', 'i2.product_id')
+                    ->havingRaw('SUM(i2.quantity) <= (SELECT safety_stock FROM warehouse_product_safety_stocks WHERE warehouse_id = i2.warehouse_id AND product_id = i2.product_id LIMIT 1)');
+            })
+            ->count();
+
+        // 3. 負庫存明細數
+        $negativeCount = DB::table('inventories as i')
+            ->whereNull('i.deleted_at')
+            ->whereIn(DB::raw('(i.warehouse_id, i.product_id)'), function ($sub) {
+                $sub->select('i2.warehouse_id', 'i2.product_id')
+                    ->from('inventories as i2')
+                    ->whereNull('i2.deleted_at')
+                    ->groupBy('i2.warehouse_id', 'i2.product_id')
+                    ->havingRaw('SUM(i2.quantity) < 0');
+            })
+            ->count();
+
+        // 4. 即將過期明細數 (必須排除已過期)
+        $expiringCount = DB::table('inventories')
+            ->whereNull('deleted_at')
+            ->whereNotNull('expiry_date')
+            ->where('expiry_date', '>', $today)
+            ->where('expiry_date', '<=', $expiryThreshold)
+            ->count();
+
+        // 分頁
+        $paginated = $query->paginate($perPage)->withQueryString();
+
+        // 為每筆紀錄附加最後入庫/出庫時間 + 狀態
+        $items = collect($paginated->items())->map(function ($item) use ($today, $expiryThreshold) {
+            $lastIn = \App\Modules\Inventory\Models\InventoryTransaction::where('inventory_id', $item->id)
+                ->where('type', '入庫')
+                ->orderByDesc('actual_time')
+                ->value('actual_time');
+
+            $lastOut = \App\Modules\Inventory\Models\InventoryTransaction::where('inventory_id', $item->id)
+                ->where('type', '出庫')
+                ->orderByDesc('actual_time')
+                ->value('actual_time');
+
+            // 計算狀態
+            $statuses = [];
+            if ($item->quantity < 0) {
+                $statuses[] = 'negative';
+            }
+            if ($item->safety_stock !== null && $item->quantity <= $item->safety_stock && $item->quantity >= 0) {
+                $statuses[] = 'low_stock';
+            }
+            if ($item->expiry_date) {
+                if ($item->expiry_date <= $today) {
+                    $statuses[] = 'expired';
+                } elseif ($item->expiry_date <= $expiryThreshold) {
+                    $statuses[] = 'expiring';
+                }
+            }
+            if (empty($statuses)) {
+                $statuses[] = 'normal';
+            }
+
+            return [
+                'id' => $item->id,
+                'product_code' => $item->product_code,
+                'product_name' => $item->product_name,
+                'category_name' => $item->category_name,
+                'warehouse_name' => $item->warehouse_name,
+                'batch_number' => $item->batch_number,
+                'quantity' => $item->quantity,
+                'safety_stock' => $item->safety_stock,
+                'expiry_date' => $item->expiry_date ? \Carbon\Carbon::parse($item->expiry_date)->toDateString() : null,
+                'location' => $item->location,
+                'quality_status' => $item->quality_status ?? null,
+                'last_inbound' => $lastIn ? \Carbon\Carbon::parse($lastIn)->toDateString() : null,
+                'last_outbound' => $lastOut ? \Carbon\Carbon::parse($lastOut)->toDateString() : null,
+                'statuses' => $statuses,
+            ];
+        });
+
        return [
-            'productsCount' => Product::count(),
+            'summary' => [
+                'totalItems' => $totalItems,
+                'lowStockCount' => $lowStockCount,
+                'negativeCount' => $negativeCount,
+                'expiringCount' => $expiringCount,
+            ],
+            'data' => $items->toArray(),
+            'pagination' => [
+                'total' => $paginated->total(),
+                'per_page' => $paginated->perPage(),
+                'current_page' => $paginated->currentPage(),
+                'last_page' => $paginated->lastPage(),
+                'links' => $paginated->linkCollection()->toArray(),
+            ],
+        ];
+    }
+
+    public function getDashboardStats(): array
+    {
+        $today = now()->toDateString();
+        $expiryThreshold = now()->addDays(30)->toDateString();
+
+        // 1. 庫存品項數 (明細總數)
+        $totalItems = DB::table('inventories')
+            ->whereNull('deleted_at')
+            ->count();
+
+        // 2. 低庫存 (明細計數：只要該明細所屬的「倉庫+商品」總量低於安全庫存，則所有相關明細都計入)
+        $lowStockCount = DB::table('inventories as i')
+            ->join('warehouse_product_safety_stocks as ss', function ($join) {
+                $join->on('i.warehouse_id', '=', 'ss.warehouse_id')
+                     ->on('i.product_id', '=', 'ss.product_id');
+            })
+            ->whereNull('i.deleted_at')
+            ->whereIn(DB::raw('(i.warehouse_id, i.product_id)'), function ($sub) {
+                $sub->select('i2.warehouse_id', 'i2.product_id')
+                    ->from('inventories as i2')
+                    ->whereNull('i2.deleted_at')
+                    ->groupBy('i2.warehouse_id', 'i2.product_id')
+                    ->havingRaw('SUM(i2.quantity) <= (SELECT safety_stock FROM warehouse_product_safety_stocks WHERE warehouse_id = i2.warehouse_id AND product_id = i2.product_id LIMIT 1)');
+            })
+            ->count();
+
+        // 3. 負庫存 (明細計數)
+        $negativeCount = DB::table('inventories as i')
+            ->whereNull('i.deleted_at')
+            ->whereIn(DB::raw('(i.warehouse_id, i.product_id)'), function ($sub) {
+                $sub->select('i2.warehouse_id', 'i2.product_id')
+                    ->from('inventories as i2')
+                    ->whereNull('i2.deleted_at')
+                    ->groupBy('i2.warehouse_id', 'i2.product_id')
+                    ->havingRaw('SUM(i2.quantity) < 0');
+            })
+            ->count();
+
+        // 4. 即將過期 (明細計數)
+        $expiringCount = DB::table('inventories')
+            ->whereNull('deleted_at')
+            ->whereNotNull('expiry_date')
+            ->where('expiry_date', '>', $today) // 確保不過期 (getStockQueryData 沒加這個但這裡加上以防與 expired 混淆? 不，stock query 是 > today && <= threshold)
+            ->where('expiry_date', '<=', $expiryThreshold)
+            ->count();
+
+        // 異常庫存前 10 筆 (明細面依然以個別批次為主，供快速跳轉)
+        $abnormalItems = Inventory::query()
+            ->join('products', 'inventories.product_id', '=', 'products.id')
+            ->join('warehouses', 'inventories.warehouse_id', '=', 'warehouses.id')
+            ->leftJoin('warehouse_product_safety_stocks as ss', function ($join) {
+                $join->on('inventories.warehouse_id', '=', 'ss.warehouse_id')
+                     ->on('inventories.product_id', '=', 'ss.product_id');
+            })
+            ->whereNull('inventories.deleted_at')
+            ->where(function ($q) use ($today, $expiryThreshold) {
+                // 1. 屬於低庫存或負庫存品項的批次
+                $q->whereIn(DB::raw('(inventories.warehouse_id, inventories.product_id)'), function ($sub) {
+                    $sub->select('i3.warehouse_id', 'i3.product_id')
+                        ->from('inventories as i3')
+                        ->leftJoin('warehouse_product_safety_stocks as ss3', function ($join) {
+                            $join->on('i3.warehouse_id', '=', 'ss3.warehouse_id')
+                                 ->on('i3.product_id', '=', 'ss3.product_id');
+                        })
+                        ->whereNull('i3.deleted_at')
+                        ->groupBy('i3.warehouse_id', 'i3.product_id', 'ss3.safety_stock')
+                        ->havingRaw('SUM(i3.quantity) < 0 OR (ss3.safety_stock IS NOT NULL AND SUM(i3.quantity) <= ss3.safety_stock)');
+                })
+                // 2. 或單一批次效期異常
+                ->orWhere(function ($q2) use ($expiryThreshold) {
+                    $q2->whereNotNull('inventories.expiry_date')
+                       ->where('inventories.expiry_date', '<=', $expiryThreshold);
+                });
+            })
+            ->select([
+                'inventories.id',
+                'inventories.quantity',
+                'inventories.expiry_date',
+                'products.code as product_code',
+                'products.name as product_name',
+                'warehouses.name as warehouse_name',
+                'ss.safety_stock',
+            ])
+            ->orderBy('inventories.id', 'desc')
+            ->limit(10)
+            ->get()
+            ->map(function ($item) use ($today, $expiryThreshold) {
+                $statuses = [];
+                if ($item->quantity < 0) {
+                    $statuses[] = 'negative';
+                }
+                if ($item->safety_stock !== null && $item->quantity <= $item->safety_stock && $item->quantity >= 0) {
+                    $statuses[] = 'low_stock';
+                }
+                if ($item->expiry_date) {
+                    if ($item->expiry_date <= $today) {
+                        $statuses[] = 'expired';
+                    } elseif ($item->expiry_date <= $expiryThreshold) {
+                        $statuses[] = 'expiring';
+                    }
+                }
+                return [
+                    'id' => $item->id,
+                    'product_code' => $item->product_code,
+                    'product_name' => $item->product_name,
+                    'warehouse_name' => $item->warehouse_name,
+                    'quantity' => $item->quantity,
+                    'safety_stock' => $item->safety_stock,
+                    'expiry_date' => $item->expiry_date,
+                    'statuses' => $statuses,
+                ];
+            })
+            ->toArray();
+
+        return [
+            'productsCount' => $totalItems, 
            'warehousesCount' => Warehouse::count(),
            'lowStockCount' => $lowStockCount,
+            'negativeCount' => $negativeCount,
+            'expiringCount' => $expiringCount,
            'totalInventoryQuantity' => Inventory::sum('quantity'),
+            'abnormalItems' => $abnormalItems,
        ];
    }
 }
+
--- a/app/Modules/Inventory/Services/ProductService.php
+++ b/app/Modules/Inventory/Services/ProductService.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Modules\Inventory\Services;
+
+use App\Modules\Inventory\Models\Product;
+use App\Modules\Inventory\Models\Category;
+use App\Modules\Inventory\Models\Unit;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class ProductService
+{
+    /**
+     * Upsert product from external POS source.
+     *
+     * @param array $data
+     * @return Product
+     */
+    public function upsertFromPos(array $data)
+    {
+        return DB::transaction(function () use ($data) {
+            $externalId = $data['external_pos_id'] ?? null;
+
+            if (!$externalId) {
+                throw new \Exception("External POS ID is required for syncing.");
+            }
+
+            // Try to find by external_pos_id
+            $product = Product::where('external_pos_id', $externalId)->first();
+
+            if (!$product) {
+                // If not found, create new
+                // Optional: Check SKU conflict if needed, but for now trust POS ID
+                $product = new Product();
+                $product->external_pos_id = $externalId;
+            }
+
+            // Map allowed fields
+            $product->name = $data['name'];
+            $product->barcode = $data['barcode'] ?? $product->barcode;
+            $product->price = $data['price'] ?? 0;
+            
+            // Generate Code if missing (use code or external_id)
+            if (empty($product->code)) {
+                $product->code = $data['code'] ?? $product->external_pos_id;
+            }
+            
+            // Handle Category (Default: 未分類)
+            if (empty($product->category_id)) {
+                $categoryName = $data['category'] ?? '未分類';
+                $category = Category::firstOrCreate(
+                    ['name' => $categoryName],
+                    ['code' => 'CAT-' . strtoupper(bin2hex(random_bytes(4)))]
+                );
+                $product->category_id = $category->id;
+            }
+
+            // Handle Base Unit (Default: 個)
+            if (empty($product->base_unit_id)) {
+                $unitName = $data['unit'] ?? '個';
+                $unit = Unit::firstOrCreate(['name' => $unitName]);
+                $product->base_unit_id = $unit->id;
+            }
+            
+            $product->is_active = $data['is_active'] ?? true;
+            
+            $product->save();
+
+            return $product;
+        });
+    }
+}
--- a/app/Modules/Inventory/Services/TransferService.php
+++ b/app/Modules/Inventory/Services/TransferService.php
@@ -0,0 +1,261 @@
+<?php
+
+namespace App\Modules\Inventory\Services;
+
+use App\Modules\Inventory\Models\Inventory;
+use App\Modules\Inventory\Models\InventoryTransferOrder;
+use App\Modules\Inventory\Models\InventoryTransferItem;
+use App\Modules\Inventory\Models\Warehouse;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\ValidationException;
+
+class TransferService
+{
+    /**
+     * 建立調撥單草稿
+     */
+    public function createOrder(int $fromWarehouseId, int $toWarehouseId, ?string $remarks, int $userId): InventoryTransferOrder
+    {
+        return InventoryTransferOrder::create([
+            'from_warehouse_id' => $fromWarehouseId,
+            'to_warehouse_id' => $toWarehouseId,
+            'status' => 'draft',
+            'remarks' => $remarks,
+            'created_by' => $userId,
+        ]);
+    }
+
+    /**
+     * 更新調撥單明細
+     */
+    /**
+     * 更新調撥單明細 (支援精確 Diff 與自動日誌整合)
+     */
+    public function updateItems(InventoryTransferOrder $order, array $itemsData): bool
+    {
+        return DB::transaction(function () use ($order, $itemsData) {
+            // 1. 準備舊資料索引 (Key: product_id . '_' . batch_number)
+            $oldItemsMap = $order->items->mapWithKeys(function ($item) {
+                $key = $item->product_id . '_' . ($item->batch_number ?? '');
+                return [$key => $item];
+            });
+
+            $diff = [
+                'added' => [],
+                'removed' => [],
+                'updated' => [],
+            ];
+
+            // 2. 處理新資料 (Deleted and Re-inserted currently for simplicity, but logic simulates update)
+            // 為了保持 ID 當作外鍵的穩定性，最佳做法是 update 存在的，create 新的，delete 舊的。
+            // 但考量現有邏輯是 delete all -> create all，我們維持原策略但優化 Diff 計算。
+            
+            // 由於採用全刪重建，我們必須手動計算 Diff
+            $order->items()->delete();
+
+            $newItemsKeys = [];
+
+            foreach ($itemsData as $data) {
+                $key = $data['product_id'] . '_' . ($data['batch_number'] ?? '');
+                $newItemsKeys[] = $key;
+
+                $item = $order->items()->create([
+                    'product_id' => $data['product_id'],
+                    'batch_number' => $data['batch_number'] ?? null,
+                    'quantity' => $data['quantity'],
+                    'position' => $data['position'] ?? null,
+                    'notes' => $data['notes'] ?? null,
+                ]);
+                // Eager load product for name
+                $item->load('product');
+
+                // 比對邏輯
+                if ($oldItemsMap->has($key)) {
+                    $oldItem = $oldItemsMap->get($key);
+                    // 檢查數值是否有變動
+                    if ((float)$oldItem->quantity !== (float)$data['quantity'] ||
+                        $oldItem->notes !== ($data['notes'] ?? null) ||
+                        $oldItem->position !== ($data['position'] ?? null)) {
+                        
+                        $diff['updated'][] = [
+                            'product_name' => $item->product->name,
+                            'old' => [
+                                'quantity' => (float)$oldItem->quantity,
+                                'position' => $oldItem->position,
+                                'notes' => $oldItem->notes,
+                            ],
+                            'new' => [
+                                'quantity' => (float)$data['quantity'],
+                                'position' => $item->position,
+                                'notes' => $item->notes,
+                            ]
+                        ];
+                    }
+                } else {
+                    // 新增 (使用者需求：顯示為更新，從 0 -> X)
+                    $diff['updated'][] = [
+                        'product_name' => $item->product->name,
+                        'old' => [
+                            'quantity' => 0,
+                            'notes' => null,
+                        ],
+                        'new' => [
+                            'quantity' => (float)$item->quantity,
+                            'notes' => $item->notes,
+                        ]
+                    ];
+                }
+            }
+
+            // 3. 處理被移除的項目
+            foreach ($oldItemsMap as $key => $oldItem) {
+                if (!in_array($key, $newItemsKeys)) {
+                    $diff['removed'][] = [
+                        'product_name' => $oldItem->product->name,
+                        'old' => [
+                            'quantity' => (float)$oldItem->quantity,
+                            'notes' => $oldItem->notes,
+                        ]
+                    ];
+                }
+            }
+
+            // 4. 將 Diff 注入到 Model 的暫存屬性中
+            $hasChanged = !empty($diff['added']) || !empty($diff['removed']) || !empty($diff['updated']);
+            if ($hasChanged) {
+                 $order->activityProperties['items_diff'] = $diff;
+            }
+
+            return $hasChanged;
+        });
+    }
+
+    /**
+     * 過帳 (Post) - 執行調撥 (直接扣除來源，增加目的)
+     */
+    public function post(InventoryTransferOrder $order, int $userId): void
+    {
+        // [IMPORTANT] 強制重新載入品項，因為在 Controller 中可能剛執行過 updateItems，導致記憶體中快取的 items 是舊的或空的
+        $order->load('items.product');
+
+        DB::transaction(function () use ($order, $userId) {
+            $fromWarehouse = $order->fromWarehouse;
+            $toWarehouse = $order->toWarehouse;
+
+            foreach ($order->items as $item) {
+                if ($item->quantity <= 0) continue;
+
+                // 1. 處理來源倉 (扣除)
+                $sourceInventory = Inventory::where('warehouse_id', $order->from_warehouse_id)
+                    ->where('product_id', $item->product_id)
+                    ->where('batch_number', $item->batch_number)
+                    ->first();
+
+                if (!$sourceInventory || $sourceInventory->quantity < $item->quantity) {
+                    $availableQty = $sourceInventory->quantity ?? 0;
+                    $shortageQty = $item->quantity - $availableQty;
+                    throw ValidationException::withMessages([
+                        'items' => ["商品 {$item->product->name} (批號: {$item->batch_number}) 在來源倉庫存不足。現有庫存：{$availableQty}，尚欠：{$shortageQty}。"],
+                    ]);
+                }
+
+                $oldSourceQty = $sourceInventory->quantity;
+                $newSourceQty = $oldSourceQty - $item->quantity;
+
+                // 儲存庫存快照
+                $item->update(['snapshot_quantity' => $oldSourceQty]);
+                
+                $sourceInventory->quantity = $newSourceQty;
+                // 更新總值 (假設成本不變)
+                $sourceInventory->total_value = $sourceInventory->quantity * $sourceInventory->unit_cost;
+                $sourceInventory->save();
+
+                // 記錄來源交易
+                $sourceInventory->transactions()->create([
+                    'type' => '調撥出庫',
+                    'quantity' => -$item->quantity,
+                    'unit_cost' => $sourceInventory->unit_cost,
+                    'balance_before' => $oldSourceQty,
+                    'balance_after' => $newSourceQty,
+                    'reason' => "調撥單 {$order->doc_no} 至 {$toWarehouse->name}",
+                    'actual_time' => now(),
+                    'user_id' => $userId,
+                ]);
+
+                // 2. 處理目的倉 (增加)
+                $targetInventory = Inventory::firstOrCreate(
+                    [
+                        'warehouse_id' => $order->to_warehouse_id,
+                        'product_id' => $item->product_id,
+                        'batch_number' => $item->batch_number,
+                        'location' => $item->position, // 同步貨道至庫存位置
+                    ],
+                    [
+                        'quantity' => 0,
+                        'unit_cost' => $sourceInventory->unit_cost, // 繼承成本
+                        'total_value' => 0,
+                        // 繼承其他屬性
+                        'expiry_date' => $sourceInventory->expiry_date,
+                        'quality_status' => $sourceInventory->quality_status,
+                        'origin_country' => $sourceInventory->origin_country,
+                    ]
+                );
+                
+                // 若是新建立的，且成本為0，確保繼承成本
+                if ($targetInventory->wasRecentlyCreated && $targetInventory->unit_cost == 0) {
+                     $targetInventory->unit_cost = $sourceInventory->unit_cost;
+                }
+
+                $oldTargetQty = $targetInventory->quantity;
+                $newTargetQty = $oldTargetQty + $item->quantity;
+
+                $targetInventory->quantity = $newTargetQty;
+                $targetInventory->total_value = $targetInventory->quantity * $targetInventory->unit_cost;
+                $targetInventory->save();
+
+                // 記錄目的交易
+                $targetInventory->transactions()->create([
+                    'type' => '調撥入庫',
+                    'quantity' => $item->quantity,
+                    'unit_cost' => $targetInventory->unit_cost,
+                    'balance_before' => $oldTargetQty,
+                    'balance_after' => $newTargetQty,
+                    'reason' => "調撥單 {$order->doc_no} 來自 {$fromWarehouse->name}",
+                    'actual_time' => now(),
+                    'user_id' => $userId,
+                ]);
+            }
+
+            // 準備品項快照供日誌使用
+            $itemsSnapshot = $order->items->map(function($item) {
+                return [
+                    'product_name' => $item->product->name,
+                    'old' => [
+                        'quantity' => (float)$item->quantity,
+                        'notes' => $item->notes,
+                    ],
+                    'new' => [
+                        'quantity' => (float)$item->quantity,
+                        'notes' => $item->notes,
+                    ]
+                ];
+            })->toArray();
+
+            $order->status = 'completed';
+            $order->posted_at = now();
+            $order->posted_by = $userId;
+            $order->save(); // 觸發自動日誌
+        });
+    }
+
+    public function void(InventoryTransferOrder $order, int $userId): void
+    {
+        if ($order->status !== 'draft') {
+             throw new \Exception('只能作廢草稿狀態的單據');
+        }
+        $order->update([
+             'status' => 'voided',
+             'updated_by' => $userId
+        ]);
+    }
+}
--- a/app/Modules/Procurement/Contracts/ProcurementServiceInterface.php
+++ b/app/Modules/Procurement/Contracts/ProcurementServiceInterface.php
@@ -31,4 +31,52 @@ interface ProcurementServiceInterface
     * @return array
     */
    public function getDashboardStats(): array;
+
+    /**
+     * Update received quantity for a PO item.
+     * 
+     * @param int $poItemId
+     * @param float $quantity
+     * @return void
+     */
+    public function updateReceivedQuantity(int $poItemId, float $quantity): void;
+
+    /**
+     * Search pending or partial purchase orders.
+     * 
+     * @param string $query
+     * @return Collection
+     */
+    public function searchPendingPurchaseOrders(string $query): Collection;
+
+    /**
+     * Search vendors by name or code.
+     * 
+     * @param string $query
+     * @return Collection
+     */
+    public function searchVendors(string $query): Collection;
+
+    /**
+     * 取得所有待進貨的採購單列表（不需搜尋條件）。
+     * 用於進貨單頁面直接顯示可選擇的採購單。
+     * 
+     * @return Collection
+     */
+    public function getPendingPurchaseOrders(): Collection;
+
+    /**
+     * 取得所有廠商列表。
+     * 
+     * @return Collection
+     */
+    public function getAllVendors(): Collection;
+    
+    /**
+     * Get vendors by multiple IDs.
+     * 
+     * @param array $ids
+     * @return Collection
+     */
+    public function getVendorsByIds(array $ids): Collection;
 }
--- a/app/Modules/Procurement/Controllers/PurchaseOrderController.php
+++ b/app/Modules/Procurement/Controllers/PurchaseOrderController.php
@@ -187,21 +187,22 @@ class PurchaseOrderController extends Controller
        try {
            DB::beginTransaction();

-            // 生成單號：YYYYMMDD001
+            // 生成單號：PO-YYYYMMDD-01
            $today = now()->format('Ymd');
-            $lastOrder = PurchaseOrder::where('code', 'like', $today . '%')
+            $prefix = 'PO-' . $today . '-';
+            $lastOrder = PurchaseOrder::where('code', 'like', $prefix . '%')
                ->lockForUpdate() // 鎖定以避免並發衝突
                ->orderBy('code', 'desc')
                ->first();

            if ($lastOrder) {
-                // 取得最後 3 碼序號並加 1
-                $lastSequence = intval(substr($lastOrder->code, -3));
-                $sequence = str_pad($lastSequence + 1, 3, '0', STR_PAD_LEFT);
+                // 取得最後 2 碼序號並加 1
+                $lastSequence = intval(substr($lastOrder->code, -2));
+                $sequence = str_pad($lastSequence + 1, 2, '0', STR_PAD_LEFT);
            } else {
-                $sequence = '001';
+                $sequence = '01';
            }
-            $code = $today . $sequence;
+            $code = $prefix . $sequence;

            $totalAmount = 0;
            foreach ($validated['items'] as $item) {
@@ -419,7 +420,7 @@ class PurchaseOrderController extends Controller
            'order_date' => 'required|date', // 新增驗證
            'expected_delivery_date' => 'nullable|date',
            'remark' => 'nullable|string',
-            'status' => 'required|string|in:draft,pending,processing,shipping,confirming,completed,cancelled',
+            'status' => 'required|string|in:draft,pending,approved,partial,completed,closed,cancelled',
            'invoice_number' => ['nullable', 'string', 'max:11', 'regex:/^[A-Z]{2}-\d{8}$/'],
            'invoice_date' => 'nullable|date',
            'invoice_amount' => 'nullable|numeric|min:0',
@@ -446,11 +447,17 @@ class PurchaseOrderController extends Controller
            $taxAmount = !is_null($inputTax) ? $inputTax : round($totalAmount * 0.05, 2);
            $grandTotal = $totalAmount + $taxAmount;

+            // 狀態轉移權限檢查
+            if (isset($validated['status']) && $order->status !== $validated['status']) {
+                if (!$order->canTransitionTo($validated['status'])) {
+                    return back()->withErrors(['error' => '您沒有權限將狀態從 ' . $order->status . ' 變更為 ' . $validated['status']]);
+                }
+            }
            // 1. 填充屬性但暫不儲存以捕捉變更
            $order->fill([
                'vendor_id' => $validated['vendor_id'],
                'warehouse_id' => $validated['warehouse_id'],
-                'order_date' => $validated['order_date'], // 新增
+                'order_date' => $validated['order_date'],
                'expected_delivery_date' => $validated['expected_delivery_date'],
                'total_amount' => $totalAmount,
                'tax_amount' => $taxAmount,
@@ -459,11 +466,22 @@ class PurchaseOrderController extends Controller
                'status' => $validated['status'],
                'invoice_number' => $validated['invoice_number'] ?? null,
                'invoice_date' => $validated['invoice_date'] ?? null,
-                'invoice_amount' => $validated['invoice_amount'] ?? null,
+                'invoice_amount' => (float) ($validated['invoice_amount'] ?? 0),
            ]);

-            // 捕捉變更屬性以進行手動記錄
+            // 捕捉變更屬性
            $dirty = $order->getDirty();
+
+            // 嚴格權限檢查：如果修改了 status 以外的任何欄位，必須具備編輯權限
+            $otherChanges = array_diff(array_keys($dirty), ['status']);
+            if (!empty($otherChanges)) {
+                $canEdit = auth()->user()->hasRole('super-admin') || auth()->user()->can('purchase_orders.edit');
+                if (!$canEdit) {
+                    throw new \Exception('您沒有權限修改採購單的基本內容，僅能執行流程異動（如：送審）。');
+                }
+            }
+
+            // 捕捉舊屬性以進行記錄
            $oldAttributes = [];
            $newAttributes = [];

@@ -476,14 +494,21 @@ class PurchaseOrderController extends Controller
            $order->saveQuietly();

            // 2. 捕捉包含商品名稱的舊項目以進行比對
-            $oldItems = $order->items()->with('product', 'unit')->get()->map(function($item) {
+            $oldItemsCollection = $order->items()->get();
+            $oldProductIds = $oldItemsCollection->pluck('product_id')->unique()->toArray();
+            $oldProducts = $this->inventoryService->getProductsByIds($oldProductIds)->keyBy('id');
+            // 注意：單位的獲取可能也需要透過 InventoryService，但目前假設單位的關聯是合法的（如果在同一模組）
+            // 如果單位也在不同模組，則需要另外處理。這裡暫時假設可以動手水和一下基本單位名稱。
+
+            $oldItems = $oldItemsCollection->map(function($item) use ($oldProducts) {
+                $product = $oldProducts->get($item->product_id);
                return [
                    'id' => $item->id,
                    'product_id' => $item->product_id,
-                    'product_name' => $item->product?->name,
+                    'product_name' => $product?->name ?? 'Unknown',
                    'quantity' => (float) $item->quantity,
                    'unit_id' => $item->unit_id,
-                    'unit_name' => $item->unit?->name,
+                    'unit_name' => 'N/A', // 簡化處理，或可透過服務獲取
                    'subtotal' => (float) $item->subtotal,
                ];
            })->keyBy('product_id');
@@ -513,14 +538,19 @@ class PurchaseOrderController extends Controller
                'updated' => [],
            ];

-            // 重新獲取新項目以確保擁有最新的關聯
-            $newItemsFormatted = $order->items()->with('product', 'unit')->get()->map(function($item) {
+            // 重新獲取新項目並水和產品資料
+            $newItemsCollection = $order->items()->get();
+            $newProductIds = $newItemsCollection->pluck('product_id')->unique()->toArray();
+            $newProducts = $this->inventoryService->getProductsByIds($newProductIds)->keyBy('id');
+
+            $newItemsFormatted = $newItemsCollection->map(function($item) use ($newProducts) {
+                $product = $newProducts->get($item->product_id);
                return [
                    'product_id' => $item->product_id,
-                    'product_name' => $item->product?->name,
+                    'product_name' => $product?->name ?? 'Unknown',
                    'quantity' => (float) $item->quantity,
                    'unit_id' => $item->unit_id,
-                    'unit_name' => $item->unit?->name,
+                    'unit_name' => 'N/A',
                    'subtotal' => (float) $item->subtotal,
                ];
            })->keyBy('product_id');
@@ -644,7 +674,7 @@ class PurchaseOrderController extends Controller
            
            DB::commit();
            
-            return redirect()->route('purchase-orders.index')->with('success', '採購單已刪除');
+            return redirect()->route('purchase-orders.index')->with('success', '採購單已作廢');
        } catch (\Exception $e) {
            DB::rollBack();
            return back()->withErrors(['error' => '刪除失敗：' . $e->getMessage()]);
--- a/app/Modules/Procurement/Controllers/ShippingOrderController.php
+++ b/app/Modules/Procurement/Controllers/ShippingOrderController.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Modules\Procurement\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Modules\Procurement\Models\ShippingOrder;
+use App\Modules\Inventory\Contracts\InventoryServiceInterface;
+use App\Modules\Core\Contracts\CoreServiceInterface;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use Illuminate\Support\Facades\DB;
+
+class ShippingOrderController extends Controller
+{
+    protected $inventoryService;
+    protected $coreService;
+    protected $shippingService;
+
+    public function __construct(
+        InventoryServiceInterface $inventoryService, 
+        CoreServiceInterface $coreService,
+        \App\Modules\Procurement\Services\ShippingService $shippingService
+    ) {
+        $this->inventoryService = $inventoryService;
+        $this->coreService = $coreService;
+        $this->shippingService = $shippingService;
+    }
+
+    public function index(Request $request)
+    {
+        return Inertia::render('Common/UnderConstruction', [
+            'featureName' => '出貨單管理'
+        ]);
+
+        /* 原有邏輯暫存
+        $query = ShippingOrder::query();
+
+        // 搜尋
+        if ($request->search) {
+            $query->where(function($q) use ($request) {
+                $q->where('doc_no', 'like', "%{$request->search}%")
+                  ->orWhere('customer_name', 'like', "%{$request->search}%");
+            });
+        }
+
+        // 狀態篩選
+        if ($request->status && $request->status !== 'all') {
+            $query->where('status', $request->status);
+        }
+
+        $perPage = $request->input('per_page', 10);
+        $orders = $query->orderBy('id', 'desc')->paginate($perPage)->withQueryString();
+
+        // 水和倉庫與使用者
+        $warehouses = $this->inventoryService->getAllWarehouses();
+        $userIds = $orders->getCollection()->pluck('created_by')->filter()->unique()->toArray();
+        $users = $this->coreService->getUsersByIds($userIds)->keyBy('id');
+
+        $orders->getCollection()->transform(function ($order) use ($warehouses, $users) {
+            $order->warehouse_name = $warehouses->firstWhere('id', $order->warehouse_id)?->name ?? 'Unknown';
+            $order->creator_name = $users->get($order->created_by)?->name ?? 'System';
+            return $order;
+        });
+
+        return Inertia::render('ShippingOrder/Index', [
+            'orders' => $orders,
+            'filters' => $request->only(['search', 'status', 'per_page']),
+            'warehouses' => $warehouses->map(fn($w) => ['id' => $w->id, 'name' => $w->name]),
+        ]);
+        */
+    }
+
+    public function create()
+    {
+        return Inertia::render('Common/UnderConstruction', [
+            'featureName' => '出貨單建立'
+        ]);
+
+        /* 原有邏輯暫存
+        $warehouses = $this->inventoryService->getAllWarehouses();
+        $products = $this->inventoryService->getAllProducts();
+        
+        return Inertia::render('ShippingOrder/Create', [
+            'warehouses' => $warehouses->map(fn($w) => ['id' => $w->id, 'name' => $w->name]),
+            'products' => $products->map(fn($p) => [
+                'id' => $p->id,
+                'name' => $p->name,
+                'code' => $p->code,
+                'unit_name' => $p->baseUnit?->name,
+            ]),
+        ]);
+        */
+    }
+
+    public function store(Request $request)
+    {
+        return back()->with('error', '出貨單管理功能正在製作中');
+    }
+
+    public function show($id)
+    {
+        return Inertia::render('Common/UnderConstruction', [
+            'featureName' => '出貨單詳情'
+        ]);
+    }
+
+    public function edit($id)
+    {
+        return Inertia::render('Common/UnderConstruction', [
+            'featureName' => '出貨單編輯'
+        ]);
+    }
+
+    public function update(Request $request, $id)
+    {
+        return back()->with('error', '出貨單管理功能正在製作中');
+    }
+
+    public function post($id)
+    {
+        return back()->with('error', '出貨單管理功能正在製作中');
+    }
+
+    public function destroy($id)
+    {
+        $order = ShippingOrder::findOrFail($id);
+        if ($order->status !== 'draft') {
+            return back()->withErrors(['error' => '僅能刪除草稿狀態的單據']);
+        }
+        $order->delete();
+        return redirect()->route('delivery-notes.index')->with('success', '出貨單已刪除');
+    }
+}
--- a/app/Modules/Procurement/Controllers/VendorController.php
+++ b/app/Modules/Procurement/Controllers/VendorController.php
@@ -95,14 +95,15 @@ class VendorController extends Controller
            if (!$product) return null;
            
            return (object) [
-                'id' => (string) $pivot->id,
-                'productId' => (string) $product->id,
-                'productName' => $product->name,
-                'unit' => $product->baseUnit?->name ?? 'N/A',
-                'baseUnit' => $product->baseUnit?->name,
-                'largeUnit' => $product->largeUnit?->name,
-                'conversionRate' => (float) $product->conversion_rate,
-                'lastPrice' => (float) $pivot->last_price,
+                'id' => (string) $product->id, // Frontend expects product ID here as p.id
+                'name' => $product->name,
+                'baseUnit' => $product->baseUnit ? (object)['name' => $product->baseUnit->name] : null,
+                'largeUnit' => $product->largeUnit ? (object)['name' => $product->largeUnit->name] : null,
+                'conversion_rate' => (float) $product->conversion_rate,
+                'purchase_unit' => $product->purchaseUnit?->name,
+                'pivot' => (object) [
+                    'last_price' => (float) $pivot->last_price,
+                ],
            ];
        })->filter()->values();

@@ -119,7 +120,7 @@ class VendorController extends Controller
            'email' => $vendor->email,
            'address' => $vendor->address,
            'remark' => $vendor->remark,
-            'supplyProducts' => $supplyProducts,
+            'products' => $supplyProducts, // Changed from supplyProducts to products
        ];

        return Inertia::render('Vendor/Show', [
--- a/app/Modules/Procurement/Models/PurchaseOrder.php
+++ b/app/Modules/Procurement/Models/PurchaseOrder.php
@@ -70,4 +70,50 @@ class PurchaseOrder extends Model
    {
        return $this->hasMany(PurchaseOrderItem::class);
    }
+
+    /**
+     * 檢查是否可以轉移至新狀態，並驗證權限。
+     */
+    public function canTransitionTo(string $newStatus, $user = null): bool
+    {
+        $user = $user ?? auth()->user();
+        if (!$user) return false;
+        if ($user->hasRole('super-admin')) return true;
+
+        $currentStatus = $this->status;
+
+        // 定義合法的狀態轉移路徑與所需權限
+        $transitions = [
+            'draft' => [
+                'pending' => 'purchase_orders.view', // 基本檢視者即可送審
+                'cancelled' => 'purchase_orders.cancel',
+            ],
+            'pending' => [
+                'approved' => 'purchase_orders.approve',
+                'draft' => 'purchase_orders.approve', // 退回草稿
+                'cancelled' => 'purchase_orders.cancel',
+            ],
+            'approved' => [
+                'cancelled' => 'purchase_orders.cancel',
+                'partial' => null, // 系統自動轉移，不需手動權限點
+            ],
+            'partial' => [
+                'completed' => null, // 系統自動轉移
+                'closed' => 'purchase_orders.approve', // 手動結案通常需要核准權限
+                'cancelled' => 'purchase_orders.cancel',
+            ],
+        ];
+
+        if (!isset($transitions[$currentStatus])) {
+            return false;
+        }
+
+        if (!array_key_exists($newStatus, $transitions[$currentStatus])) {
+            return false;
+        }
+
+        $requiredPermission = $transitions[$currentStatus][$newStatus];
+        
+        return $requiredPermission ? $user->can($requiredPermission) : true;
+    }
 }
--- a/app/Modules/Procurement/Models/ShippingOrder.php
+++ b/app/Modules/Procurement/Models/ShippingOrder.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Modules\Procurement\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Spatie\Activitylog\Traits\LogsActivity;
+use Spatie\Activitylog\LogOptions;
+use Spatie\Activitylog\Contracts\Activity;
+
+class ShippingOrder extends Model
+{
+    use HasFactory, LogsActivity;
+
+    protected $fillable = [
+        'doc_no',
+        'customer_name',
+        'warehouse_id',
+        'status',
+        'shipping_date',
+        'total_amount',
+        'tax_amount',
+        'grand_total',
+        'remarks',
+        'created_by',
+        'posted_by',
+        'posted_at',
+    ];
+
+    protected $casts = [
+        'shipping_date' => 'date',
+        'posted_at' => 'datetime',
+        'total_amount' => 'decimal:2',
+        'tax_amount' => 'decimal:2',
+        'grand_total' => 'decimal:2',
+    ];
+
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logAll()
+            ->logOnlyDirty()
+            ->dontSubmitEmptyLogs();
+    }
+
+    public function tapActivity(Activity $activity, string $eventName)
+    {
+        $snapshot = $activity->properties['snapshot'] ?? [];
+        $snapshot['doc_no'] = $this->doc_no;
+        $snapshot['customer_name'] = $this->customer_name;
+        
+        $activity->properties = $activity->properties->merge([
+            'snapshot' => $snapshot
+        ]);
+    }
+
+    public function items()
+    {
+        return $this->hasMany(ShippingOrderItem::class);
+    }
+    
+    /**
+     * 自動產生單號
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            if (empty($model->doc_no)) {
+                $today = date('Ymd');
+                $prefix = 'SHP-' . $today . '-';
+
+                $lastDoc = static::where('doc_no', 'like', $prefix . '%')
+                    ->orderBy('doc_no', 'desc')
+                    ->first();
+
+                if ($lastDoc) {
+                    $lastNumber = substr($lastDoc->doc_no, -2);
+                    $nextNumber = str_pad((int)$lastNumber + 1, 2, '0', STR_PAD_LEFT);
+                } else {
+                    $nextNumber = '01';
+                }
+
+                $model->doc_no = $prefix . $nextNumber;
+            }
+        });
+    }
+}
--- a/app/Modules/Procurement/Models/ShippingOrderItem.php
+++ b/app/Modules/Procurement/Models/ShippingOrderItem.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Modules\Procurement\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class ShippingOrderItem extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'shipping_order_id',
+        'product_id',
+        'batch_number',
+        'quantity',
+        'unit_price',
+        'subtotal',
+        'remark',
+    ];
+
+    protected $casts = [
+        'quantity' => 'decimal:4',
+        'unit_price' => 'decimal:4',
+        'subtotal' => 'decimal:2',
+    ];
+
+    public function shippingOrder()
+    {
+        return $this->belongsTo(ShippingOrder::class);
+    }
+
+    // 注意：在模組化架構下，跨模組關聯應謹慎使用或是直接在 Controller 水和 (Hydration)
+    // 但為了開發便利，暫時保留對 Product 的關聯（如果 Product 在不同模組，可能無法直接 lazy load）
+}
--- a/app/Modules/Procurement/Routes/web.php
+++ b/app/Modules/Procurement/Routes/web.php
@@ -32,7 +32,27 @@ Route::middleware('auth')->group(function () {
        Route::get('/purchase-orders/{id}', [PurchaseOrderController::class, 'show'])->name('purchase-orders.show');
        
        Route::get('/purchase-orders/{id}/edit', [PurchaseOrderController::class, 'edit'])->middleware('permission:purchase_orders.edit')->name('purchase-orders.edit');
-        Route::put('/purchase-orders/{id}', [PurchaseOrderController::class, 'update'])->middleware('permission:purchase_orders.edit')->name('purchase-orders.update');
+        Route::match(['PUT', 'PATCH'], '/purchase-orders/{id}', [PurchaseOrderController::class, 'update'])->name('purchase-orders.update');
        Route::delete('/purchase-orders/{id}', [PurchaseOrderController::class, 'destroy'])->middleware('permission:purchase_orders.delete')->name('purchase-orders.destroy');
    });
+
+    // 出貨單管理 (Delivery Notes)
+    Route::middleware('permission:delivery_notes.view')->group(function () {
+        Route::get('/delivery-notes', [\App\Modules\Procurement\Controllers\ShippingOrderController::class, 'index'])->name('delivery-notes.index');
+        
+        Route::middleware('permission:delivery_notes.create')->group(function () {
+            Route::get('/delivery-notes/create', [\App\Modules\Procurement\Controllers\ShippingOrderController::class, 'create'])->name('delivery-notes.create');
+            Route::post('/delivery-notes', [\App\Modules\Procurement\Controllers\ShippingOrderController::class, 'store'])->name('delivery-notes.store');
+        });
+
+        Route::get('/delivery-notes/{id}', [\App\Modules\Procurement\Controllers\ShippingOrderController::class, 'show'])->name('delivery-notes.show');
+        
+        Route::middleware('permission:delivery_notes.edit')->group(function () {
+            Route::get('/delivery-notes/{id}/edit', [\App\Modules\Procurement\Controllers\ShippingOrderController::class, 'edit'])->name('delivery-notes.edit');
+            Route::put('/delivery-notes/{id}', [\App\Modules\Procurement\Controllers\ShippingOrderController::class, 'update'])->name('delivery-notes.update');
+            Route::post('/delivery-notes/{id}/post', [\App\Modules\Procurement\Controllers\ShippingOrderController::class, 'post'])->name('delivery-notes.post');
+        });
+
+        Route::delete('/delivery-notes/{id}', [\App\Modules\Procurement\Controllers\ShippingOrderController::class, 'destroy'])->middleware('permission:delivery_notes.delete')->name('delivery-notes.destroy');
+    });
 });
--- a/app/Modules/Procurement/Services/ProcurementService.php
+++ b/app/Modules/Procurement/Services/ProcurementService.php
@@ -29,4 +29,74 @@ class ProcurementService implements ProcurementServiceInterface
            'pendingOrdersCount' => PurchaseOrder::where('status', 'pending')->count(),
        ];
    }
+
+    public function updateReceivedQuantity(int $poItemId, float $quantity): void
+    {
+        $item = \App\Modules\Procurement\Models\PurchaseOrderItem::findOrFail($poItemId);
+        $item->increment('received_quantity', $quantity);
+        $item->refresh();
+
+        // Check PO status
+        $po = $item->purchaseOrder;
+        
+        // Load items to check completion
+        $po->load('items');
+        
+        $allReceived = $po->items->every(function ($i) {
+            return $i->received_quantity >= $i->quantity;
+        });
+
+        $anyReceived = $po->items->contains(function ($i) {
+            return $i->received_quantity > 0;
+        });
+
+        if ($allReceived) {
+            $po->status = 'completed'; // or 'received' based on workflow
+        } elseif ($anyReceived) {
+            $po->status = 'partial';
+        }
+        
+        $po->save();
+    }
+
+    public function searchPendingPurchaseOrders(string $query): Collection
+    {
+        return PurchaseOrder::with(['vendor', 'items'])
+            ->whereIn('status', ['approved', 'partial'])
+            ->where(function($q) use ($query) {
+                $q->where('code', 'like', "%{$query}%")
+                  ->orWhereHas('vendor', function($vq) use ($query) {
+                      $vq->where('name', 'like', "%{$query}%");
+                  });
+            })
+            ->limit(20)
+            ->get();
+    }
+
+    public function searchVendors(string $query): Collection
+    {
+        return \App\Modules\Procurement\Models\Vendor::where('name', 'like', "%{$query}%")
+            ->orWhere('code', 'like', "%{$query}%")
+            ->limit(20)
+            ->get(['id', 'name', 'code']);
+    }
+
+    public function getPendingPurchaseOrders(): Collection
+    {
+        return PurchaseOrder::with(['vendor', 'items'])
+            ->whereIn('status', ['approved', 'partial'])
+            ->orderBy('created_at', 'desc')
+            ->limit(50)
+            ->get();
+    }
+
+    public function getAllVendors(): Collection
+    {
+        return \App\Modules\Procurement\Models\Vendor::orderBy('name')->get(['id', 'name', 'code']);
+    }
+
+    public function getVendorsByIds(array $ids): Collection
+    {
+        return \App\Modules\Procurement\Models\Vendor::whereIn('id', $ids)->get(['id', 'name', 'code']);
+    }
 }
--- a/app/Modules/Procurement/Services/ShippingService.php
+++ b/app/Modules/Procurement/Services/ShippingService.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Modules\Procurement\Services;
+
+use App\Modules\Procurement\Models\ShippingOrder;
+use App\Modules\Procurement\Models\ShippingOrderItem;
+use App\Modules\Inventory\Contracts\InventoryServiceInterface;
+use Illuminate\Support\Facades\DB;
+
+class ShippingService
+{
+    protected $inventoryService;
+
+    public function __construct(InventoryServiceInterface $inventoryService)
+    {
+        $this->inventoryService = $inventoryService;
+    }
+
+    public function createShippingOrder(array $data)
+    {
+        return DB::transaction(function () use ($data) {
+            $order = ShippingOrder::create([
+                'warehouse_id' => $data['warehouse_id'],
+                'customer_name' => $data['customer_name'] ?? null,
+                'shipping_date' => $data['shipping_date'],
+                'status' => 'draft',
+                'remarks' => $data['remarks'] ?? null,
+                'created_by' => auth()->id(),
+                'total_amount' => $data['total_amount'] ?? 0,
+                'tax_amount' => $data['tax_amount'] ?? 0,
+                'grand_total' => $data['grand_total'] ?? 0,
+            ]);
+
+            foreach ($data['items'] as $item) {
+                $order->items()->create([
+                    'product_id' => $item['product_id'],
+                    'batch_number' => $item['batch_number'] ?? null,
+                    'quantity' => $item['quantity'],
+                    'unit_price' => $item['unit_price'] ?? 0,
+                    'subtotal' => $item['subtotal'] ?? ($item['quantity'] * ($item['unit_price'] ?? 0)),
+                    'remark' => $item['remark'] ?? null,
+                ]);
+            }
+
+            return $order;
+        });
+    }
+
+    public function updateShippingOrder(ShippingOrder $order, array $data)
+    {
+        return DB::transaction(function () use ($order, $data) {
+            $order->update([
+                'warehouse_id' => $data['warehouse_id'],
+                'customer_name' => $data['customer_name'] ?? null,
+                'shipping_date' => $data['shipping_date'],
+                'remarks' => $data['remarks'] ?? null,
+                'total_amount' => $data['total_amount'] ?? 0,
+                'tax_amount' => $data['tax_amount'] ?? 0,
+                'grand_total' => $data['grand_total'] ?? 0,
+            ]);
+
+            // 簡單處理：刪除舊項目並新增
+            $order->items()->delete();
+            foreach ($data['items'] as $item) {
+                $order->items()->create([
+                    'product_id' => $item['product_id'],
+                    'batch_number' => $item['batch_number'] ?? null,
+                    'quantity' => $item['quantity'],
+                    'unit_price' => $item['unit_price'] ?? 0,
+                    'subtotal' => $item['subtotal'] ?? ($item['quantity'] * ($item['unit_price'] ?? 0)),
+                    'remark' => $item['remark'] ?? null,
+                ]);
+            }
+
+            return $order;
+        });
+    }
+
+    public function post(ShippingOrder $order)
+    {
+        if ($order->status !== 'draft') {
+            throw new \Exception('該單據已過帳或已取消。');
+        }
+
+        return DB::transaction(function () use ($order) {
+            foreach ($order->items as $item) {
+                // 尋找對應的庫存紀錄
+                $inventory = $this->inventoryService->findInventoryByBatch(
+                    $order->warehouse_id,
+                    $item->product_id,
+                    $item->batch_number
+                );
+
+                if (!$inventory || $inventory->quantity < $item->quantity) {
+                    $productName = $this->inventoryService->getProduct($item->product_id)?->name ?? 'Unknown';
+                    throw new \Exception("商品 [{$productName}] (批號: {$item->batch_number}) 庫存不足。");
+                }
+
+                // 扣除庫存
+                $this->inventoryService->decreaseInventoryQuantity(
+                    $inventory->id,
+                    $item->quantity,
+                    "出貨扣款: 單號 [{$order->doc_no}]",
+                    'ShippingOrder',
+                    $order->id
+                );
+            }
+
+            $order->update([
+                'status' => 'completed',
+                'posted_by' => auth()->id(),
+                'posted_at' => now(),
+            ]);
+
+            return $order;
+        });
+    }
+}
--- a/app/Modules/Production/Controllers/ProductionOrderController.php
+++ b/app/Modules/Production/Controllers/ProductionOrderController.php
@@ -8,20 +8,28 @@ use App\Modules\Production\Models\ProductionOrder;
 use App\Modules\Production\Models\ProductionOrderItem;
 use App\Modules\Inventory\Contracts\InventoryServiceInterface;
 use App\Modules\Core\Contracts\CoreServiceInterface;
+use App\Modules\Procurement\Contracts\ProcurementServiceInterface;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Inertia\Inertia;
 use Inertia\Response;

+
 class ProductionOrderController extends Controller
 {
    protected $inventoryService;
    protected $coreService;
+    protected $procurementService;

-    public function __construct(InventoryServiceInterface $inventoryService, CoreServiceInterface $coreService)
+    public function __construct(
+        InventoryServiceInterface $inventoryService, 
+        CoreServiceInterface $coreService,
+        ProcurementServiceInterface $procurementService
+    )
    {
        $this->inventoryService = $inventoryService;
        $this->coreService = $coreService;
+        $this->procurementService = $procurementService;
    }

    /**
@@ -37,9 +45,6 @@ class ProductionOrderController extends Controller
        if ($request->filled('search')) {
            $search = $request->search;
            $query->where(function ($q) use ($search) {
-                $q->where('code', 'like', "%{$search}%")
-                  ->orWhere('output_batch_number', 'like', "%{$search}%");
-                // 若要搜尋產品名稱，現在需先從 Inventory 查出 IDs
                $q->where('code', 'like', "%{$search}%")
                  ->orWhere('output_batch_number', 'like', "%{$search}%");
                // 若要搜尋產品名稱，現在需先從 Inventory 查出 IDs
@@ -101,23 +106,16 @@ class ProductionOrderController extends Controller
    {
        $status = $request->input('status', 'draft');

-        $baseRules = [
+        $rules = [
            'product_id' => 'required',
-            'output_batch_number' => 'required|string|max:50',
            'status' => 'nullable|in:draft,completed',
+            'warehouse_id' => $status === 'completed' ? 'required' : 'nullable',
+            'output_quantity' => $status === 'completed' ? 'required|numeric|min:0.01' : 'nullable|numeric',
+            'items' => 'nullable|array',
+            'items.*.inventory_id' => $status === 'completed' ? 'required' : 'nullable',
+            'items.*.quantity_used' => $status === 'completed' ? 'required|numeric|min:0.0001' : 'nullable|numeric',
        ];

-        $completedRules = [
-            'warehouse_id' => 'required',
-            'output_quantity' => 'required|numeric|min:0.01',
-            'production_date' => 'required|date',
-            'items' => 'required|array|min:1',
-            'items.*.inventory_id' => 'required',
-            'items.*.quantity_used' => 'required|numeric|min:0.0001',
-        ];
-
-        $rules = $status === 'completed' ? array_merge($baseRules, $completedRules) : $baseRules;
-
        $validated = $request->validate($rules);

        DB::transaction(function () use ($validated, $request, $status) {
@@ -127,12 +125,12 @@ class ProductionOrderController extends Controller
                'product_id' => $validated['product_id'],
                'warehouse_id' => $validated['warehouse_id'] ?? null,
                'output_quantity' => $validated['output_quantity'] ?? 0,
-                'output_batch_number' => $validated['output_batch_number'],
+                'output_batch_number' => $request->output_batch_number, // 建立時改為選填
                'output_box_count' => $request->output_box_count,
-                'production_date' => $validated['production_date'] ?? now()->toDateString(),
+                'production_date' => $request->production_date,
                'expiry_date' => $request->expiry_date,
                'user_id' => auth()->id(),
-                'status' => $status,
+                'status' => ProductionOrder::STATUS_DRAFT, // 一律存為草稿
                'remark' => $request->remark,
            ]);

@@ -150,43 +148,12 @@ class ProductionOrderController extends Controller
                        'quantity_used' => $item['quantity_used'] ?? 0,
                        'unit_id' => $item['unit_id'] ?? null,
                    ]);
-
-                    if ($status === 'completed') {
-                        $this->inventoryService->decreaseInventoryQuantity(
-                            $item['inventory_id'], 
-                            $item['quantity_used'], 
-                            "生產單 #{$productionOrder->code} 耗料",
-                            ProductionOrder::class,
-                            $productionOrder->id
-                        );
-                    }
                }
            }
-
-            // 3. 成品入庫
-            if ($status === 'completed') {
-                $this->inventoryService->createInventoryRecord([
-                    'warehouse_id' => $validated['warehouse_id'],
-                    'product_id' => $validated['product_id'],
-                    'quantity' => $validated['output_quantity'],
-                    'batch_number' => $validated['output_batch_number'],
-                    'box_number' => $request->output_box_count,
-                    'arrival_date' => $validated['production_date'],
-                    'expiry_date' => $request->expiry_date,
-                    'reason' => "生產單 #{$productionOrder->code} 成品入庫",
-                    'reference_type' => ProductionOrder::class,
-                    'reference_id' => $productionOrder->id,
-                ]);
-
-                activity()
-                    ->performedOn($productionOrder)
-                    ->causedBy(auth()->user())
-                    ->log('completed');
-            }
        });

        return redirect()->route('production-orders.index')
-            ->with('success', $status === 'completed' ? '生產單已完成並入庫' : '草稿已儲存');
+            ->with('success', '生產單草稿已建立');
    }

    /**
@@ -199,26 +166,43 @@ class ProductionOrderController extends Controller
        if ($productionOrder->product) {
            $productionOrder->product->base_unit = $this->inventoryService->getUnits()->where('id', $productionOrder->product->base_unit_id)->first();
        }
-        $productionOrder->warehouse = $this->inventoryService->getWarehouse($productionOrder->warehouse_id);
+        $productionOrder->warehouse = $productionOrder->warehouse_id 
+            ? $this->inventoryService->getWarehouse($productionOrder->warehouse_id)
+            : null;
        $productionOrder->user = $this->coreService->getUser($productionOrder->user_id);

        // 手動水和明細資料
        $items = $productionOrder->items;
        $inventoryIds = $items->pluck('inventory_id')->unique()->filter()->toArray();
+        
+        // 修正: 移除跨模組關聯 sourcePurchaseOrder.vendor
        $inventories = $this->inventoryService->getInventoriesByIds(
            $inventoryIds, 
-            ['product.baseUnit', 'sourcePurchaseOrder.vendor']
+            ['product.baseUnit', 'warehouse'] 
        )->keyBy('id');
        
+        // 手動載入 Purchase Orders
+        $poIds = $inventories->pluck('source_purchase_order_id')->unique()->filter()->toArray();
+        $purchaseOrders = collect();
+        if (!empty($poIds)) {
+            $purchaseOrders = $this->procurementService->getPurchaseOrdersByIds($poIds, ['vendor'])->keyBy('id');
+        }
+
        $units = $this->inventoryService->getUnits()->keyBy('id');

        foreach ($items as $item) {
            $item->inventory = $inventories->get($item->inventory_id);
+            if ($item->inventory) {
+                // 手動掛載 PO
+                $poId = $item->inventory->source_purchase_order_id;
+                $item->inventory->sourcePurchaseOrder = $purchaseOrders->get($poId);
+            }
            $item->unit = $units->get($item->unit_id);
        }

        return Inertia::render('Production/Show', [
            'productionOrder' => $productionOrder,
+            'warehouses' => $this->inventoryService->getAllWarehouses(),
        ]);
    }

@@ -250,6 +234,33 @@ class ProductionOrderController extends Controller
        return response()->json($data);
    }

+    /**
+     * 取得商品在各倉庫的庫存分佈
+     */
+    public function getProductWarehouses($productId)
+    {
+        $inventories = \App\Modules\Inventory\Models\Inventory::with(['warehouse', 'product.baseUnit'])
+            ->where('product_id', $productId)
+            ->where('quantity', '>', 0)
+            ->get();
+            
+        $data = $inventories->map(function ($inv) {
+            return [
+                'id' => $inv->id, // Inventory ID
+                'warehouse_id' => $inv->warehouse_id,
+                'warehouse_name' => $inv->warehouse->name ?? '未知倉庫',
+                'batch_number' => $inv->batch_number,
+                'quantity' => $inv->quantity,
+                'expiry_date' => $inv->expiry_date ? $inv->expiry_date->format('Y-m-d') : null,
+                'unit_name' => $inv->product->baseUnit->name ?? '',
+                'base_unit_id' => $inv->product->base_unit_id ?? null,
+                'conversion_rate' => $inv->product->conversion_rate ?? 1,
+            ];
+        });
+
+        return response()->json($data);
+    }
+
    /**
     * 編輯生產單
     */
@@ -262,7 +273,9 @@ class ProductionOrderController extends Controller

        // 基本水和
        $productionOrder->product = $this->inventoryService->getProduct($productionOrder->product_id);
-        $productionOrder->warehouse = $this->inventoryService->getWarehouse($productionOrder->warehouse_id);
+        $productionOrder->warehouse = $productionOrder->warehouse_id 
+            ? $this->inventoryService->getWarehouse($productionOrder->warehouse_id)
+            : null;
        
        // 手動水和明細資料
        $items = $productionOrder->items;
@@ -300,39 +313,27 @@ class ProductionOrderController extends Controller
        $status = $request->input('status', 'draft');

        // 基礎驗證規則
-        $baseRules = [
-            'product_id' => 'required|exists:products,id',
-            'output_batch_number' => 'required|string|max:50',
-            'status' => 'required|in:draft,completed',
+        $rules = [
+            'product_id' => 'required',
            'remark' => 'nullable|string',
+            'warehouse_id' => 'nullable',
+            'output_quantity' => 'nullable|numeric',
+            'items' => 'nullable|array',
+            'items.*.inventory_id' => 'required',
+            'items.*.quantity_used' => 'required|numeric',
        ];
-
-        // 完工時的嚴格驗證規則
-        $completedRules = [
-            'warehouse_id' => 'required|exists:warehouses,id',
-            'output_quantity' => 'required|numeric|min:0.01',
-            'production_date' => 'required|date',
-            'expiry_date' => 'nullable|date',
-            'items' => 'required|array|min:1',
-            'items.*.inventory_id' => 'required|exists:inventories,id',
-            'items.*.quantity_used' => 'required|numeric|min:0.0001',
-        ];
-
-        // 若狀態切換為 completed，需合併驗證規則
-        $rules = $status === 'completed' ? array_merge($baseRules, $completedRules) : $baseRules;
        
        $validated = $request->validate($rules);

-        DB::transaction(function () use ($validated, $request, $status, $productionOrder) {
+        DB::transaction(function () use ($validated, $request, $productionOrder) {
            $productionOrder->update([
                'product_id' => $validated['product_id'],
                'warehouse_id' => $validated['warehouse_id'] ?? $productionOrder->warehouse_id,
                'output_quantity' => $validated['output_quantity'] ?? 0,
-                'output_batch_number' => $validated['output_batch_number'],
+                'output_batch_number' => $request->output_batch_number ?? $productionOrder->output_batch_number,
                'output_box_count' => $request->output_box_count,
-                'production_date' => $validated['production_date'] ?? now()->toDateString(),
-                'expiry_date' => $request->expiry_date,
-                'status' => $status,
+                'production_date' => $request->production_date ?? $productionOrder->production_date,
+                'expiry_date' => $request->expiry_date ?? $productionOrder->expiry_date,
                'remark' => $request->remark,
            ]);

@@ -352,38 +353,8 @@ class ProductionOrderController extends Controller
                        'quantity_used' => $item['quantity_used'] ?? 0,
                        'unit_id' => $item['unit_id'] ?? null,
                    ]);
-
-                    if ($status === 'completed') {
-                        $this->inventoryService->decreaseInventoryQuantity(
-                            $item['inventory_id'], 
-                            $item['quantity_used'], 
-                            "生產單 #{$productionOrder->code} 耗料",
-                            ProductionOrder::class,
-                            $productionOrder->id
-                        );
-                    }
                }
            }
-
-            if ($status === 'completed') {
-                $this->inventoryService->createInventoryRecord([
-                    'warehouse_id' => $validated['warehouse_id'],
-                    'product_id' => $validated['product_id'],
-                    'quantity' => $validated['output_quantity'],
-                    'batch_number' => $validated['output_batch_number'],
-                    'box_number' => $request->output_box_count,
-                    'arrival_date' => $validated['production_date'],
-                    'expiry_date' => $request->expiry_date,
-                    'reason' => "生產單 #{$productionOrder->code} 成品入庫",
-                    'reference_type' => ProductionOrder::class,
-                    'reference_id' => $productionOrder->id,
-                ]);
-
-                activity()
-                    ->performedOn($productionOrder)
-                    ->causedBy(auth()->user())
-                    ->log('completed');
-            }
        });

        return redirect()->route('production-orders.index')
@@ -391,23 +362,102 @@ class ProductionOrderController extends Controller
    }

    /**
-     * 刪除生產單
+     * 更新生產工單狀態
+     */
+    public function updateStatus(Request $request, ProductionOrder $productionOrder)
+    {
+        $newStatus = $request->input('status');
+        
+        if (!$productionOrder->canTransitionTo($newStatus)) {
+            return response()->json(['error' => '不合法的狀態轉移或權限不足'], 403);
+        }
+
+        DB::transaction(function () use ($newStatus, $productionOrder, $request) {
+            $oldStatus = $productionOrder->status;
+
+            // 1. 執行特定狀態的業務邏輯
+            if ($oldStatus === ProductionOrder::STATUS_APPROVED && $newStatus === ProductionOrder::STATUS_IN_PROGRESS) {
+                // 開始製作 -> 扣除原料庫存
+                $items = $productionOrder->items;
+                foreach ($items as $item) {
+                    $this->inventoryService->decreaseInventoryQuantity(
+                        $item->inventory_id, 
+                        $item->quantity_used, 
+                        "生產單 #{$productionOrder->code} 開始製作 (扣料)",
+                        ProductionOrder::class,
+                        $productionOrder->id
+                    );
+                }
+            } 
+            elseif ($oldStatus === ProductionOrder::STATUS_IN_PROGRESS && $newStatus === ProductionOrder::STATUS_COMPLETED) {
+                // 完成製作 -> 成品入庫
+                $warehouseId = $request->input('warehouse_id'); // 由前端 Modal 傳來
+                $batchNumber = $request->input('output_batch_number'); // 由前端 Modal 傳來
+                $expiryDate = $request->input('expiry_date'); // 由前端 Modal 傳來
+                
+                if (!$warehouseId) {
+                    throw new \Exception('必須選擇入庫倉庫');
+                }
+                if (!$batchNumber) {
+                    throw new \Exception('必須提供成品批號');
+                }
+
+                // 更新單據資訊：批號、效期與自動記錄生產日期
+                $productionOrder->output_batch_number = $batchNumber;
+                $productionOrder->expiry_date = $expiryDate;
+                $productionOrder->production_date = now()->toDateString();
+                $productionOrder->warehouse_id = $warehouseId;
+
+                $this->inventoryService->createInventoryRecord([
+                    'warehouse_id' => $warehouseId,
+                    'product_id' => $productionOrder->product_id,
+                    'quantity' => $productionOrder->output_quantity,
+                    'batch_number' => $batchNumber,
+                    'box_number' => $productionOrder->output_box_count,
+                    'arrival_date' => now()->toDateString(),
+                    'expiry_date' => $expiryDate,
+                    'reason' => "生產單 #{$productionOrder->code} 製作完成 (入庫)",
+                    'reference_type' => ProductionOrder::class,
+                    'reference_id' => $productionOrder->id,
+                ]);
+            }
+
+            // 2. 更新狀態
+            $productionOrder->status = $newStatus;
+            $productionOrder->save();
+
+            // 3. 紀錄 Activity Log
+            activity()
+                ->performedOn($productionOrder)
+                ->causedBy(auth()->user())
+                ->withProperties([
+                    'old_status' => $oldStatus,
+                    'new_status' => $newStatus
+                ])
+                ->log("status_updated_to_{$newStatus}");
+        });
+
+        return back()->with('success', '狀態已更新');
+    }
+
+    /**
+     * 從儲存體中移除指定資源。
     */
    public function destroy(ProductionOrder $productionOrder)
    {
-        if ($productionOrder->status === 'completed') {
-            return redirect()->back()->with('error', '已完工的生產單無法刪除');
+        // 僅允許刪除草稿或已作廢的單據
+        if (!in_array($productionOrder->status, [ProductionOrder::STATUS_DRAFT, ProductionOrder::STATUS_CANCELLED])) {
+            return redirect()->back()->with('error', '僅有草稿或已作廢的生產單可以刪除');
        }

        DB::transaction(function () use ($productionOrder) {
-            // 紀錄刪除動作 (需在刪除前或使用軟刪除)
+            $productionOrder->items()->delete();
+            $productionOrder->delete();
+            
            activity()
                ->performedOn($productionOrder)
                ->causedBy(auth()->user())
                ->log('deleted');
-
-            $productionOrder->items()->delete();
-            $productionOrder->delete();
        });

        return redirect()->route('production-orders.index')->with('success', '生產單已刪除');
--- a/app/Modules/Production/Controllers/RecipeController.php
+++ b/app/Modules/Production/Controllers/RecipeController.php
@@ -188,4 +188,118 @@ class RecipeController extends Controller
        $recipe->delete();
        return redirect()->back()->with('success', '配方已刪除');
    }
+
+    /**
+     * 獲取配方詳細資料 (API)
+     */
+    /**
+     * 獲取配方詳細資料 (API)
+     */
+    public function show(Recipe $recipe)
+    {
+        // Manual Hydration for strict modularity
+        $recipe->product = $this->inventoryService->getProduct($recipe->product_id);
+
+        $items = $recipe->items;
+        $productIds = $items->pluck('product_id')->unique()->toArray();
+        $products = $this->inventoryService->getProductsByIds($productIds)->keyBy('id');
+        $units = $this->inventoryService->getUnits()->keyBy('id');
+
+        foreach ($items as $item) {
+            $item->product = $products->get($item->product_id);
+            $item->unit = $units->get($item->unit_id);
+        }
+
+        return response()->json($recipe);
+    }
+
+    /**
+     * 獲取商品最新有效配方 (API)
+     */
+    public function getLatestByProduct($productId)
+    {
+        // 放寬條件，只要 product_id 相符就抓最新的
+        $recipe = Recipe::where('product_id', (int)$productId)
+            ->orderBy('created_at', 'desc')
+            ->first();
+
+        if (!$recipe) {
+            return response()->json(null);
+        }
+
+        // Load items with product info
+        $items = $recipe->items;
+        $productIds = $items->pluck('product_id')->unique()->toArray();
+        $products = $this->inventoryService->getProductsByIds($productIds)->keyBy('id');
+
+        $formattedItems = $items->map(function ($item) use ($products) {
+            $product = $products->get($item->product_id);
+            return [
+                'product_id' => $item->product_id,
+                'product_name' => $product->name ?? '未知商品',
+                'product_code' => $product->code ?? '',
+                'quantity' => $item->quantity,
+                'unit_id' => $item->unit_id,
+                'unit_name' => $product->baseUnit->name ?? '',
+            ];
+        });
+
+        return response()->json([
+            'id' => $recipe->id,
+            'name' => $recipe->name,
+            'code' => $recipe->code,
+            'yield_quantity' => $recipe->yield_quantity,
+            'items' => $formattedItems,
+        ]);
+    }
+    /**
+     * 獲取商品所有有效配方列表 (API)
+     */
+    public function getByProduct($productId)
+    {
+        $recipes = Recipe::where('product_id', (int)$productId)
+            ->where('is_active', true)
+            ->orderBy('created_at', 'desc')
+            ->get();
+
+        if ($recipes->isEmpty()) {
+            return response()->json([]);
+        }
+
+        // 預先載入必要的關聯與數據
+        // 為了效能，我們只在列表顯示基本資訊，詳細 Item 資料等選中後再透過 getLatestByProduct (或是重構為 getDetails) 獲取
+        // 不過為了前端方便，若配方不多，直接回傳完整結構也可以。
+        // 這裡選擇回傳完整結構，因為配方通常不會太多
+        
+        $recipes->load('items');
+
+        // 收集所有 recipe items 中的 product ids
+        $allProductIds = $recipes->pluck('items')->flatten()->pluck('product_id')->unique()->toArray();
+        $products = $this->inventoryService->getProductsByIds($allProductIds)->keyBy('id');
+
+        $result = $recipes->map(function ($recipe) use ($products) {
+            $formattedItems = $recipe->items->map(function ($item) use ($products) {
+                $product = $products->get($item->product_id);
+                return [
+                    'product_id' => $item->product_id,
+                    'product_name' => $product->name ?? '未知商品',
+                    'product_code' => $product->code ?? '',
+                    'quantity' => $item->quantity,
+                    'unit_id' => $item->unit_id,
+                    'unit_name' => $product->baseUnit->name ?? '',
+                ];
+            });
+
+            return [
+                'id' => $recipe->id,
+                'name' => $recipe->name,
+                'code' => $recipe->code,
+                'yield_quantity' => $recipe->yield_quantity,
+                'items' => $formattedItems,
+                'created_at' => $recipe->created_at->toIso8601String(),
+            ];
+        });
+
+        return response()->json($result);
+    }
 }
--- a/app/Modules/Production/Models/ProductionOrder.php
+++ b/app/Modules/Production/Models/ProductionOrder.php
@@ -11,6 +11,14 @@ class ProductionOrder extends Model
 {
    use HasFactory, LogsActivity;

+    // 狀態常數
+    const STATUS_DRAFT = 'draft';
+    const STATUS_PENDING = 'pending';
+    const STATUS_APPROVED = 'approved';
+    const STATUS_IN_PROGRESS = 'in_progress';
+    const STATUS_COMPLETED = 'completed';
+    const STATUS_CANCELLED = 'cancelled';
+
    protected $fillable = [
        'code',
        'product_id',
@@ -25,6 +33,51 @@ class ProductionOrder extends Model
        'remark',
    ];

+    /**
+     * 檢查是否可以轉移至新狀態，並驗證權限。
+     */
+    public function canTransitionTo(string $newStatus, $user = null): bool
+    {
+        $user = $user ?? auth()->user();
+        if (!$user) return false;
+        if ($user->hasRole('super-admin')) return true;
+
+        $currentStatus = $this->status;
+
+        // 定義合法的狀態轉移路徑與所需權限
+        $transitions = [
+            self::STATUS_DRAFT => [
+                self::STATUS_PENDING => 'production_orders.view', // 基本檢視者即可送審
+                self::STATUS_CANCELLED => 'production_orders.cancel',
+            ],
+            self::STATUS_PENDING => [
+                self::STATUS_APPROVED => 'production_orders.approve',
+                self::STATUS_DRAFT => 'production_orders.approve', // 退回草稿
+                self::STATUS_CANCELLED => 'production_orders.cancel',
+            ],
+            self::STATUS_APPROVED => [
+                self::STATUS_IN_PROGRESS => 'production_orders.edit', // 啟動製作需要編輯權限
+                self::STATUS_CANCELLED => 'production_orders.cancel',
+            ],
+            self::STATUS_IN_PROGRESS => [
+                self::STATUS_COMPLETED => 'production_orders.edit', // 完成製作需要編輯權限
+                self::STATUS_CANCELLED => 'production_orders.cancel',
+            ],
+        ];
+
+        if (!isset($transitions[$currentStatus])) {
+            return false;
+        }
+
+        if (!array_key_exists($newStatus, $transitions[$currentStatus])) {
+            return false;
+        }
+
+        $requiredPermission = $transitions[$currentStatus][$newStatus];
+        
+        return $requiredPermission ? $user->can($requiredPermission) : true;
+    }
+
    protected $casts = [
        'production_date' => 'date',
        'expiry_date' => 'date',
--- a/app/Modules/Production/Models/RecipeItem.php
+++ b/app/Modules/Production/Models/RecipeItem.php
@@ -27,5 +27,13 @@ class RecipeItem extends Model
        return $this->belongsTo(Recipe::class);
    }

+    public function product()
+    {
+        return $this->belongsTo(\App\Modules\Inventory\Models\Product::class);
+    }

+    public function unit()
+    {
+        return $this->belongsTo(\App\Modules\Inventory\Models\Unit::class);
+    }
 }
--- a/app/Modules/Production/Routes/web.php
+++ b/app/Modules/Production/Routes/web.php
@@ -23,10 +23,26 @@ Route::middleware('auth')->group(function () {
            Route::get('/production-orders/{productionOrder}/edit', [ProductionOrderController::class, 'edit'])->name('production-orders.edit');
            Route::put('/production-orders/{productionOrder}', [ProductionOrderController::class, 'update'])->name('production-orders.update');
        });
+
+        Route::patch('/production-orders/{productionOrder}/update-status', [ProductionOrderController::class, 'updateStatus'])->name('production-orders.update-status');
+
+        Route::middleware('permission:production_orders.delete')->group(function () {
+            Route::delete('/production-orders/{productionOrder}', [ProductionOrderController::class, 'destroy'])->name('production-orders.destroy');
+        });
    });

    // 生產管理 API
    Route::get('/api/production/warehouses/{warehouse}/inventories', [ProductionOrderController::class, 'getWarehouseInventories'])
        ->middleware('permission:production_orders.create')
        ->name('api.production.warehouses.inventories');
+
+    Route::get('/api/production/products/{product}/inventories', [ProductionOrderController::class, 'getProductWarehouses'])
+        ->middleware('permission:production_orders.create')
+        ->name('api.production.products.inventories');
+
+    Route::get('/api/production/recipes/latest-by-product/{productId}', [RecipeController::class, 'getLatestByProduct'])
+        ->name('api.production.recipes.latest-by-product');
+
+    Route::get('/api/production/recipes/by-product/{productId}', [RecipeController::class, 'getByProduct'])
+        ->name('api.production.recipes.by-product');
 });
--- a/app/Modules/Sales/Controllers/SalesImportController.php
+++ b/app/Modules/Sales/Controllers/SalesImportController.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace App\Modules\Sales\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Modules\Sales\Models\SalesImportBatch;
+use App\Modules\Sales\Imports\SalesImport;
+use App\Modules\Inventory\Services\InventoryService; // Assuming this exists or we need to use ProductService
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use Maatwebsite\Excel\Facades\Excel;
+use Illuminate\Support\Facades\DB;
+
+class SalesImportController extends Controller
+{
+    public function index(Request $request)
+    {
+        $perPage = $request->input('per_page', 10);
+        $search = $request->input('search');
+
+        $batches = SalesImportBatch::with('importer')
+            ->when($search, function ($query, $search) {
+                $query->where(function ($q) use ($search) {
+                    $q->where('id', 'like', "%{$search}%")
+                        ->orWhereHas('importer', function ($u) use ($search) {
+                            $u->where('name', 'like', "%{$search}%");
+                        });
+                });
+            })
+            ->orderByDesc('created_at')
+            ->paginate($perPage)
+            ->withQueryString();
+
+        return Inertia::render('Sales/Import/Index', [
+            'batches' => $batches,
+            'filters' => [
+                'per_page' => (string) $perPage,
+                'search' => $search,
+            ],
+        ]);
+    }
+
+
+    public function store(Request $request)
+    {
+        $request->validate([
+            'file' => 'required|file|mimes:xlsx,xls,csv,zip',
+        ]);
+
+        DB::transaction(function () use ($request) {
+            $batch = SalesImportBatch::create([
+                'import_date' => now(),
+                'imported_by' => auth()->id(),
+                'status' => 'pending',
+                'tenant_id' => tenant('id'), // If tenant context requires it, but usually automatic
+            ]);
+
+            Excel::import(new SalesImport($batch), $request->file('file'));
+        });
+
+        return redirect()->route('sales-imports.index')->with('success', '匯入成功，請確認內容。');
+    }
+
+    public function show(Request $request, SalesImportBatch $import)
+    {
+        $import->load(['items', 'importer']);
+        
+        $perPage = $request->input('per_page', 10);
+        
+        return Inertia::render('Sales/Import/Show', [
+            'import' => $import,
+            'items' => $import->items()->with(['product', 'warehouse'])->paginate($perPage)->withQueryString(),
+            'filters' => [
+                'per_page' => $perPage,
+            ],
+        ]);
+    }
+
+    public function confirm(SalesImportBatch $import, InventoryService $inventoryService)
+    {
+        if ($import->status !== 'pending') {
+            return back()->with('error', '此批次無法確認。');
+        }
+
+        DB::transaction(function () use ($import, $inventoryService) {
+            // 1. Prepare Aggregation
+            $aggregatedDeductions = []; // Key: "warehouse_id:product_id:slot"
+            
+            // Pre-load necessary warehouses for matching
+            $machineIds = $import->items->pluck('machine_id')->filter()->unique();
+            $warehouses = \App\Modules\Inventory\Models\Warehouse::whereIn('code', $machineIds)->get()->keyBy('code');
+
+            foreach ($import->items as $item) {
+                // Only process shipped items with a valid product
+                if ($item->product_id && $item->original_status === '已出貨') {
+                    // Resolve Warehouse from Machine ID
+                    $warehouse = $warehouses->get($item->machine_id);
+                    
+                    // Skip if machine_id is empty or warehouse not found
+                    if (!$warehouse) {
+                        continue;
+                    }
+
+                    // Aggregation Key includes Slot (貨道)
+                    $slot = $item->slot ?: '';
+                    $key = "{$warehouse->id}:{$item->product_id}:{$slot}";
+                    
+                    if (!isset($aggregatedDeductions[$key])) {
+                        $aggregatedDeductions[$key] = [
+                            'warehouse_id' => $warehouse->id,
+                            'product_id' => $item->product_id,
+                            'slot' => $slot,
+                            'quantity' => 0,
+                            'details' => []
+                        ];
+                    }
+                    
+                    $aggregatedDeductions[$key]['quantity'] += $item->quantity;
+                    $aggregatedDeductions[$key]['details'][] = $item->transaction_serial;
+                }
+            }
+
+            // 2. Execute Aggregated Deductions
+            foreach ($aggregatedDeductions as $deduction) {
+                // Construct a descriptive reason
+                $serialCount = count($deduction['details']);
+                $reason = "銷售出貨彙總 (批號: {$import->id}, 貨道: {$deduction['slot']}, 共 {$serialCount} 筆交易)";
+                
+                $inventoryService->decreaseStock(
+                    $deduction['product_id'],
+                    $deduction['warehouse_id'],
+                    $deduction['quantity'],
+                    $reason,
+                    true, // Force deduction
+                    $deduction['slot'] // Location/Slot
+                );
+            }
+
+            // 3. Update Batch Status
+            $import->update([
+                'status' => 'confirmed',
+                'confirmed_at' => now(),
+            ]);
+        });
+
+        return redirect()->route('sales-imports.index')->with('success', '已彙總（含貨道）並扣除庫存。');
+    }
+
+    public function destroy(SalesImportBatch $import)
+    {
+        if ($import->status !== 'pending') {
+            return back()->with('error', '只能刪除待確認的批次。');
+        }
+
+        $import->delete();
+        return redirect()->route('sales-imports.index')->with('success', '已刪除匯入批次。');
+    }
+}
--- a/app/Modules/Sales/Imports/SalesImport.php
+++ b/app/Modules/Sales/Imports/SalesImport.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Modules\Sales\Imports;
+
+use App\Modules\Sales\Models\SalesImportBatch;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+
+class SalesImport implements WithMultipleSheets
+{
+    protected $batch;
+
+    public function __construct(SalesImportBatch $batch)
+    {
+        $this->batch = $batch;
+    }
+
+    public function sheets(): array
+    {
+        // Only import the first sheet (index 0)
+        return [
+            0 => new SalesImportSheet($this->batch),
+        ];
+    }
+}
--- a/app/Modules/Sales/Imports/SalesImportSheet.php
+++ b/app/Modules/Sales/Imports/SalesImportSheet.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Modules\Sales\Imports;
+
+use App\Modules\Sales\Models\SalesImportBatch;
+use App\Modules\Sales\Models\SalesImportItem;
+use App\Modules\Inventory\Models\Product;
+use Illuminate\Support\Collection;
+use Maatwebsite\Excel\Concerns\ToCollection;
+use Maatwebsite\Excel\Concerns\WithStartRow;
+use Carbon\Carbon;
+
+class SalesImportSheet implements ToCollection, WithStartRow
+{
+    protected $batch;
+    protected $products;
+
+    public function __construct(SalesImportBatch $batch)
+    {
+        $this->batch = $batch;
+        // Pre-load all products to minimize queries (keyed by code)
+        $this->products = Product::pluck('id', 'code'); // assumes code is unique
+    }
+
+    public function startRow(): int
+    {
+        return 3;
+    }
+
+    public function collection(Collection $rows)
+    {
+        $totalQuantity = 0;
+        $totalAmount = 0;
+        $items = [];
+
+        foreach ($rows as $row) {
+            // Index mapping based on analysis:
+            // 0: 銷貨單號 (Serial)
+            // 1: 機台編號 (Machine ID)
+            // 4: 訂單狀態 (Original Status)
+            // 7: 產品代號 (Product Code)
+            // 9: 銷貨日期 (Transaction At)
+            // 11: 金額 (Amount)
+            // 19: 貨道 (Slot)
+            // Quantity default to 1
+
+            $serial = $row[0];
+            $machineId = $row[1];
+            $originalStatus = $row[4];
+            $productCode = $row[7];
+            $transactionAt = $row[9];
+            $amount = $row[11];
+            $slot = $row[19] ?? null;
+            
+            // Skip empty rows
+            if (empty($serial) && empty($productCode)) {
+                continue;
+            }
+
+            // Parse Date
+            try {
+                // Formatting might be needed depending on Excel date format
+                $transactionAt = Carbon::parse($transactionAt);
+            } catch (\Exception $e) {
+                $transactionAt = now();
+            }
+
+            $quantity = 1; // Default
+            
+            // Clean amount (remove comma etc if needed)
+            $amount = is_numeric($amount) ? $amount : 0;
+
+            $items[] = [
+                'batch_id' => $this->batch->id,
+                'machine_id' => $machineId,
+                'slot' => $slot,
+                'product_code' => $productCode,
+                'product_id' => $this->products[$productCode] ?? null,
+                'transaction_at' => $transactionAt,
+                'transaction_serial' => $serial,
+                'quantity' => (int)$quantity,
+                'amount' => $amount,
+                'original_status' => $originalStatus,
+                'created_at' => now(),
+                'updated_at' => now(),
+            ];
+
+            $totalQuantity += $quantity;
+            $totalAmount += $amount;
+        }
+
+        // Bulk insert items (chunk if necessary, but assuming reasonable size)
+        foreach (array_chunk($items, 1000) as $chunk) {
+            SalesImportItem::insert($chunk);
+        }
+
+        // Update Batch Totals
+        // Increment totals instead of overwriting, in case we decide to process multiple sheets later?
+        // But for now, since we only process sheet 0, overwriting or incrementing is fine.
+        // Given we strictly return [0 => ...], only one sheet runs.
+        $this->batch->update([
+            'total_quantity' => $totalQuantity,
+            'total_amount' => $totalAmount,
+        ]);
+    }
+}
--- a/app/Modules/Sales/Models/SalesImportBatch.php
+++ b/app/Modules/Sales/Models/SalesImportBatch.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Modules\Sales\Models;
+
+use App\Modules\Core\Models\User;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class SalesImportBatch extends Model
+{
+    use HasFactory;
+
+    protected $table = 'sales_import_batches';
+
+    protected $fillable = [
+        'import_date',
+        'total_quantity',
+        'total_amount',
+        'status',
+        'imported_by',
+        'confirmed_at',
+        'note',
+    ];
+
+    protected $casts = [
+        'import_date' => 'date',
+        'confirmed_at' => 'datetime',
+        'total_quantity' => 'decimal:4',
+        'total_amount' => 'decimal:4',
+    ];
+
+    public function items(): HasMany
+    {
+        return $this->hasMany(SalesImportItem::class, 'batch_id');
+    }
+
+    public function importer(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'imported_by');
+    }
+}
--- a/app/Modules/Sales/Models/SalesImportItem.php
+++ b/app/Modules/Sales/Models/SalesImportItem.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Modules\Sales\Models;
+
+use App\Modules\Inventory\Models\Product;
+use App\Modules\Inventory\Models\Warehouse;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class SalesImportItem extends Model
+{
+    use HasFactory;
+
+    protected $table = 'sales_import_items';
+
+    protected $fillable = [
+        'batch_id',
+        'machine_id',
+        'slot',
+        'product_code',
+        'product_id',
+        'transaction_at',
+        'transaction_serial',
+        'quantity',
+        'amount',
+        'original_status',
+    ];
+
+    protected $casts = [
+        'transaction_at' => 'datetime',
+        'quantity' => 'integer',
+        'amount' => 'decimal:4',
+        'original_status' => 'string',
+    ];
+
+    public function batch(): BelongsTo
+    {
+        return $this->belongsTo(SalesImportBatch::class, 'batch_id');
+    }
+
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(Product::class, 'product_id');
+    }
+
+    public function warehouse(): BelongsTo
+    {
+        return $this->belongsTo(Warehouse::class, 'machine_id', 'code');
+    }
+}
--- a/app/Modules/Sales/Routes/web.php
+++ b/app/Modules/Sales/Routes/web.php
@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use App\Modules\Sales\Controllers\SalesImportController;
+
+Route::middleware(['auth', 'verified'])->prefix('sales')->name('sales-imports.')->group(function () {
+    Route::middleware('permission:sales_imports.view')->group(function () {
+        Route::get('/imports', [SalesImportController::class, 'index'])->name('index');
+        Route::get('/imports/{import}', [SalesImportController::class, 'show'])->name('show');
+    });
+
+    Route::post('/imports', [SalesImportController::class, 'store'])->middleware('permission:sales_imports.create')->name('store');
+    
+    Route::post('/imports/{import}/confirm', [SalesImportController::class, 'confirm'])->middleware('permission:sales_imports.confirm')->name('confirm');
+    Route::delete('/imports/{import}', [SalesImportController::class, 'destroy'])->middleware('permission:sales_imports.delete')->name('destroy');
+});
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -18,9 +18,17 @@ class AppServiceProvider extends ServiceProvider

    public function boot(): void
    {
-        // 如果是在正式環境，強制轉為 https
-        if (config('app.env') === 'production') {
+        // 強制 HTTPS 檢測邏輯 (包含 Cloudflare/Load Balancer 支援)
+        $isHttps = $this->app->environment('production') 
+            || str_contains(config('app.url'), 'https')
+            || request()->header('x-forwarded-proto') === 'https'
+            || request()->server('HTTPS') === 'on';
+
+        if ($isHttps) {
            URL::forceScheme('https');
+            
+            // 強制讓 Request 物件認為自己是安全連線 (解決 Paginator 或 Request::secure() 判斷問題)
+            request()->server->set('HTTPS', 'on');
        }

        // 隱含授權：讓 "super-admin" 角色擁有所有權限
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -4,12 +4,11 @@ use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;
 use Illuminate\Foundation\Configuration\Middleware;
 use Illuminate\Http\Middleware\TrustProxies;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Spatie\Permission\Exceptions\UnauthorizedException;
 use Inertia\Inertia;
-
-// 信任所有代理（用於反向代理環境）
-TrustProxies::at('*');
+use Illuminate\Http\Request;

 return Application::configure(basePath: dirname(__DIR__))
    ->withRouting(
@@ -18,6 +17,9 @@ return Application::configure(basePath: dirname(__DIR__))
        health: '/up',
    )
    ->withMiddleware(function (Middleware $middleware): void {
+        // 信任所有代理（用於反向代理環境）
+        $middleware->trustProxies(at: '*');
+
        // Tenancy 必須最先執行，確保資料庫連線在 Session 讀取之前建立
        $middleware->web(prepend: [
            \App\Http\Middleware\UniversalTenancy::class,
@@ -36,14 +38,24 @@ return Application::configure(basePath: dirname(__DIR__))
    ->withExceptions(function (Exceptions $exceptions): void {
        // 處理 Spatie Permission 的 UnauthorizedException
        $exceptions->render(function (UnauthorizedException $e) {
-            return Inertia::render('Error/403')->toResponse(request())->setStatusCode(403);
+            return Inertia::render('Error/Index', ['status' => 403])
+                ->toResponse(request())
+                ->setStatusCode(403);
        });

-        // 處理一般的 403 HttpException
+        // 處理 404 NotFoundHttpException
+        $exceptions->render(function (NotFoundHttpException $e) {
+            return Inertia::render('Error/Index', ['status' => 404])
+                ->toResponse(request())
+                ->setStatusCode(404);
+        });
+
+        // 處理其他一般的 HttpException (包含 403, 419, 429, 500, 503 等)
        $exceptions->render(function (HttpException $e) {
-            if ($e->getStatusCode() === 403) {
-                return Inertia::render('Error/403')->toResponse(request())->setStatusCode(403);
-            }
+            $status = $e->getStatusCode();
+            return Inertia::render('Error/Index', ['status' => $status])
+                ->toResponse(request())
+                ->setStatusCode($status);
        });
    })->create();

--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,9 @@
        "php": "^8.2",
        "inertiajs/inertia-laravel": "^2.0",
        "laravel/framework": "^12.0",
+        "laravel/sanctum": "^4.3",
        "laravel/tinker": "^2.10.1",
+        "maatwebsite/excel": "^3.1",
        "spatie/laravel-activitylog": "^4.10",
        "spatie/laravel-permission": "^6.24",
        "stancl/jobpipeline": "^1.8",
@@ -93,4 +95,4 @@
    },
    "minimum-stability": "stable",
    "prefer-stable": true
-}
+}
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "46092572c41c587bf3e7fc53465e5b56",
+    "content-hash": "0efc099e328144f00fc558c52ff945c4",
    "packages": [
        {
            "name": "brick/math",
@@ -135,6 +135,162 @@
            ],
            "time": "2024-02-09T16:56:22+00:00"
        },
+        {
+            "name": "composer/pcre",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-strict-rules": "^1 || ^2",
+                "phpunit/phpunit": "^8 || ^9"
+            },
+            "type": "library",
+            "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/3.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-11-12T16:29:46+00:00"
+        },
+        {
+            "name": "composer/semver",
+            "version": "3.4.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/semver.git",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Semver\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "keywords": [
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
+            ],
+            "support": {
+                "irc": "ircs://irc.libera.chat:6697/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/3.4.4"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-20T19:15:30+00:00"
+        },
        {
            "name": "dflydev/dot-access-data",
            "version": "v3.0.3",
@@ -508,6 +664,67 @@
            ],
            "time": "2025-03-06T22:45:56+00:00"
        },
+        {
+            "name": "ezyang/htmlpurifier",
+            "version": "v4.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezyang/htmlpurifier.git",
+                "reference": "b287d2a16aceffbf6e0295559b39662612b77fcf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/b287d2a16aceffbf6e0295559b39662612b77fcf",
+                "reference": "b287d2a16aceffbf6e0295559b39662612b77fcf",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
+            },
+            "require-dev": {
+                "cerdic/css-tidy": "^1.7 || ^2.0",
+                "simpletest/simpletest": "dev-master"
+            },
+            "suggest": {
+                "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.",
+                "ext-bcmath": "Used for unit conversion and imagecrash protection",
+                "ext-iconv": "Converts text to and from non-UTF-8 encodings",
+                "ext-tidy": "Used for pretty-printing HTML"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "library/HTMLPurifier.composer.php"
+                ],
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
+                "exclude-from-classmap": [
+                    "/library/HTMLPurifier/Language/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Edward Z. Yang",
+                    "email": "admin@htmlpurifier.org",
+                    "homepage": "http://ezyang.com"
+                }
+            ],
+            "description": "Standards compliant HTML filter written in PHP",
+            "homepage": "http://htmlpurifier.org/",
+            "keywords": [
+                "html"
+            ],
+            "support": {
+                "issues": "https://github.com/ezyang/htmlpurifier/issues",
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.19.0"
+            },
+            "time": "2025-10-17T16:34:55+00:00"
+        },
        {
            "name": "facade/ignition-contracts",
            "version": "1.0.2",
@@ -1456,6 +1673,69 @@
            },
            "time": "2025-11-21T20:52:52+00:00"
        },
+        {
+            "name": "laravel/sanctum",
+            "version": "v4.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/sanctum.git",
+                "reference": "c978c82b2b8ab685468a7ca35224497d541b775a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/c978c82b2b8ab685468a7ca35224497d541b775a",
+                "reference": "c978c82b2b8ab685468a7ca35224497d541b775a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "illuminate/console": "^11.0|^12.0",
+                "illuminate/contracts": "^11.0|^12.0",
+                "illuminate/database": "^11.0|^12.0",
+                "illuminate/support": "^11.0|^12.0",
+                "php": "^8.2",
+                "symfony/console": "^7.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.6",
+                "orchestra/testbench": "^9.15|^10.8",
+                "phpstan/phpstan": "^1.10"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Sanctum\\SanctumServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Sanctum\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Laravel Sanctum provides a featherweight authentication system for SPAs and simple APIs.",
+            "keywords": [
+                "auth",
+                "laravel",
+                "sanctum"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/sanctum/issues",
+                "source": "https://github.com/laravel/sanctum"
+            },
+            "time": "2026-01-22T22:27:01+00:00"
+        },
        {
            "name": "laravel/serializable-closure",
            "version": "v2.0.7",
@@ -2142,6 +2422,272 @@
            ],
            "time": "2025-12-07T16:03:21+00:00"
        },
+        {
+            "name": "maatwebsite/excel",
+            "version": "3.1.67",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SpartnerNL/Laravel-Excel.git",
+                "reference": "e508e34a502a3acc3329b464dad257378a7edb4d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/e508e34a502a3acc3329b464dad257378a7edb4d",
+                "reference": "e508e34a502a3acc3329b464dad257378a7edb4d",
+                "shasum": ""
+            },
+            "require": {
+                "composer/semver": "^3.3",
+                "ext-json": "*",
+                "illuminate/support": "5.8.*||^6.0||^7.0||^8.0||^9.0||^10.0||^11.0||^12.0",
+                "php": "^7.0||^8.0",
+                "phpoffice/phpspreadsheet": "^1.30.0",
+                "psr/simple-cache": "^1.0||^2.0||^3.0"
+            },
+            "require-dev": {
+                "laravel/scout": "^7.0||^8.0||^9.0||^10.0",
+                "orchestra/testbench": "^6.0||^7.0||^8.0||^9.0||^10.0",
+                "predis/predis": "^1.1"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "Excel": "Maatwebsite\\Excel\\Facades\\Excel"
+                    },
+                    "providers": [
+                        "Maatwebsite\\Excel\\ExcelServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Maatwebsite\\Excel\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Patrick Brouwers",
+                    "email": "patrick@spartner.nl"
+                }
+            ],
+            "description": "Supercharged Excel exports and imports in Laravel",
+            "keywords": [
+                "PHPExcel",
+                "batch",
+                "csv",
+                "excel",
+                "export",
+                "import",
+                "laravel",
+                "php",
+                "phpspreadsheet"
+            ],
+            "support": {
+                "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues",
+                "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.67"
+            },
+            "funding": [
+                {
+                    "url": "https://laravel-excel.com/commercial-support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/patrickbrouwers",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-26T09:13:16+00:00"
+        },
+        {
+            "name": "maennchen/zipstream-php",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maennchen/ZipStream-PHP.git",
+                "reference": "682f1098a8fddbaf43edac2306a691c7ad508ec5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/682f1098a8fddbaf43edac2306a691c7ad508ec5",
+                "reference": "682f1098a8fddbaf43edac2306a691c7ad508ec5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-zlib": "*",
+                "php-64bit": "^8.3"
+            },
+            "require-dev": {
+                "brianium/paratest": "^7.7",
+                "ext-zip": "*",
+                "friendsofphp/php-cs-fixer": "^3.86",
+                "guzzlehttp/guzzle": "^7.5",
+                "mikey179/vfsstream": "^1.6",
+                "php-coveralls/php-coveralls": "^2.5",
+                "phpunit/phpunit": "^12.0",
+                "vimeo/psalm": "^6.0"
+            },
+            "suggest": {
+                "guzzlehttp/psr7": "^2.4",
+                "psr/http-message": "^2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ZipStream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paul Duncan",
+                    "email": "pabs@pablotron.org"
+                },
+                {
+                    "name": "Jonatan Männchen",
+                    "email": "jonatan@maennchen.ch"
+                },
+                {
+                    "name": "Jesse Donat",
+                    "email": "donatj@gmail.com"
+                },
+                {
+                    "name": "András Kolesár",
+                    "email": "kolesar@kolesar.hu"
+                }
+            ],
+            "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.",
+            "keywords": [
+                "stream",
+                "zip"
+            ],
+            "support": {
+                "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/maennchen",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-12-10T09:58:31+00:00"
+        },
+        {
+            "name": "markbaker/complex",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/MarkBaker/PHPComplex.git",
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "squizlabs/php_codesniffer": "^3.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Complex\\": "classes/src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Baker",
+                    "email": "mark@lange.demon.co.uk"
+                }
+            ],
+            "description": "PHP Class for working with complex numbers",
+            "homepage": "https://github.com/MarkBaker/PHPComplex",
+            "keywords": [
+                "complex",
+                "mathematics"
+            ],
+            "support": {
+                "issues": "https://github.com/MarkBaker/PHPComplex/issues",
+                "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2"
+            },
+            "time": "2022-12-06T16:21:08+00:00"
+        },
+        {
+            "name": "markbaker/matrix",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/MarkBaker/PHPMatrix.git",
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c",
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpdocumentor/phpdocumentor": "2.*",
+                "phploc/phploc": "^4.0",
+                "phpmd/phpmd": "2.*",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "sebastian/phpcpd": "^4.0",
+                "squizlabs/php_codesniffer": "^3.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Matrix\\": "classes/src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Baker",
+                    "email": "mark@demon-angel.eu"
+                }
+            ],
+            "description": "PHP Class for working with matrices",
+            "homepage": "https://github.com/MarkBaker/PHPMatrix",
+            "keywords": [
+                "mathematics",
+                "matrix",
+                "vector"
+            ],
+            "support": {
+                "issues": "https://github.com/MarkBaker/PHPMatrix/issues",
+                "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1"
+            },
+            "time": "2022-12-02T22:17:43+00:00"
+        },
        {
            "name": "monolog/monolog",
            "version": "3.9.0",
@@ -2649,6 +3195,112 @@
            ],
            "time": "2025-11-20T02:34:59+00:00"
        },
+        {
+            "name": "phpoffice/phpspreadsheet",
+            "version": "1.30.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
+                "reference": "2f39286e0136673778b7a142b3f0d141e43d1714"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/2f39286e0136673778b7a142b3f0d141e43d1714",
+                "reference": "2f39286e0136673778b7a142b3f0d141e43d1714",
+                "shasum": ""
+            },
+            "require": {
+                "composer/pcre": "^1||^2||^3",
+                "ext-ctype": "*",
+                "ext-dom": "*",
+                "ext-fileinfo": "*",
+                "ext-gd": "*",
+                "ext-iconv": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-simplexml": "*",
+                "ext-xml": "*",
+                "ext-xmlreader": "*",
+                "ext-xmlwriter": "*",
+                "ext-zip": "*",
+                "ext-zlib": "*",
+                "ezyang/htmlpurifier": "^4.15",
+                "maennchen/zipstream-php": "^2.1 || ^3.0",
+                "markbaker/complex": "^3.0",
+                "markbaker/matrix": "^3.0",
+                "php": "^7.4 || ^8.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0",
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+                "dompdf/dompdf": "^1.0 || ^2.0 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "mitoteam/jpgraph": "^10.3",
+                "mpdf/mpdf": "^8.1.1",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpstan/phpstan": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^8.5 || ^9.0",
+                "squizlabs/php_codesniffer": "^3.7",
+                "tecnickcom/tcpdf": "^6.5"
+            },
+            "suggest": {
+                "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+                "ext-intl": "PHP Internationalization Functions",
+                "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
+                "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
+                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maarten Balliauw",
+                    "homepage": "https://blog.maartenballiauw.be"
+                },
+                {
+                    "name": "Mark Baker",
+                    "homepage": "https://markbakeruk.net"
+                },
+                {
+                    "name": "Franck Lefevre",
+                    "homepage": "https://rootslabs.net"
+                },
+                {
+                    "name": "Erik Tilt"
+                },
+                {
+                    "name": "Adrien Crivelli"
+                }
+            ],
+            "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+            "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
+            "keywords": [
+                "OpenXML",
+                "excel",
+                "gnumeric",
+                "ods",
+                "php",
+                "spreadsheet",
+                "xls",
+                "xlsx"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.30.0"
+            },
+            "time": "2025-08-10T06:28:02+00:00"
+        },
        {
            "name": "phpoption/phpoption",
            "version": "1.9.4",
--- a/config/excel.php
+++ b/config/excel.php
@@ -0,0 +1,380 @@
+<?php
+
+use Maatwebsite\Excel\Excel;
+use PhpOffice\PhpSpreadsheet\Reader\Csv;
+
+return [
+    'exports' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Chunk size
+        |--------------------------------------------------------------------------
+        |
+        | When using FromQuery, the query is automatically chunked.
+        | Here you can specify how big the chunk should be.
+        |
+        */
+        'chunk_size'             => 1000,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Pre-calculate formulas during export
+        |--------------------------------------------------------------------------
+        */
+        'pre_calculate_formulas' => false,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Enable strict null comparison
+        |--------------------------------------------------------------------------
+        |
+        | When enabling strict null comparison empty cells ('') will
+        | be added to the sheet.
+        */
+        'strict_null_comparison' => false,
+
+        /*
+        |--------------------------------------------------------------------------
+        | CSV Settings
+        |--------------------------------------------------------------------------
+        |
+        | Configure e.g. delimiter, enclosure and line ending for CSV exports.
+        |
+        */
+        'csv'                    => [
+            'delimiter'              => ',',
+            'enclosure'              => '"',
+            'line_ending'            => PHP_EOL,
+            'use_bom'                => false,
+            'include_separator_line' => false,
+            'excel_compatibility'    => false,
+            'output_encoding'        => '',
+            'test_auto_detect'       => true,
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Worksheet properties
+        |--------------------------------------------------------------------------
+        |
+        | Configure e.g. default title, creator, subject,...
+        |
+        */
+        'properties'             => [
+            'creator'        => '',
+            'lastModifiedBy' => '',
+            'title'          => '',
+            'description'    => '',
+            'subject'        => '',
+            'keywords'       => '',
+            'category'       => '',
+            'manager'        => '',
+            'company'        => '',
+        ],
+    ],
+
+    'imports'            => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Read Only
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with imports, you might only be interested in the
+        | data that the sheet exists. By default we ignore all styles,
+        | however if you want to do some logic based on style data
+        | you can enable it by setting read_only to false.
+        |
+        */
+        'read_only'    => true,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Ignore Empty
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with imports, you might be interested in ignoring
+        | rows that have null values or empty strings. By default rows
+        | containing empty strings or empty values are not ignored but can be
+        | ignored by enabling the setting ignore_empty to true.
+        |
+        */
+        'ignore_empty' => false,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Heading Row Formatter
+        |--------------------------------------------------------------------------
+        |
+        | Configure the heading row formatter.
+        | Available options: none|slug|custom
+        |
+        */
+        'heading_row'  => [
+            'formatter' => 'slug',
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | CSV Settings
+        |--------------------------------------------------------------------------
+        |
+        | Configure e.g. delimiter, enclosure and line ending for CSV imports.
+        |
+        */
+        'csv'          => [
+            'delimiter'        => null,
+            'enclosure'        => '"',
+            'escape_character' => '\\',
+            'contiguous'       => false,
+            'input_encoding'   => Csv::GUESS_ENCODING,
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Worksheet properties
+        |--------------------------------------------------------------------------
+        |
+        | Configure e.g. default title, creator, subject,...
+        |
+        */
+        'properties'   => [
+            'creator'        => '',
+            'lastModifiedBy' => '',
+            'title'          => '',
+            'description'    => '',
+            'subject'        => '',
+            'keywords'       => '',
+            'category'       => '',
+            'manager'        => '',
+            'company'        => '',
+        ],
+
+        /*
+       |--------------------------------------------------------------------------
+       | Cell Middleware
+       |--------------------------------------------------------------------------
+       |
+       | Configure middleware that is executed on getting a cell value
+       |
+       */
+        'cells'        => [
+            'middleware' => [
+                //\Maatwebsite\Excel\Middleware\TrimCellValue::class,
+                //\Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
+            ],
+        ],
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Extension detector
+    |--------------------------------------------------------------------------
+    |
+    | Configure here which writer/reader type should be used when the package
+    | needs to guess the correct type based on the extension alone.
+    |
+    */
+    'extension_detector' => [
+        'xlsx'     => Excel::XLSX,
+        'xlsm'     => Excel::XLSX,
+        'xltx'     => Excel::XLSX,
+        'xltm'     => Excel::XLSX,
+        'xls'      => Excel::XLS,
+        'xlt'      => Excel::XLS,
+        'ods'      => Excel::ODS,
+        'ots'      => Excel::ODS,
+        'slk'      => Excel::SLK,
+        'xml'      => Excel::XML,
+        'gnumeric' => Excel::GNUMERIC,
+        'htm'      => Excel::HTML,
+        'html'     => Excel::HTML,
+        'csv'      => Excel::CSV,
+        'tsv'      => Excel::TSV,
+
+        /*
+        |--------------------------------------------------------------------------
+        | PDF Extension
+        |--------------------------------------------------------------------------
+        |
+        | Configure here which Pdf driver should be used by default.
+        | Available options: Excel::MPDF | Excel::TCPDF | Excel::DOMPDF
+        |
+        */
+        'pdf'      => Excel::DOMPDF,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Value Binder
+    |--------------------------------------------------------------------------
+    |
+    | PhpSpreadsheet offers a way to hook into the process of a value being
+    | written to a cell. In there some assumptions are made on how the
+    | value should be formatted. If you want to change those defaults,
+    | you can implement your own default value binder.
+    |
+    | Possible value binders:
+    |
+    | [x] Maatwebsite\Excel\DefaultValueBinder::class
+    | [x] PhpOffice\PhpSpreadsheet\Cell\StringValueBinder::class
+    | [x] PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder::class
+    |
+    */
+    'value_binder'       => [
+        'default' => Maatwebsite\Excel\DefaultValueBinder::class,
+    ],
+
+    'cache'        => [
+        /*
+        |--------------------------------------------------------------------------
+        | Default cell caching driver
+        |--------------------------------------------------------------------------
+        |
+        | By default PhpSpreadsheet keeps all cell values in memory, however when
+        | dealing with large files, this might result into memory issues. If you
+        | want to mitigate that, you can configure a cell caching driver here.
+        | When using the illuminate driver, it will store each value in the
+        | cache store. This can slow down the process, because it needs to
+        | store each value. You can use the "batch" store if you want to
+        | only persist to the store when the memory limit is reached.
+        |
+        | Drivers: memory|illuminate|batch
+        |
+        */
+        'driver'      => 'memory',
+
+        /*
+        |--------------------------------------------------------------------------
+        | Batch memory caching
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with the "batch" caching driver, it will only
+        | persist to the store when the memory limit is reached.
+        | Here you can tweak the memory limit to your liking.
+        |
+        */
+        'batch'       => [
+            'memory_limit' => 60000,
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Illuminate cache
+        |--------------------------------------------------------------------------
+        |
+        | When using the "illuminate" caching driver, it will automatically use
+        | your default cache store. However if you prefer to have the cell
+        | cache on a separate store, you can configure the store name here.
+        | You can use any store defined in your cache config. When leaving
+        | at "null" it will use the default store.
+        |
+        */
+        'illuminate'  => [
+            'store' => null,
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Cache Time-to-live (TTL)
+        |--------------------------------------------------------------------------
+        |
+        | The TTL of items written to cache. If you want to keep the items cached
+        | indefinitely, set this to null.  Otherwise, set a number of seconds,
+        | a \DateInterval, or a callable.
+        |
+        | Allowable types: callable|\DateInterval|int|null
+        |
+         */
+        'default_ttl' => 10800,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Transaction Handler
+    |--------------------------------------------------------------------------
+    |
+    | By default the import is wrapped in a transaction. This is useful
+    | for when an import may fail and you want to retry it. With the
+    | transactions, the previous import gets rolled-back.
+    |
+    | You can disable the transaction handler by setting this to null.
+    | Or you can choose a custom made transaction handler here.
+    |
+    | Supported handlers: null|db
+    |
+    */
+    'transactions' => [
+        'handler' => 'db',
+        'db'      => [
+            'connection' => null,
+        ],
+    ],
+
+    'temporary_files' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Local Temporary Path
+        |--------------------------------------------------------------------------
+        |
+        | When exporting and importing files, we use a temporary file, before
+        | storing reading or downloading. Here you can customize that path.
+        | permissions is an array with the permission flags for the directory (dir)
+        | and the create file (file).
+        |
+        */
+        'local_path'          => storage_path('framework/cache/laravel-excel'),
+
+        /*
+        |--------------------------------------------------------------------------
+        | Local Temporary Path Permissions
+        |--------------------------------------------------------------------------
+        |
+        | Permissions is an array with the permission flags for the directory (dir)
+        | and the create file (file).
+        | If omitted the default permissions of the filesystem will be used.
+        |
+        */
+        'local_permissions'   => [
+            // 'dir'  => 0755,
+            // 'file' => 0644,
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Remote Temporary Disk
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with a multi server setup with queues in which you
+        | cannot rely on having a shared local temporary path, you might
+        | want to store the temporary file on a shared disk. During the
+        | queue executing, we'll retrieve the temporary file from that
+        | location instead. When left to null, it will always use
+        | the local path. This setting only has effect when using
+        | in conjunction with queued imports and exports.
+        |
+        */
+        'remote_disk'         => null,
+        'remote_prefix'       => null,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Force Resync
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with a multi server setup as above, it's possible
+        | for the clean up that occurs after entire queue has been run to only
+        | cleanup the server that the last AfterImportJob runs on. The rest of the server
+        | would still have the local temporary file stored on it. In this case your
+        | local storage limits can be exceeded and future imports won't be processed.
+        | To mitigate this you can set this config value to be true, so that after every
+        | queued chunk is processed the local temporary file is deleted on the server that
+        | processed it.
+        |
+        */
+        'force_resync_remote' => null,
+    ],
+];
--- a/config/sanctum.php
+++ b/config/sanctum.php
@@ -0,0 +1,84 @@
+<?php
+
+use Laravel\Sanctum\Sanctum;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Stateful Domains
+    |--------------------------------------------------------------------------
+    |
+    | Requests from the following domains / hosts will receive stateful API
+    | authentication cookies. Typically, these should include your local
+    | and production domains which access your API via a frontend SPA.
+    |
+    */
+
+    'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', sprintf(
+        '%s%s',
+        'localhost,localhost:3000,127.0.0.1,127.0.0.1:8000,::1',
+        Sanctum::currentApplicationUrlWithPort(),
+        // Sanctum::currentRequestHost(),
+    ))),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sanctum Guards
+    |--------------------------------------------------------------------------
+    |
+    | This array contains the authentication guards that will be checked when
+    | Sanctum is trying to authenticate a request. If none of these guards
+    | are able to authenticate the request, Sanctum will use the bearer
+    | token that's present on an incoming request for authentication.
+    |
+    */
+
+    'guard' => ['web'],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Expiration Minutes
+    |--------------------------------------------------------------------------
+    |
+    | This value controls the number of minutes until an issued token will be
+    | considered expired. This will override any values set in the token's
+    | "expires_at" attribute, but first-party sessions are not affected.
+    |
+    */
+
+    'expiration' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Token Prefix
+    |--------------------------------------------------------------------------
+    |
+    | Sanctum can prefix new tokens in order to take advantage of numerous
+    | security scanning initiatives maintained by open source platforms
+    | that notify developers if they commit tokens into repositories.
+    |
+    | See: https://docs.github.com/en/code-security/secret-scanning/about-secret-scanning
+    |
+    */
+
+    'token_prefix' => env('SANCTUM_TOKEN_PREFIX', ''),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sanctum Middleware
+    |--------------------------------------------------------------------------
+    |
+    | When authenticating your first-party SPA with Sanctum you may need to
+    | customize some of the middleware Sanctum uses while processing the
+    | request. You may change the middleware listed below as required.
+    |
+    */
+
+    'middleware' => [
+        'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class,
+        'encrypt_cookies' => Illuminate\Cookie\Middleware\EncryptCookies::class,
+        'validate_csrf_token' => Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class,
+    ],
+
+];
--- a/config/session.php
+++ b/config/session.php
@@ -129,7 +129,7 @@ return [

    'cookie' => env(
        'SESSION_COOKIE',
-        Str::slug((string) env('APP_NAME', 'laravel')).'-session'
+        Str::slug((string) env('APP_NAME', 'laravel')).'_v2_session'
    ),

    /*
--- a/config/tenancy.php
+++ b/config/tenancy.php
@@ -204,6 +204,6 @@ return [
     */
    'seeder_parameters' => [
        '--class' => 'TenantDatabaseSeeder', // 租戶專用 seeder
-        // '--force' => true, // This needs to be true to seed tenant databases in production
+        '--force' => true, // 強制在正式環境執行 Seeder
    ],
 ];
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -37,6 +37,7 @@ class UserFactory extends Factory
            'email_verified_at' => now(),
            'password' => static::$password ??= Hash::make('password'),
            'remember_token' => Str::random(10),
+            'is_active' => true,
        ];
    }

--- a/database/migrations/2026_01_16_152857_create_activity_log_table.php
+++ b/database/migrations/2026_01_16_152857_create_activity_log_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::connection(config('activitylog.database_connection'))->create(config('activitylog.table_name'), function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('log_name')->nullable();
+            $table->text('description');
+            $table->nullableMorphs('subject', 'subject');
+            $table->nullableMorphs('causer', 'causer');
+            $table->json('properties')->nullable();
+            $table->timestamps();
+            $table->index('log_name');
+        });
+    }
+
+    public function down()
+    {
+        Schema::connection(config('activitylog.database_connection'))->dropIfExists(config('activitylog.table_name'));
+    }
+};
--- a/database/migrations/2026_01_16_152858_add_event_column_to_activity_log_table.php
+++ b/database/migrations/2026_01_16_152858_add_event_column_to_activity_log_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) {
+            $table->string('event')->nullable()->after('subject_type');
+        });
+    }
+
+    public function down()
+    {
+        Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) {
+            $table->dropColumn('event');
+        });
+    }
+};
--- a/database/migrations/2026_01_16_152859_add_batch_uuid_column_to_activity_log_table.php
+++ b/database/migrations/2026_01_16_152859_add_batch_uuid_column_to_activity_log_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) {
+            $table->uuid('batch_uuid')->nullable()->after('properties');
+        });
+    }
+
+    public function down()
+    {
+        Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) {
+            $table->dropColumn('batch_uuid');
+        });
+    }
+};
--- a/Show More
+++ b/Show More