實作產品與庫存匯入邏輯 (ProductImport, InventoryImport) 並更新相關 Service 與 Controller

app/Modules/Inventory/Imports/InventoryImport.php

@@ -23,7 +23,12 @@ class InventoryImport implements ToModel, WithHeadingRow, WithValidation, WithMa
     {
         HeadingRowFormatter::default('none');
         $this->warehouse = $warehouse;
-        $this->inboundDate = $inboundDate;
+        
+        // 修正時間精度：將選定的日期與「現在的時分秒」結合
+        // 這樣既能保留使用者選的日期，又能提供精確的紀錄時點排順序
+        $currentTime = date('H:i:s');
+        $this->inboundDate = $inboundDate . ' ' . $currentTime;
+        
         $this->notes = $notes;
     }
 
@@ -95,7 +100,7 @@ class InventoryImport implements ToModel, WithHeadingRow, WithValidation, WithMa
             // 更新單價與總價值
             $inventory->unit_cost = $unitCost;
             $inventory->total_value = $inventory->quantity * $unitCost;
-            $inventory->save();
+            $inventory->saveQuietly();
 
             // 記錄交易歷史
             $inventory->transactions()->create([

app/Modules/Inventory/Imports/ProductImport.php

@@ -16,6 +16,7 @@ class ProductImport implements ToModel, WithHeadingRow, WithValidation, WithMapp
 {
     private $categories;
     private $units;
+    private $productService;
 
     public function __construct()
     {
@@ -25,6 +26,7 @@ class ProductImport implements ToModel, WithHeadingRow, WithValidation, WithMapp
         // 快取所有類別與單位，避免 N+1 查詢
         $this->categories = Category::pluck('id', 'name');
         $this->units = Unit::pluck('id', 'name');
+        $this->productService = app(\App\Modules\Inventory\Contracts\ProductServiceInterface::class);
     }
 
     /**
@@ -65,15 +67,8 @@ class ProductImport implements ToModel, WithHeadingRow, WithValidation, WithMapp
         $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();
-        }
+        // Upsert 邏輯：透過 Service 統一查找與處理
+        $product = $this->productService->findByBarcodeOrCode($barcode, $code);
 
         $data = [
             'name' => $row['商品名稱'],
@@ -91,58 +86,16 @@ class ProductImport implements ToModel, WithHeadingRow, WithValidation, WithMapp
         ];
 
         if ($product) {
-            // 更新現有商品
-            $product->update($data);
-            return null; // 返回 null 以避免 Maatwebsite/Excel 嘗試再次 insert
+            $this->productService->updateProduct($product, $data);
+        } else {
+            if (!empty($code)) $data['code'] = $code;
+            if (!empty($barcode)) $data['barcode'] = $barcode;
+            $this->productService->createProduct($data);
         }
 
-        // 建立新商品：處理代碼與條碼自動生成
-        if (empty($code)) {
-            $code = $this->generateRandomCode();
-        }
-        if (empty($barcode)) {
-            $barcode = $this->generateRandomBarcode();
-        }
-
-        $data['code'] = $code;
-        $data['barcode'] = $barcode;
-
-        return new Product($data);
+        return null; // 返回 null，因為 Service 已經處理完儲存
     }
 
-    /**
-     * 生成隨機 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