Merge branch 'feature/inv' into develop

# Conflicts: # composer.lock # config/route.php
2026-01-04 16:29:36 +08:00
parent fd4fa0fbf3 ca757e67dd
commit 615e9745a0
49 changed files with 5982 additions and 1966 deletions
@@ -516,6 +516,15 @@ Route::group('/admin', function () {
            Route::any('/destroy', [app\admin\controller\UserDashboardRuleController::class, 'destroy']);
        });
    });
+
+    // 物品领用
+    Route::group('/inv', function () {
+        Route::any('/item/list', [app\admin\controller\InvItemController::class, 'index']);
+        Route::any('/item/store', [app\admin\controller\InvItemController::class, 'store']);
+        Route::any('/item/update', [app\admin\controller\InvItemController::class, 'update']);
+        Route::any('/item/show', [app\admin\controller\InvItemController::class, 'show']);
+        Route::any('/item/destroy', [app\admin\controller\InvItemController::class, 'destroy']);
+    });
 });


@@ -635,4 +644,18 @@ Route::group('/crm', function () {
        Route::any('/update', [app\common\controller\VehModificationController::class, 'update']);
        Route::any('/destroy', [app\common\controller\VehModificationController::class, 'destroy']);
    });
+});
+
+
+
+// 移动端
+Route::group('/mobile', function () {
+    // 物品领用
+    Route::group('/inv', function () {
+        Route::any('/requisition/apply', [app\mobile\controller\InvRequisitionController::class, 'apply']);
+        Route::any('/requisition/update', [app\mobile\controller\InvRequisitionController::class, 'update']);
+        Route::any('/requisition/item/return', [app\mobile\controller\InvRequisitionItemReturnController::class, 'store']);
+        Route::any('/requisition/item/return/update', [app\mobile\controller\InvRequisitionItemReturnController::class, 'update']);
+        Route::any('/requisition/item/return/confirm', [app\mobile\controller\InvRequisitionItemReturnController::class, 'returnConfirm']);
+    });
 });