From 5e897e41974a70544202ce5e6570eee0b6f45e25 Mon Sep 17 00:00:00 2001 From: sky121113 Date: Mon, 2 Feb 2026 09:34:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(inventory):=20=E4=BF=AE=E5=BE=A9=E8=AA=BF?= =?UTF-8?q?=E6=92=A5=E5=96=AE=E6=98=8E=E7=B4=B0=E5=BA=AB=E5=AD=98=E9=A1=AF?= =?UTF-8?q?=E7=A4=BA=E8=88=87=E7=B5=B1=E4=B8=80=E9=81=8E=E5=B8=B3=E6=8C=89?= =?UTF-8?q?=E9=88=95=E6=A8=A3=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inventory/Controllers/TransferOrderController.php | 10 +++++++++- resources/js/Pages/Inventory/Transfer/Index.tsx | 2 +- resources/js/Pages/Inventory/Transfer/Show.tsx | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/Modules/Inventory/Controllers/TransferOrderController.php b/app/Modules/Inventory/Controllers/TransferOrderController.php index 8a97f8b..32e0dc3 100644 --- a/app/Modules/Inventory/Controllers/TransferOrderController.php +++ b/app/Modules/Inventory/Controllers/TransferOrderController.php @@ -5,6 +5,7 @@ namespace App\Modules\Inventory\Controllers; use App\Http\Controllers\Controller; 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 Inertia\Inertia; @@ -118,7 +119,13 @@ class TransferOrderController extends Controller '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) { + '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(); + return [ 'id' => (string) $item->id, 'product_id' => (string) $item->product_id, @@ -127,6 +134,7 @@ class TransferOrderController extends Controller 'batch_number' => $item->batch_number, 'unit' => $item->product->baseUnit?->name, 'quantity' => (float) $item->quantity, + 'max_quantity' => $stock ? (float) $stock->quantity : 0.0, 'notes' => $item->notes, ]; }), diff --git a/resources/js/Pages/Inventory/Transfer/Index.tsx b/resources/js/Pages/Inventory/Transfer/Index.tsx index 0343e7c..d023ec2 100644 --- a/resources/js/Pages/Inventory/Transfer/Index.tsx +++ b/resources/js/Pages/Inventory/Transfer/Index.tsx @@ -389,7 +389,7 @@ export default function Index({ warehouses, orders, filters }: any) { 取消 - 確認刪除 + 確認刪除 diff --git a/resources/js/Pages/Inventory/Transfer/Show.tsx b/resources/js/Pages/Inventory/Transfer/Show.tsx index 7f83559..4423655 100644 --- a/resources/js/Pages/Inventory/Transfer/Show.tsx +++ b/resources/js/Pages/Inventory/Transfer/Show.tsx @@ -251,7 +251,7 @@ export default function Show({ order }: any) { 取消 - 確認刪除 + 確認刪除 @@ -287,7 +287,7 @@ export default function Show({ order }: any) { 取消 - 確認過帳 + 確認過帳