From 94aa0656ed838dc47ee320efbbf52bb8c1091600 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Wed, 16 Nov 2022 15:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=AE=97=E7=89=A9=E8=B5=84=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/MaterielController.php                 | 6 ++++--
 app/Http/Requestes/MaterielStoreRequest.php                 | 2 ++
 app/Http/Requestes/MaterielUpdateRequest.php                | 2 ++
 app/Http/Resources/MaterielResource.php                     | 1 +
 app/Models/Materiel.php                                     | 1 +
 .../migrations/2022_11_02_104745_create_materiels_table.php | 1 +
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/MaterielController.php b/app/Http/Controllers/MaterielController.php
index d68e38c..05f1243 100644
--- a/app/Http/Controllers/MaterielController.php
+++ b/app/Http/Controllers/MaterielController.php
@@ -2,15 +2,15 @@
 
 namespace App\Http\Controllers;
 
+use App\Enums\OperationType;
 use App\Http\Requestes\MaterielStoreRequest;
 use App\Http\Requestes\MaterielUpdateRequest;
 use App\Http\Resources\MaterielResource;
 use App\Models\Materiel;
+use App\Services\OperationLogService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use App\Services\OperationLogService;
-use App\Enums\OperationType;
 
 class MaterielController extends Controller
 {
@@ -50,6 +50,7 @@ class MaterielController extends Controller
                 'quarter',
                 'lowest_price',
                 'highest_price',
+                'unit',
             ])
         );
         $materiel->created_by = $user->id;
@@ -84,6 +85,7 @@ class MaterielController extends Controller
             'quarter',
             'lowest_price',
             'highest_price',
+            'unit',
         ] as $key) {
             if ($request->filled($key)) {
                 $materiel->{$key} = $request->input($key);
diff --git a/app/Http/Requestes/MaterielStoreRequest.php b/app/Http/Requestes/MaterielStoreRequest.php
index 7ed20f8..0964a6f 100644
--- a/app/Http/Requestes/MaterielStoreRequest.php
+++ b/app/Http/Requestes/MaterielStoreRequest.php
@@ -23,6 +23,7 @@ class MaterielStoreRequest extends FormRequest
             'type' => ['required', new Enum(MaterielType::class)],
             'lowest_price' => ['required', 'int'],
             'highest_price' => ['required', 'int', 'gte:lowest_price'],
+            'unit' => ['required', 'string'],
         ];
     }
 
@@ -35,6 +36,7 @@ class MaterielStoreRequest extends FormRequest
             'type' => '类型',
             'lowest_price' => '最低价',
             'highest_price' => '最高价',
+            'unit' => '单位',
         ];
     }
 }
diff --git a/app/Http/Requestes/MaterielUpdateRequest.php b/app/Http/Requestes/MaterielUpdateRequest.php
index 33f845d..342c893 100644
--- a/app/Http/Requestes/MaterielUpdateRequest.php
+++ b/app/Http/Requestes/MaterielUpdateRequest.php
@@ -23,6 +23,7 @@ class MaterielUpdateRequest extends FormRequest
             'type' => ['filled', new Enum(MaterielType::class)],
             'lowest_price' => ['filled', 'int'],
             'highest_price' => ['filled', 'int', 'gte:lowest_price'],
+            'unit' => ['filled', 'string'],
         ];
     }
 
@@ -35,6 +36,7 @@ class MaterielUpdateRequest extends FormRequest
             'type' => '类型',
             'lowest_price' => '最低价',
             'highest_price' => '最高价',
+            'unit' => '单位',
         ];
     }
 }
diff --git a/app/Http/Resources/MaterielResource.php b/app/Http/Resources/MaterielResource.php
index c524611..b5b95b6 100644
--- a/app/Http/Resources/MaterielResource.php
+++ b/app/Http/Resources/MaterielResource.php
@@ -22,6 +22,7 @@ class MaterielResource extends JsonResource
             'quarter' => $this->quarter,
             'lowest_price' => $this->lowest_price,
             'highest_price' => $this->highest_price,
+            'unit' => $this->unit,
             'created_by' => AdminUserResource::make($this->whenLoaded('createdBy')),
             'updated_by' => AdminUserResource::make($this->whenLoaded('updatedBy')),
             'created_at' => $this->created_at->unix(),
diff --git a/app/Models/Materiel.php b/app/Models/Materiel.php
index 0f34ede..305dcaf 100644
--- a/app/Models/Materiel.php
+++ b/app/Models/Materiel.php
@@ -22,6 +22,7 @@ class Materiel extends Model
         'quarter',
         'lowest_price',
         'highest_price',
+        'unit',
         'created_by',
         'updated_by',
     ];
diff --git a/database/migrations/2022_11_02_104745_create_materiels_table.php b/database/migrations/2022_11_02_104745_create_materiels_table.php
index 01720e1..5f41542 100644
--- a/database/migrations/2022_11_02_104745_create_materiels_table.php
+++ b/database/migrations/2022_11_02_104745_create_materiels_table.php
@@ -21,6 +21,7 @@ return new class extends Migration
             $table->tinyInteger('quarter')->comment('季度');
             $table->unsignedBigInteger('lowest_price')->comment('最低价格');
             $table->unsignedBigInteger('highest_price')->comment('最低价格');
+            $table->string('unit')->comment('单位');
             $table->unsignedBigInteger('created_by')->comment('创建人ID');
             $table->unsignedBigInteger('updated_by')->comment('修改人ID');
             $table->timestamps();