mama/star-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 倉庫業務屬性、庫存成本追蹤與採購單功能更新
All checks were successful
Koori-ERP-Deploy-System / deploy-demo (push) Successful in 58s
Details
Koori-ERP-Deploy-System / deploy-production (push) Has been skipped
Details

Browse Source 
1. 倉庫管理：新增業務類型 (Owned/External/Customer) 與車牌資訊與司機欄位。
2. 庫存管理：實作成本追蹤 (unit_cost, total_value)，更新列表與撥補單顯示。
3. 採購單：新增採購日期 (order_date)，調整欄位名稱與順序。
4. 前端優化：更新相關 TS Type 定義與 UI 顯示。
This commit is contained in:
sky121113
2026-01-26 17:27:34 +08:00
parent 106de4e945
commit ac6a81b3d2
24 changed files with 429 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Modules/Procurement/Controllers/PurchaseOrderController.php
View File

@@ -89,6 +89,7 @@ class PurchaseOrderController extends Controller
'poNumber' => $order->code,
'supplierId' => (string) $order->vendor_id,
'supplierName' => $order->vendor?->name ?? 'Unknown',
'orderDate' => $order->order_date?->format('Y-m-d'), // 新增
'expectedDate' => $order->expected_delivery_date?->toISOString(),
'status' => $order->status,
'totalAmount' => (float) $order->total_amount,
@@ -169,6 +170,7 @@ class PurchaseOrderController extends Controller
$validated = $request->validate([
'vendor_id' => 'required|exists:vendors,id',
'warehouse_id' => 'required|exists:warehouses,id',
'order_date' => 'required|date', // 新增驗證
'expected_delivery_date' => 'nullable|date',
'remark' => 'nullable|string',
'invoice_number' => ['nullable', 'string', 'max:11', 'regex:/^[A-Z]{2}-\d{8}$/'],
@@ -230,6 +232,7 @@ class PurchaseOrderController extends Controller
'warehouse_id' => $validated['warehouse_id'],
'user_id' => $userId,
'status' => 'draft',
'order_date' => $validated['order_date'], // 新增
'expected_delivery_date' => $validated['expected_delivery_date'],
'total_amount' => $totalAmount,
'tax_amount' => $taxAmount,
@@ -299,6 +302,7 @@ class PurchaseOrderController extends Controller
'poNumber' => $order->code,
'supplierId' => (string) $order->vendor_id,
'supplierName' => $order->vendor?->name ?? 'Unknown',
'orderDate' => $order->order_date?->format('Y-m-d'), // 新增
'expectedDate' => $order->expected_delivery_date?->toISOString(),
'status' => $order->status,
'items' => $formattedItems,
@@ -395,6 +399,7 @@ class PurchaseOrderController extends Controller
'poNumber' => $order->code,
'supplierId' => (string) $order->vendor_id,
'warehouse_id' => (int) $order->warehouse_id,
'orderDate' => $order->order_date?->format('Y-m-d'), // 新增
'expectedDate' => $order->expected_delivery_date?->format('Y-m-d'),
'status' => $order->status,
'items' => $formattedItems,
@@ -419,6 +424,7 @@ class PurchaseOrderController extends Controller
$validated = $request->validate([
'vendor_id' => 'required|exists:vendors,id',
'warehouse_id' => 'required|exists:warehouses,id',
'order_date' => 'required|date', // 新增驗證
'expected_delivery_date' => 'nullable|date',
'remark' => 'nullable|string',
'status' => 'required|string|in:draft,pending,processing,shipping,confirming,completed,cancelled',
@@ -452,6 +458,7 @@ class PurchaseOrderController extends Controller
$order->fill([
'vendor_id' => $validated['vendor_id'],
'warehouse_id' => $validated['warehouse_id'],
'order_date' => $validated['order_date'], // 新增
'expected_delivery_date' => $validated['expected_delivery_date'],
'total_amount' => $totalAmount,
'tax_amount' => $taxAmount,