From e0532a539ff7b4cbc436de5888b1f4715b7249de Mon Sep 17 00:00:00 2001 From: sky121113 Date: Tue, 23 Jun 2026 17:23:02 +0800 Subject: [PATCH] =?UTF-8?q?[FEAT]=20=E5=94=AE=E5=AE=8C=E5=8D=B3=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E8=B2=A8=E9=81=93=E6=95=88=E6=9C=9F=E8=88=87=E6=89=B9?= =?UTF-8?q?=E8=99=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. recordDispense 扣庫存後,若 stock 歸 0 則一併清空 expiry_date 與 batch_no,避免舊批效期殘留:日後僅補 stock 未改效期時,update_inventory 不會把過期日下發、誤將新批貨鎖成「暫不販售」,與機台端「賣完清效期」對稱 2. 新增 ExpiryClearOnSelloutMysqlTest 驗證售完清效期行為 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../Transaction/TransactionService.php | 11 ++ .../ExpiryClearOnSelloutMysqlTest.php | 101 ++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 tests/Feature/Transaction/ExpiryClearOnSelloutMysqlTest.php diff --git a/app/Services/Transaction/TransactionService.php b/app/Services/Transaction/TransactionService.php index f96e78f..4354430 100644 --- a/app/Services/Transaction/TransactionService.php +++ b/app/Services/Transaction/TransactionService.php @@ -305,6 +305,17 @@ class TransactionService if ($slot) { $slot->decrement('stock'); + // 售完(庫存歸 0)即清空效期與批號,避免舊批貨效期殘留。 + // 場景:日後管理員只補 stock 未改 expiry_date 時,update_inventory 才不會 + // 把過期日一起下發、把新批貨誤鎖成「暫不販售」。與機台端「賣完清效期」對稱。 + // 純加法:僅在仍有殘留值時才寫,不影響既有扣庫存行為。 + if ($slot->stock <= 0 && ($slot->expiry_date !== null || $slot->batch_no !== null)) { + $slot->update([ + 'expiry_date' => null, + 'batch_no' => null, + ]); + } + $type = \App\Models\Machine\MachineStockMovement::TYPE_SALE; $this->machineService->recordStockMovement( diff --git a/tests/Feature/Transaction/ExpiryClearOnSelloutMysqlTest.php b/tests/Feature/Transaction/ExpiryClearOnSelloutMysqlTest.php new file mode 100644 index 0000000..1bfe5dd --- /dev/null +++ b/tests/Feature/Transaction/ExpiryClearOnSelloutMysqlTest.php @@ -0,0 +1,101 @@ +getDriverName() !== 'mysql') { + $this->markTestSkipped('需 MySQL:machine_stock_movements.type enum 為 MySQL-only DDL。'); + } + + $this->company = Company::create(['name' => 'Test Company']); + $this->service = app(TransactionService::class); + } + + private function dispense(string $serial, string $slotNo): array + { + return [ + 'serial_no' => $serial, + 'slot_no' => $slotNo, + 'product_id' => 101, + 'amount' => 50, + 'dispense_status' => 1, + ]; + } + + /** 庫存賣到 0 → 效期與批號被清空。 */ + public function test_clears_expiry_and_batch_when_stock_hits_zero(): void + { + $serial = '1234567890'; + $machine = Machine::factory()->create([ + 'company_id' => $this->company->id, + 'serial_no' => $serial, + ]); + $slot = $machine->slots()->create([ + 'slot_no' => '1', + 'stock' => 1, + 'max_stock' => 10, + 'expiry_date' => '2030-12-31', + 'batch_no' => 'B-001', + ]); + + $this->service->recordDispense($this->dispense($serial, '1')); + + $fresh = $slot->fresh(); + $this->assertEquals(0, $fresh->stock, '庫存應扣為 0'); + $this->assertNull($fresh->expiry_date, '售完應清空效期'); + $this->assertNull($fresh->batch_no, '售完應清空批號'); + } + + /** 庫存尚未歸 0 → 效期與批號保留(同批貨還在販售)。 */ + public function test_keeps_expiry_when_stock_remains(): void + { + $serial = '1234567891'; + $machine = Machine::factory()->create([ + 'company_id' => $this->company->id, + 'serial_no' => $serial, + ]); + $slot = $machine->slots()->create([ + 'slot_no' => '2', + 'stock' => 5, + 'max_stock' => 10, + 'expiry_date' => '2030-12-31', + 'batch_no' => 'B-001', + ]); + + $this->service->recordDispense($this->dispense($serial, '2')); + + $fresh = $slot->fresh(); + $this->assertEquals(4, $fresh->stock, '庫存應扣為 4'); + $this->assertEquals('2030-12-31', $fresh->expiry_date->format('Y-m-d'), '未售完應保留效期'); + $this->assertEquals('B-001', $fresh->batch_no, '未售完應保留批號'); + } +}