fix(Inventory): 修復庫存列表批號欄位與新增庫存頁面儲位欄位遺失問題,並還原批號輸入佈局

This commit is contained in:
2026-02-06 17:35:50 +08:00
parent e018b75783
commit f22df90e01
8 changed files with 48 additions and 8 deletions

View File

@@ -55,18 +55,20 @@ class InventoryImport implements ToModel, WithHeadingRow, WithValidation, WithMa
$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, $batchNumber, $originCountry, $expiryDate) {
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
'batch_number' => $batchNumber,
'location' => $location, // 加入儲位/貨道作為區分關鍵字
],
[
'quantity' => 0,
@@ -114,7 +116,10 @@ class InventoryImport implements ToModel, WithHeadingRow, WithValidation, WithMa
'商品條碼' => ['nullable', 'string'],
'商品代號' => ['nullable', 'string'],
'數量' => ['required', 'numeric', 'min:0.01'],
'單位' => ['required', 'string'],
'入庫單價' => ['nullable', 'numeric', 'min:0'],
'儲位/貨道' => ['nullable', 'string', 'max:50'],
'批號' => ['nullable', 'string'],
'效期' => ['nullable', 'date'],
'產地' => ['nullable', 'string', 'max:2'],
];