Merge branch 'feature/inv' into develop

This commit is contained in:
2026-02-25 15:58:57 +08:00
+14 -8
View File
@@ -528,19 +528,11 @@ Route::group('/admin', function () {
Route::any('/item/destroy', [app\admin\controller\InvItemController::class, 'destroy']); Route::any('/item/destroy', [app\admin\controller\InvItemController::class, 'destroy']);
Route::any('/item/qr-code', [app\admin\controller\InvItemController::class, 'generateQrCode']); Route::any('/item/qr-code', [app\admin\controller\InvItemController::class, 'generateQrCode']);
Route::any('/item/qr-code/delete', [app\admin\controller\InvItemController::class, 'deleteQrCode']); Route::any('/item/qr-code/delete', [app\admin\controller\InvItemController::class, 'deleteQrCode']);
});
// 库存变化记录
Route::group('/stock-log', function () {
Route::any('/list', [app\admin\controller\InvStockLogController::class, 'list']);
});
Route::group('/requisition', function () { Route::group('/requisition', function () {
Route::any('/list', [app\admin\controller\InvRequisitionController::class, 'index']); Route::any('/list', [app\admin\controller\InvRequisitionController::class, 'index']);
Route::any('/show', [app\admin\controller\InvRequisitionController::class, 'show']); Route::any('/show', [app\admin\controller\InvRequisitionController::class, 'show']);
Route::any('/approve', [app\admin\controller\InvRequisitionController::class, 'approve']); Route::any('/approve', [app\admin\controller\InvRequisitionController::class, 'approve']);
Route::any('/proxy-claim', [app\admin\controller\InvRequisitionController::class, 'proxyClaim']);
Route::any('/qr-claims', [app\admin\controller\InvRequisitionController::class, 'qrClaims']);
}); });
// 物品归还 // 物品归还
@@ -552,6 +544,20 @@ Route::group('/admin', function () {
Route::any('/confirm', [app\common\controller\InvRequisitionItemReturnController::class, 'returnConfirm']); Route::any('/confirm', [app\common\controller\InvRequisitionItemReturnController::class, 'returnConfirm']);
// Route::any('/confirmItem', [app\common\controller\InvRequisitionItemReturnController::class, 'returnItemConfirm']); // Route::any('/confirmItem', [app\common\controller\InvRequisitionItemReturnController::class, 'returnItemConfirm']);
}); });
});
// 库存变化记录
Route::group('/stock-log', function () {
Route::any('/list', [app\admin\controller\InvStockLogController::class, 'list']);
});
Route::group('/requisition', function () {
// Route::any('/list', [app\admin\controller\InvRequisitionController::class, 'index']);
// Route::any('/show', [app\admin\controller\InvRequisitionController::class, 'show']);
// Route::any('/approve', [app\admin\controller\InvRequisitionController::class, 'approve']);
Route::any('/proxy-claim', [app\admin\controller\InvRequisitionController::class, 'proxyClaim']);
Route::any('/qr-claims', [app\admin\controller\InvRequisitionController::class, 'qrClaims']);
});
}); });