fix:material
This commit is contained in:
@@ -25,10 +25,10 @@ class MaterialRequest extends FormRequest
|
|||||||
'limit' => 'required|integer',
|
'limit' => 'required|integer',
|
||||||
'query_name' =>'sometimes|string',
|
'query_name' =>'sometimes|string',
|
||||||
'id' =>'required|integer',
|
'id' =>'required|integer',
|
||||||
'category_id' =>'required|integer|exists:material_category,id',
|
'category_id' =>'integer|exists:material_category,id',
|
||||||
'name' =>'required|string',
|
'name' =>'string',
|
||||||
'standard' =>'string',
|
'standard' =>'string',
|
||||||
'unit' =>'required|string',
|
'unit' =>'string',
|
||||||
'bar_code' =>'string',
|
'bar_code' =>'string',
|
||||||
'city_id' =>'required|integer|exists:system_city,id',
|
'city_id' =>'required|integer|exists:system_city,id',
|
||||||
'kitchen_id' =>'required|integer|exists:kitchen,id',
|
'kitchen_id' =>'required|integer|exists:kitchen,id',
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ class MaterialService extends BaseService{
|
|||||||
$list = $this
|
$list = $this
|
||||||
->MaterialModel
|
->MaterialModel
|
||||||
->where('is_del',MaterialCode::IS_NO_DEL)
|
->where('is_del',MaterialCode::IS_NO_DEL)
|
||||||
->where('status',MaterialCode::ENABLE)
|
// ->where('status',MaterialCode::ENABLE)
|
||||||
->when(!empty($name), function ($query) use ($name) {
|
->when(!empty($name), function ($query) use ($name) {
|
||||||
$query->where('name', 'like', "$name%");
|
$query->where('name', 'like', "$name%");
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user