From 6cd9294db31d7cfe5c724a5d75e5305d9ff10b78 Mon Sep 17 00:00:00 2001 From: "LAPTOP-7SGDREK0\\shiweijun" <411582373@qq.com> Date: Wed, 5 Feb 2025 16:40:55 +0800 Subject: [PATCH] fix:depotPurchase --- app/Request/Admin/DepotRequest.php | 2 +- app/Service/Admin/Depot/DepotService.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Request/Admin/DepotRequest.php b/app/Request/Admin/DepotRequest.php index 869188e..703d217 100644 --- a/app/Request/Admin/DepotRequest.php +++ b/app/Request/Admin/DepotRequest.php @@ -39,6 +39,6 @@ class DepotRequest extends FormRequest 'depot_delete' => ['id'], 'purchase' => ['depot_id','material_id','supplier_id','purchase_price','number','city_id','kitchen_id'], 'purchase_back' => ['id','number'], - 'purchase_list' => ['limit','query_id','query_kitchen_id'], + 'purchase_list' => ['limit','query_id','query_kitchen_id','type'], ]; } diff --git a/app/Service/Admin/Depot/DepotService.php b/app/Service/Admin/Depot/DepotService.php index c97a230..000eb68 100644 --- a/app/Service/Admin/Depot/DepotService.php +++ b/app/Service/Admin/Depot/DepotService.php @@ -236,6 +236,7 @@ class DepotService extends BaseService{ { $limit = (int)$this->request->input('limit', 10); $id = (int)$this->request->input('query_id'); + $type = (int)$this->request->input('type'); $kitchenId = (int)$this->request->input('query_kitchen_id'); $list = $this->DepotPurchaseModel @@ -246,6 +247,9 @@ class DepotService extends BaseService{ ->when($id,function ($query) use ($id) { $query->where('depot_purchase.id',$id); }) + ->when(!empty($type), function ($query) use ($type) { + $query->where('type', $type); + }) ->when($kitchenId,function ($query) use ($kitchenId) { $query->where('depot_purchase.kitchen_id',$kitchenId); })