diff --git a/app/Request/Admin/MaterialRequest.php b/app/Request/Admin/MaterialRequest.php index 75d284c..e81dcf2 100644 --- a/app/Request/Admin/MaterialRequest.php +++ b/app/Request/Admin/MaterialRequest.php @@ -25,10 +25,10 @@ class MaterialRequest extends FormRequest 'limit' => 'required|integer', 'query_name' =>'sometimes|string', 'id' =>'required|integer', - 'category_id' =>'required|integer|exists:material_category,id', - 'name' =>'required|string', + 'category_id' =>'integer|exists:material_category,id', + 'name' =>'string', 'standard' =>'string', - 'unit' =>'required|string', + 'unit' =>'string', 'bar_code' =>'string', 'city_id' =>'required|integer|exists:system_city,id', 'kitchen_id' =>'required|integer|exists:kitchen,id', diff --git a/app/Service/Admin/Material/MaterialService.php b/app/Service/Admin/Material/MaterialService.php index 4e2ecba..62564b9 100644 --- a/app/Service/Admin/Material/MaterialService.php +++ b/app/Service/Admin/Material/MaterialService.php @@ -31,7 +31,7 @@ class MaterialService extends BaseService{ $list = $this ->MaterialModel ->where('is_del',MaterialCode::IS_NO_DEL) - ->where('status',MaterialCode::ENABLE) +// ->where('status',MaterialCode::ENABLE) ->when(!empty($name), function ($query) use ($name) { $query->where('name', 'like', "$name%"); })