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

feat: 統一庫存管理分頁 UI 與寬度規範，並更新 SKILL 規範文件

Browse Source
This commit is contained in:
sky121113
2026-02-03 17:24:34 +08:00
parent 15aaa039e4
commit bd999c7bb6
17 changed files with 357 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Modules/Core/Controllers/RoleController.php
View File

@@ -123,7 +123,7 @@ class RoleController extends Controller
$role->syncPermissions($validated['permissions']);
}
return redirect()->route('roles.index')->with('success', '角色更新成功');
return back()->with('success', '角色更新成功');
}
/**
@@ -160,8 +160,13 @@ class RoleController extends Controller
$action = $parts[1] ?? '';
// 特定權限遷移邏輯
if ($permission->name === 'inventory.transfer') {
$group = 'warehouses'; // 調撥功能移至倉庫管理下
if ($permission->name === 'inventory.view_cost') {
$group = 'inventory';
}
// 移除不再使用的權限選項
if (in_array($permission->name, ['inventory.count', 'inventory.transfer'])) {
continue;
}
if (!isset($grouped[$group])) {
@@ -175,7 +180,10 @@ class RoleController extends Controller
$groupDefinitions = [
'products' => '商品資料管理',
'warehouses' => '倉庫管理',
'inventory' => '庫存管理',
'inventory' => '庫存資料管理',
'inventory_count' => '庫存盤點管理',
'inventory_adjust' => '庫存盤調管理',
'inventory_transfer' => '庫存調撥管理',
'vendors' => '廠商資料管理',
'purchase_orders' => '採購單管理',
'goods_receipts' => '進貨單管理',

2
app/Modules/Inventory/Controllers/AdjustDocController.php
View File

@@ -39,7 +39,7 @@ class AdjustDocController extends Controller
$query->where('warehouse_id', $request->warehouse_id);
}
$perPage = $request->input('per_page', 15);
$perPage = $request->input('per_page', 10);
$docs = $query->orderByDesc('created_at')
->paginate($perPage)
->withQueryString()

2
app/Modules/Inventory/Controllers/CountDocController.php
View File

@@ -37,7 +37,7 @@ class CountDocController extends Controller
$perPage = $request->input('per_page', 10);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = 15;
$perPage = 10;
}
$countQuery = function ($query) {

6
app/Modules/Inventory/Controllers/TransferOrderController.php
View File

@@ -32,8 +32,10 @@ class TransferOrderController extends Controller
});
}
$perPage = $request->input('per_page', 10);
$orders = $query->orderByDesc('created_at')
->paginate(15)
->paginate($perPage)
->withQueryString()
->through(function ($order) {
return [
'id' => (string) $order->id,
@@ -50,7 +52,7 @@ class TransferOrderController extends Controller
return Inertia::render('Inventory/Transfer/Index', [
'orders' => $orders,
'warehouses' => Warehouse::all()->map(fn($w) => ['id' => (string)$w->id, 'name' => $w->name]),
'filters' => $request->only(['warehouse_id']),
'filters' => $request->only(['warehouse_id', 'per_page']),
]);
}

9
app/Modules/Inventory/Controllers/WarehouseController.php
View File

@@ -24,6 +24,11 @@ class WarehouseController extends Controller
});
}
$perPage = $request->input('per_page', 10);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = 10;
}
$warehouses = $query->withSum('inventories as book_stock', 'quantity') // 帳面庫存 = 所有庫存總和
->withSum(['inventories as available_stock' => function ($query) {
// 可用庫存 = 庫存 > 0 且 品質正常 且 (未過期 或 無效期) 且 倉庫類型不為瑕疵倉
@@ -44,7 +49,7 @@ class WarehouseController extends Controller
->whereRaw('(SELECT COALESCE(SUM(quantity), 0) FROM inventories WHERE warehouse_id = ss.warehouse_id AND product_id = ss.product_id) < ss.safety_stock');
}])
->orderBy('created_at', 'desc')
->paginate(10)
->paginate($perPage)
->withQueryString();
// 移除原本對 is_sellable 的手動修正邏輯，現在由 type 自動過濾
@@ -67,7 +72,7 @@ class WarehouseController extends Controller
return Inertia::render('Warehouse/Index', [
'warehouses' => $warehouses,
'totals' => $totals,
'filters' => $request->only(['search']),
'filters' => $request->only(['search', 'per_page']),
]);
}

49
app/Modules/Inventory/Routes/web.php
View File

@@ -22,10 +22,10 @@ Route::middleware('auth')->group(function () {
});
// 單位管理 - 需要商品權限
Route::middleware('permission:products.create|products.edit')->group(function () {
Route::post('/units', [UnitController::class, 'store'])->name('units.store');
Route::put('/units/{unit}', [UnitController::class, 'update'])->name('units.update');
Route::delete('/units/{unit}', [UnitController::class, 'destroy'])->name('units.destroy');
Route::middleware('permission:products.view')->group(function () {
Route::post('/units', [UnitController::class, 'store'])->middleware('permission:products.create')->name('units.store');
Route::put('/units/{unit}', [UnitController::class, 'update'])->middleware('permission:products.edit')->name('units.update');
Route::delete('/units/{unit}', [UnitController::class, 'destroy'])->middleware('permission:products.delete')->name('units.destroy');
});
// 商品管理
@@ -75,37 +75,34 @@ Route::middleware('auth')->group(function () {
});
// 庫存盤點 (Stock Counting) - Global
Route::middleware('permission:inventory.view')->group(function () {
Route::get('/inventory/count-docs', [CountDocController::class, 'index'])->name('inventory.count.index');
Route::get('/inventory/count-docs/{doc}', [CountDocController::class, 'show'])->name('inventory.count.show');
Route::middleware('permission:inventory.adjust')->group(function () {
Route::post('/inventory/count-docs', [CountDocController::class, 'store'])->name('inventory.count.store');
Route::put('/inventory/count-docs/{doc}', [CountDocController::class, 'update'])->name('inventory.count.update');
Route::delete('/inventory/count-docs/{doc}', [CountDocController::class, 'destroy'])->name('inventory.count.destroy');
Route::put('/inventory/count-docs/{doc}/reopen', [CountDocController::class, 'reopen'])->name('inventory.count.reopen');
});
Route::get('/inventory/count-docs/{doc}/print', [CountDocController::class, 'print'])->name('inventory.count.print');
Route::middleware('permission:inventory_count.view')->group(function () {
Route::get('/inventory/count-docs', [CountDocController::class, 'index'])->name('inventory.count.index');
Route::get('/inventory/count-docs/{doc}', [CountDocController::class, 'show'])->name('inventory.count.show');
Route::get('/inventory/count-docs/{doc}/print', [CountDocController::class, 'print'])->name('inventory.count.print');
});
Route::post('/inventory/count-docs', [CountDocController::class, 'store'])->middleware('permission:inventory_count.create')->name('inventory.count.store');
Route::put('/inventory/count-docs/{doc}', [CountDocController::class, 'update'])->middleware('permission:inventory_count.edit')->name('inventory.count.update');
Route::delete('/inventory/count-docs/{doc}', [CountDocController::class, 'destroy'])->middleware('permission:inventory_count.delete')->name('inventory.count.destroy');
Route::put('/inventory/count-docs/{doc}/reopen', [CountDocController::class, 'reopen'])->middleware('permission:inventory_count.edit')->name('inventory.count.reopen');
// 庫存盤調 (Stock Adjustment) - Global
Route::middleware('permission:inventory.adjust')->group(function () {
Route::get('/inventory/adjust-docs', [AdjustDocController::class, 'index'])->name('inventory.adjust.index');
Route::get('/inventory/adjust-docs/get-pending-counts', [AdjustDocController::class, 'getPendingCounts'])->name('inventory.adjust.pending-counts');
Route::get('/inventory/adjust-docs/{doc}', [AdjustDocController::class, 'show'])->name('inventory.adjust.show');
Route::post('/inventory/adjust-docs', [AdjustDocController::class, 'store'])->name('inventory.adjust.store');
Route::put('/inventory/adjust-docs/{doc}', [AdjustDocController::class, 'update'])->name('inventory.adjust.update');
Route::delete('/inventory/adjust-docs/{doc}', [AdjustDocController::class, 'destroy'])->name('inventory.adjust.destroy');
Route::middleware('permission:inventory_adjust.view')->group(function () {
Route::get('/inventory/adjust-docs', [AdjustDocController::class, 'index'])->name('inventory.adjust.index');
Route::get('/inventory/adjust-docs/get-pending-counts', [AdjustDocController::class, 'getPendingCounts'])->name('inventory.adjust.pending-counts');
Route::get('/inventory/adjust-docs/{doc}', [AdjustDocController::class, 'show'])->name('inventory.adjust.show');
});
Route::post('/inventory/adjust-docs', [AdjustDocController::class, 'store'])->middleware('permission:inventory_adjust.create')->name('inventory.adjust.store');
Route::put('/inventory/adjust-docs/{doc}', [AdjustDocController::class, 'update'])->middleware('permission:inventory_adjust.edit')->name('inventory.adjust.update');
Route::delete('/inventory/adjust-docs/{doc}', [AdjustDocController::class, 'destroy'])->middleware('permission:inventory_adjust.delete')->name('inventory.adjust.destroy');
// 撥補單/調撥單 (Transfer Order) - Global
Route::middleware('permission:inventory.transfer')->group(function () {
Route::middleware('permission:inventory_transfer.view')->group(function () {
Route::get('/inventory/transfer-orders', [TransferOrderController::class, 'index'])->name('inventory.transfer.index');
Route::get('/inventory/transfer-orders/{order}', [TransferOrderController::class, 'show'])->name('inventory.transfer.show');
Route::post('/inventory/transfer-orders', [TransferOrderController::class, 'store'])->name('inventory.transfer.store');
Route::put('/inventory/transfer-orders/{order}', [TransferOrderController::class, 'update'])->name('inventory.transfer.update');
Route::delete('/inventory/transfer-orders/{order}', [TransferOrderController::class, 'destroy'])->name('inventory.transfer.destroy');
});
Route::post('/inventory/transfer-orders', [TransferOrderController::class, 'store'])->middleware('permission:inventory_transfer.create')->name('inventory.transfer.store');
Route::put('/inventory/transfer-orders/{order}', [TransferOrderController::class, 'update'])->middleware('permission:inventory_transfer.edit')->name('inventory.transfer.update');
Route::delete('/inventory/transfer-orders/{order}', [TransferOrderController::class, 'destroy'])->middleware('permission:inventory_transfer.delete')->name('inventory.transfer.destroy');
Route::get('/api/warehouses/{warehouse}/inventories', [TransferOrderController::class, 'getWarehouseInventories'])
->middleware('permission:inventory.view')
->name('api.warehouses.inventories');