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) { 取消 - 確認過帳 + 確認過帳