hehele/hyperf_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:depotPurchase

Browse Source
This commit is contained in:
LAPTOP-7SGDREK0\shiweijun
2025-02-05 16:40:55 +08:00
parent 3f7d8f5cad
commit 6cd9294db3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Request/Admin/DepotRequest.php
View File

@@ -39,6 +39,6 @@ class DepotRequest extends FormRequest
'depot_delete' => ['id'], 'depot_delete' => ['id'],
'purchase' => ['depot_id','material_id','supplier_id','purchase_price','number','city_id','kitchen_id'], 'purchase' => ['depot_id','material_id','supplier_id','purchase_price','number','city_id','kitchen_id'],
'purchase_back' => ['id','number'], 'purchase_back' => ['id','number'],
'purchase_list' => ['limit','query_id','query_kitchen_id'], 'purchase_list' => ['limit','query_id','query_kitchen_id','type'],
]; ];
} }

4
app/Service/Admin/Depot/DepotService.php
View File

@@ -236,6 +236,7 @@ class DepotService extends BaseService{
{ {
$limit = (int)$this->request->input('limit', 10); $limit = (int)$this->request->input('limit', 10);
$id = (int)$this->request->input('query_id'); $id = (int)$this->request->input('query_id');
$type = (int)$this->request->input('type');
$kitchenId = (int)$this->request->input('query_kitchen_id'); $kitchenId = (int)$this->request->input('query_kitchen_id');
$list = $this->DepotPurchaseModel $list = $this->DepotPurchaseModel
@@ -246,6 +247,9 @@ class DepotService extends BaseService{
->when($id,function ($query) use ($id) { ->when($id,function ($query) use ($id) {
$query->where('depot_purchase.id',$id); $query->where('depot_purchase.id',$id);
}) })
->when(!empty($type), function ($query) use ($type) {
$query->where('type', $type);
})
->when($kitchenId,function ($query) use ($kitchenId) { ->when($kitchenId,function ($query) use ($kitchenId) {
$query->where('depot_purchase.kitchen_id',$kitchenId); $query->where('depot_purchase.kitchen_id',$kitchenId);
}) })