diff --git a/app/Controller/Admin/MaterialController.php b/app/Controller/Admin/MaterialController.php index 3edb9e0..faa82da 100644 --- a/app/Controller/Admin/MaterialController.php +++ b/app/Controller/Admin/MaterialController.php @@ -66,4 +66,17 @@ class MaterialController return (new MaterialService())->edit(); } + /** + * 材料库存列表 + * @param MaterialRequest $request + * @return array + */ + #[RequestMapping(path: "materialStock_list", methods: "GET")] + #[Scene(scene: "materialStock_list")] + public function materialStockList(MaterialRequest $request): array + { + return (new MaterialService())->materialStockList(); + } + + } diff --git a/app/Request/Admin/MaterialRequest.php b/app/Request/Admin/MaterialRequest.php index b3ef04c..5f8d5e7 100644 --- a/app/Request/Admin/MaterialRequest.php +++ b/app/Request/Admin/MaterialRequest.php @@ -40,5 +40,6 @@ class MaterialRequest extends FormRequest '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'], ]; } diff --git a/app/Service/Admin/Material/MaterialService.php b/app/Service/Admin/Material/MaterialService.php index fc19240..37b1f7a 100644 --- a/app/Service/Admin/Material/MaterialService.php +++ b/app/Service/Admin/Material/MaterialService.php @@ -7,6 +7,7 @@ namespace App\Service\Admin\Material; use App\Constants\Common\MaterialCode; use App\Exception\ErrException; use App\Model\Material; +use App\Model\MaterialStock; use App\Service\Admin\BaseService; use Hyperf\Di\Annotation\Inject; @@ -18,6 +19,9 @@ class MaterialService extends BaseService{ #[Inject] protected Material $MaterialModel; + #[Inject] + protected MaterialStock $MaterialStockModel; + public function handle() { @@ -99,4 +103,31 @@ class MaterialService extends BaseService{ return $this->return->success(); } + + public function materialStockList(): array + { + $limit = (int)$this->request->input('limit', 10); + $name = $this->request->input('query_name'); + $depotId = (int)$this->request->input('query_depotId'); + $supplierId = (int)$this->request->input('query_supplierId'); + $list = $this->MaterialStockModel + ->leftJoin('material', 'material_stock.material_id', '=', 'material.id') + ->leftJoin('supplier', 'material_stock.supplier_id', '=', 'supplier.id') + ->leftJoin('depot', 'material_stock.depot_id', '=', 'depot.id') + ->where('material_stock.is_del',MaterialCode::IS_NO_DEL) + ->when(!empty($name), function ($query) use ($name) { + $query->where('material.name', 'like', "$name%"); + }) + ->when(!empty($depotId), function ($query) use ($depotId) { + $query->where('material_stock.depot_id', $depotId); + }) + ->when(!empty($supplierId), function ($query) use ($supplierId) { + $query->where('material_stock.supplier_id', $supplierId); + }) + ->paginate($limit,['material_stock.*','material.name as material_name','supplier.name as supplier_name','depot.name as depot_name']) + ->toArray(); + + return $this->return->success('success',$list); + } + } \ No newline at end of file diff --git a/app/Service/Admin/System/ChefService.php b/app/Service/Admin/System/ChefService.php index fe975b2..ea873b9 100644 --- a/app/Service/Admin/System/ChefService.php +++ b/app/Service/Admin/System/ChefService.php @@ -53,22 +53,27 @@ class ChefService extends BaseService public function chefDetailList(): array { - $chefId = (int)$this->request->input('chef_id'); + $limit = (int)$this->request->input('limit', 10); + $cityId = (int)$this->request->input('query_city_id'); + $name = $this->request->input('query_chef_name'); $list = $this - ->adminUserModel - ->leftJoin('chef', 'admin_user.id', '=', 'chef.user_id') + ->chefModel + ->leftJoin('admin_user', 'admin_user.id', '=', 'chef.user_id') ->where('admin_user.is_del',UserCode::IS_NO_DEL) ->where('admin_user.status',UserCode::ENABLE) ->where('admin_user.role_id',RoleCode::CHEF) - ->when(!empty($chefId), function ($query) use ($chefId) { - $query->where('admin_user.id', $chefId); + ->when(!empty($cityId), function ($query) use ($cityId) { + $query->where('admin_user.city_id', $cityId); }) - ->get(['admin_user.id','admin_user.avatar','admin_user.chinese_name','chef.profile','chef.specialties']); + ->when(!empty($name), function ($query) use ($name) { + $query->where('admin_user.chinese_name', 'like', "$name%"); + }) + ->paginate($limit,['chef.id','admin_user.avatar','admin_user.chinese_name','chef.profile','chef.specialties'])->toArray(); if (empty($list)) return $this->return->success('success',['list' => []]); - return $this->return->success('success',['list' => $list->toArray()]); + return $this->return->success('success',['list' => $list]); } /** diff --git a/app/Service/Api/Material/MaterialService.php b/app/Service/Api/Material/MaterialService.php index e360e8e..6ee1d5f 100644 --- a/app/Service/Api/Material/MaterialService.php +++ b/app/Service/Api/Material/MaterialService.php @@ -90,7 +90,6 @@ class MaterialService extends BaseService{ if($info->status == MaterialCode::AUDIT_REFUSE){ $info->status = MaterialCode::UN_AUDIT; } - $info->operator_id = $this->userId; if (!$info->save()) throw new ErrException('申请修改失败');