hehele/hyperf_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:material

Browse Source
This commit is contained in:
LAPTOP-7SGDREK0\shiweijun
2025-02-12 09:46:41 +08:00
parent c96ecc2594
commit 4250db59b8
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Request/Admin/MaterialRequest.php
View File

@@ -40,6 +40,6 @@ class MaterialRequest extends FormRequest
'material_add' => ['category_id', 'name', 'standard', 'unit', 'bar_code', 'city_id', 'kitchen_id'], 'material_add' => ['category_id', 'name', 'standard', 'unit', 'bar_code', 'city_id', 'kitchen_id'],
'material_edit' => ['id','category_id', 'name', 'standard', 'unit', 'bar_code','status'], 'material_edit' => ['id','category_id', 'name', 'standard', 'unit', 'bar_code','status'],
'material_delete' => ['id'], 'material_delete' => ['id'],
'materialStock_list' => ['limit','query_name','query_depotId','query_supplierId','query_kitchenId'], 'materialStock_list' => ['limit','query_name','query_materialId','query_depotId','query_supplierId','query_kitchenId'],
]; ];
} }

8
app/Request/Api/MaterialRequest.php
View File

@@ -24,13 +24,15 @@ class MaterialRequest extends FormRequest
return [ return [
'limit' => 'required|integer', 'limit' => 'required|integer',
'query_name' =>'sometimes|string', 'query_name' =>'sometimes|string',
'city_id' => 'sometimes|integer|exists:system_city,id', 'query_kitchen_id' =>'sometimes|integer|exists:kitchen,id',
'kitchen_id' => 'sometimes|integer|exists:kitchen,id', 'city_id' => 'required|integer|exists:system_city,id',
'kitchen_id' => 'required|integer|exists:kitchen,id',
'id' => 'required|integer|exists:material_application,id',
]; ];
} }
protected array $scenes = [ protected array $scenes = [
'material_list' => ['limit','query_name'], 'material_list' => ['limit','query_name','query_kitchen_id'],
'material_application' => ['material_id','dish_id','number','processing','city_id','kitchen_id'], 'material_application' => ['material_id','dish_id','number','processing','city_id','kitchen_id'],
'application_edit' => ['id','number','processing'], 'application_edit' => ['id','number','processing'],
'application_delete' => ['id'], 'application_delete' => ['id'],

4
app/Service/Admin/Material/MaterialService.php
View File

@@ -112,6 +112,7 @@ class MaterialService extends BaseService{
{ {
$limit = (int)$this->request->input('limit', 10); $limit = (int)$this->request->input('limit', 10);
$name = $this->request->input('query_name'); $name = $this->request->input('query_name');
$materialId = $this->request->input('query_materialId');
$depotId = (int)$this->request->input('query_depotId'); $depotId = (int)$this->request->input('query_depotId');
$supplierId = (int)$this->request->input('query_supplierId'); $supplierId = (int)$this->request->input('query_supplierId');
$kitchenId = (int)$this->request->input('query_kitchenId'); $kitchenId = (int)$this->request->input('query_kitchenId');
@@ -123,6 +124,9 @@ class MaterialService extends BaseService{
->when(!empty($name), function ($query) use ($name) { ->when(!empty($name), function ($query) use ($name) {
$query->where('material.name', 'like', "$name%"); $query->where('material.name', 'like', "$name%");
}) })
->when(!empty($materialId), function ($query) use ($materialId) {
$query->where('material_stock.material_id', $materialId);
})
->when(!empty($depotId), function ($query) use ($depotId) { ->when(!empty($depotId), function ($query) use ($depotId) {
$query->where('material_stock.depot_id', $depotId); $query->where('material_stock.depot_id', $depotId);
}) })

4
app/Service/Api/Material/MaterialService.php
View File

@@ -31,6 +31,7 @@ class MaterialService extends BaseService{
{ {
$limit = (int)$this->request->input('limit', 10); $limit = (int)$this->request->input('limit', 10);
$name = $this->request->input('query_name'); $name = $this->request->input('query_name');
$kitchenId = $this->request->input('query_kitchen_id');
$list = $this $list = $this
->MaterialModel ->MaterialModel
@@ -39,6 +40,9 @@ class MaterialService extends BaseService{
->when(!empty($name), function ($query) use ($name) { ->when(!empty($name), function ($query) use ($name) {
$query->where('name', 'like', "$name%"); $query->where('name', 'like', "$name%");
}) })
->when(!empty($kitchenId), function ($query) use ($kitchenId) {
$query->where('kitchen_id', $kitchenId);
})
->paginate($limit)->toArray(); ->paginate($limit)->toArray();
return $this->return->success('success',$list); return $this->return->success('success',$list);