Merge branch 'feature/stock_next' into develop

# Conflicts: # app/admin/controller/SysDictController.php # app/admin/controller/VehColorController.php # app/admin/service/SysDictService.php # app/common/model/SysCurrency.php # app/controller/IndexController.php # config/route.php
2025-09-02 11:55:14 +08:00
parent 935caa24f2 749cbb6908
commit da3e5e2a2d
39 changed files with 2214 additions and 51 deletions
@@ -51,4 +51,28 @@ class SysDictController extends BaseController
         $data['sysDictItem'] = SysDictItem::where('dict_id',$data['id'])->get();
         return $data;
     }
+
+
+    
+    public function listScopeFormat($data)
+    {
+        $rdata = [];
+        foreach ($data as $item) {
+            $rdata[$item['dict_code']] = $item['sysDictItem'];
+        }
+        return $rdata;
+    }
+
+    public function listScope(Request $request)
+    {
+        try {
+            $raw = $this->service->serviceListAllScope($request);
+            $data = $this->transformData($raw, method_exists($this, 'listScopeFormat')
+                                    ? [$this, 'listScopeFormat']
+                                    : null);
+            return $this->success($data);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
 }