From d231f343d3eafb823e9478b5169ee8bf9a548fd9 Mon Sep 17 00:00:00 2001
From: "LAPTOP-7SGDREK0\\shiweijun" <411582373@qq.com>
Date: Wed, 22 Jan 2025 17:15:50 +0800
Subject: [PATCH] fix:depot materialCategory

---
 app/Controller/Admin/DepotController.php            | 13 +++++++++++++
 app/Request/Admin/DepotRequest.php                  |  3 ++-
 app/Request/Admin/MaterialCategoryRequest.php       |  2 +-
 app/Service/Admin/Depot/DepotService.php            |  6 ++++--
 .../Admin/Material/MaterialCategoryService.php      |  3 ---
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/Controller/Admin/DepotController.php b/app/Controller/Admin/DepotController.php
index 34b414a..69bfd3e 100644
--- a/app/Controller/Admin/DepotController.php
+++ b/app/Controller/Admin/DepotController.php
@@ -66,4 +66,17 @@ class DepotController
     {
         return (new DepotService)->delete();
     }
+
+    /**
+     * 采购入库
+     * @param DepotRequest $request
+     * @return array
+     * @throws Exception
+     */
+    #[RequestMapping(path: "depot_purchase", methods: "POST")]
+    #[Scene(scene: "purchase")]
+    public function purchase(DepotRequest $request): array
+    {
+        return (new DepotService)->purchase();
+    }
 }
diff --git a/app/Request/Admin/DepotRequest.php b/app/Request/Admin/DepotRequest.php
index 2561503..a4b5212 100644
--- a/app/Request/Admin/DepotRequest.php
+++ b/app/Request/Admin/DepotRequest.php
@@ -35,7 +35,8 @@ class DepotRequest extends FormRequest
     protected array $scenes = [
         'depot_list' => ['limit','query_id','query_kitchen_id'],
         'depot_add' => ['name','city_id','kitchen_id'],
-        'depot_edit' => ['id','name','city_id','kitchen_id'],
+        'depot_edit' => ['id','name'],
         'depot_delete' => ['id'],
+        'purchase' => ['depot_id','material_id','supplier_id','type','purchase_price','number','city_id','kitchen_id'],
     ];
 }
diff --git a/app/Request/Admin/MaterialCategoryRequest.php b/app/Request/Admin/MaterialCategoryRequest.php
index f4d441a..6fa0414 100644
--- a/app/Request/Admin/MaterialCategoryRequest.php
+++ b/app/Request/Admin/MaterialCategoryRequest.php
@@ -35,7 +35,7 @@ class MaterialCategoryRequest extends FormRequest
     protected array $scenes = [
         'material_category_info' => ['query_id'],
         'add' => ['name', 'parent_id', 'city_id', 'kitchen_id'],
-        'edit' => ['id','name', 'parent_id', 'city_id', 'kitchen_id'],
+        'edit' => ['id','name', 'parent_id'],
         'delete' => ['id'],
     ];
 }
diff --git a/app/Service/Admin/Depot/DepotService.php b/app/Service/Admin/Depot/DepotService.php
index 533e924..fef279f 100644
--- a/app/Service/Admin/Depot/DepotService.php
+++ b/app/Service/Admin/Depot/DepotService.php
@@ -7,6 +7,7 @@ namespace App\Service\Admin\Depot;
 use App\Constants\Admin\DepotCode;
 use App\Exception\ErrException;
 use App\Model\Depot;
+use App\Model\DepotPurchase;
 use App\Service\Admin\BaseService;
 use Hyperf\Di\Annotation\Inject;
 
@@ -18,6 +19,9 @@ class DepotService extends BaseService{
     #[Inject]
     protected Depot $DepotModel;
 
+    #[Inject]
+    protected DepotPurchase $DepotPurchaseModel;
+
     public function handle()
     {
 
@@ -85,8 +89,6 @@ class DepotService extends BaseService{
         }
 
         $info->name = $depotName;
-        $info->city_id = (int)$this->request->input('city_id');
-        $info->kitchen_id = $kitchen_id;
 
         if (!$info->save()) throw new ErrException('仓库修改失败');
 
diff --git a/app/Service/Admin/Material/MaterialCategoryService.php b/app/Service/Admin/Material/MaterialCategoryService.php
index 09271f3..c64ebb4 100644
--- a/app/Service/Admin/Material/MaterialCategoryService.php
+++ b/app/Service/Admin/Material/MaterialCategoryService.php
@@ -67,9 +67,6 @@ class MaterialCategoryService extends BaseService{
 
         $info->parent_id = $pid;
 
-        $info->city_id = (int)$this->request->input('city_id');
-        $info->kitchen_id = (int)$this->request->input('kitchen_id');
-
         if (!$info->save()) throw new ErrException('修改失败');
 
         return $this->return->success();