refactor(modular): 完成第二階段儀表板解耦與模型清理
This commit is contained in:
@@ -24,4 +24,11 @@ interface ProcurementServiceInterface
|
||||
* @return Collection
|
||||
*/
|
||||
public function getPurchaseOrdersByIds(array $ids, array $with = []): Collection;
|
||||
|
||||
/**
|
||||
* Get statistics for the dashboard.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getDashboardStats(): array;
|
||||
}
|
||||
|
||||
@@ -215,15 +215,7 @@ class PurchaseOrderController extends Controller
|
||||
// 確保有一個有效的使用者 ID
|
||||
$userId = auth()->id();
|
||||
if (!$userId) {
|
||||
$user = \App\Modules\Core\Models\User::first();
|
||||
if (!$user) {
|
||||
$user = \App\Modules\Core\Models\User::create([
|
||||
'name' => '系統管理員',
|
||||
'email' => 'admin@example.com',
|
||||
'password' => bcrypt('password'),
|
||||
]);
|
||||
}
|
||||
$userId = $user->id;
|
||||
$user = $this->coreService->ensureSystemUserExists(); $userId = $user->id;
|
||||
}
|
||||
|
||||
$order = PurchaseOrder::create([
|
||||
|
||||
@@ -78,8 +78,34 @@ class VendorController extends Controller
|
||||
*/
|
||||
public function show(Vendor $vendor): Response
|
||||
{
|
||||
$vendor->load(['products.baseUnit', 'products.largeUnit']);
|
||||
// $vendor->load(['products.baseUnit', 'products.largeUnit']); // REMOVED: Cross-module relation
|
||||
|
||||
// 1. 獲取關聯的 Product IDs 與 Pivot Data
|
||||
$pivots = \Illuminate\Support\Facades\DB::table('product_vendor')
|
||||
->where('vendor_id', $vendor->id)
|
||||
->get();
|
||||
|
||||
$productIds = $pivots->pluck('product_id')->toArray();
|
||||
|
||||
// 2. 透過 Service 獲取 Products
|
||||
$products = $this->inventoryService->getProductsByIds($productIds)->keyBy('id');
|
||||
|
||||
$supplyProducts = $pivots->map(function ($pivot) use ($products) {
|
||||
$product = $products->get($pivot->product_id);
|
||||
if (!$product) return null;
|
||||
|
||||
return (object) [
|
||||
'id' => (string) $pivot->id,
|
||||
'productId' => (string) $product->id,
|
||||
'productName' => $product->name,
|
||||
'unit' => $product->baseUnit?->name ?? 'N/A',
|
||||
'baseUnit' => $product->baseUnit?->name,
|
||||
'largeUnit' => $product->largeUnit?->name,
|
||||
'conversionRate' => (float) $product->conversion_rate,
|
||||
'lastPrice' => (float) $pivot->last_price,
|
||||
];
|
||||
})->filter()->values();
|
||||
|
||||
$formattedVendor = (object) [
|
||||
'id' => (string) $vendor->id,
|
||||
'code' => $vendor->code,
|
||||
@@ -93,16 +119,7 @@ class VendorController extends Controller
|
||||
'email' => $vendor->email,
|
||||
'address' => $vendor->address,
|
||||
'remark' => $vendor->remark,
|
||||
'supplyProducts' => $vendor->products->map(fn($p) => (object) [
|
||||
'id' => (string) $p->pivot->id,
|
||||
'productId' => (string) $p->id,
|
||||
'productName' => $p->name,
|
||||
'unit' => $p->baseUnit?->name ?? 'N/A',
|
||||
'baseUnit' => $p->baseUnit?->name,
|
||||
'largeUnit' => $p->largeUnit?->name,
|
||||
'conversionRate' => (float) $p->conversion_rate,
|
||||
'lastPrice' => (float) $p->pivot->last_price,
|
||||
]),
|
||||
'supplyProducts' => $supplyProducts,
|
||||
];
|
||||
|
||||
return Inertia::render('Vendor/Show', [
|
||||
|
||||
@@ -4,7 +4,7 @@ namespace App\Modules\Procurement\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Modules\Inventory\Models\Product;
|
||||
|
||||
|
||||
class PurchaseOrderItem extends Model
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Spatie\Activitylog\Traits\LogsActivity;
|
||||
use Spatie\Activitylog\LogOptions;
|
||||
use App\Modules\Inventory\Models\Product;
|
||||
|
||||
|
||||
class Vendor extends Model
|
||||
{
|
||||
|
||||
@@ -20,4 +20,13 @@ class ProcurementService implements ProcurementServiceInterface
|
||||
{
|
||||
return PurchaseOrder::whereIn('id', $ids)->with($with)->get();
|
||||
}
|
||||
|
||||
public function getDashboardStats(): array
|
||||
{
|
||||
return [
|
||||
'vendorsCount' => \App\Modules\Procurement\Models\Vendor::count(),
|
||||
'purchaseOrdersCount' => PurchaseOrder::count(),
|
||||
'pendingOrdersCount' => PurchaseOrder::where('status', 'pending')->count(),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user