diff --git a/app/Request/Admin/MaterialRequest.php b/app/Request/Admin/MaterialRequest.php index 5f8d5e7..8a19766 100644 --- a/app/Request/Admin/MaterialRequest.php +++ b/app/Request/Admin/MaterialRequest.php @@ -36,10 +36,10 @@ class MaterialRequest extends FormRequest } protected array $scenes = [ - 'material_list' => ['limit','query_name'], + 'material_list' => ['limit','query_name','query_kitchenId'], '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_delete' => ['id'], - 'materialStock_list' => ['limit','query_name','query_depotId','query_supplierId'], + 'materialStock_list' => ['limit','query_name','query_depotId','query_supplierId','query_kitchenId'], ]; } diff --git a/app/Request/Api/MaterialRequest.php b/app/Request/Api/MaterialRequest.php index 93cc127..cdff404 100644 --- a/app/Request/Api/MaterialRequest.php +++ b/app/Request/Api/MaterialRequest.php @@ -24,6 +24,8 @@ class MaterialRequest extends FormRequest return [ 'limit' => 'required|integer', 'query_name' =>'sometimes|string', + 'city_id' => 'sometimes|integer|exists:system_city,id', + 'kitchen_id' => 'sometimes|integer|exists:kitchen,id', ]; } diff --git a/app/Service/Admin/Material/MaterialService.php b/app/Service/Admin/Material/MaterialService.php index 37b1f7a..80bf21a 100644 --- a/app/Service/Admin/Material/MaterialService.php +++ b/app/Service/Admin/Material/MaterialService.php @@ -31,6 +31,7 @@ class MaterialService extends BaseService{ { $limit = (int)$this->request->input('limit', 10); $name = $this->request->input('query_name'); + $kitchenId = $this->request->input('query_kitchen_id'); $list = $this ->MaterialModel @@ -39,6 +40,9 @@ class MaterialService extends BaseService{ ->when(!empty($name), function ($query) use ($name) { $query->where('name', 'like', "$name%"); }) + ->when(!empty($kitchenId), function ($query) use ($kitchenId) { + $query->where('kitchen_id', $kitchenId); + }) ->paginate($limit)->toArray(); return $this->return->success('success',$list); @@ -110,6 +114,7 @@ class MaterialService extends BaseService{ $name = $this->request->input('query_name'); $depotId = (int)$this->request->input('query_depotId'); $supplierId = (int)$this->request->input('query_supplierId'); + $kitchenId = (int)$this->request->input('query_kitchenId'); $list = $this->MaterialStockModel ->leftJoin('material', 'material_stock.material_id', '=', 'material.id') ->leftJoin('supplier', 'material_stock.supplier_id', '=', 'supplier.id') @@ -124,6 +129,9 @@ class MaterialService extends BaseService{ ->when(!empty($supplierId), function ($query) use ($supplierId) { $query->where('material_stock.supplier_id', $supplierId); }) + ->when(!empty($kitchenId), function ($query) use ($kitchenId) { + $query->where('material.kitchen_id', $kitchenId); + }) ->paginate($limit,['material_stock.*','material.name as material_name','supplier.name as supplier_name','depot.name as depot_name']) ->toArray(); diff --git a/sync/http/admin/auth.http b/sync/http/admin/auth.http index b3214a3..642e931 100644 --- a/sync/http/admin/auth.http +++ b/sync/http/admin/auth.http @@ -348,6 +348,11 @@ Authorization: Bearer {{admin_token}} id=1&category_id=2&name=冻猪肉&standard=2斤/包&unit=包&bar_code=1003&status=1 +### 材料库存列表 +GET {{host}}/admin/material/materialStock_list?limit=10 +content-type: application/json +Authorization: Bearer {{admin_token}} + ### 供应商列表 GET {{host}}/admin/supplier/list?limit=10 content-type: application/json