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 17:03:22 +08:00
parent 6cd9294db3
commit 4fd5bb66ce
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ class DepotRequest extends FormRequest
'depot_edit' => ['id','name'], 'depot_edit' => ['id','name'],
'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'],
'purchase_list' => ['limit','query_id','query_kitchen_id','type'], 'purchase_list' => ['limit','query_id','query_kitchen_id','type'],
]; ];
} }

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

@@ -190,7 +190,7 @@ class DepotService extends BaseService{
public function purchaseBack():array public function purchaseBack():array
{ {
$id = (int)$this->request->input('id'); $id = (int)$this->request->input('id');
$number = (double)$this->request->input('number'); // $number = (double)$this->request->input('number');
$info = $this->DepotPurchaseModel->getDepotPurchase($id); $info = $this->DepotPurchaseModel->getDepotPurchase($id);
if (!empty($info)){ if (!empty($info)){
$depotPurchase = new DepotPurchase(); $depotPurchase = new DepotPurchase();
@@ -199,15 +199,15 @@ class DepotService extends BaseService{
$depotPurchase->supplier_id = $info->supplier_id; $depotPurchase->supplier_id = $info->supplier_id;
$depotPurchase->type = 2; $depotPurchase->type = 2;
$depotPurchase->purchase_price = $info->purchase_price; $depotPurchase->purchase_price = $info->purchase_price;
if (empty($number)){ // if (empty($number)){
$depotPurchase->number = $info->number; $depotPurchase->number = $info->number;
} // }
else{ // else{
if ($info->number >= $number) // if ($info->number >= $number)
$depotPurchase->number = $number; // $depotPurchase->number = $number;
else // else
throw new ErrException('采购退货数量不能大于进货数量'); // throw new ErrException('采购退货数量不能大于进货数量');
} // }
$depotPurchase->sum_price = $depotPurchase->purchase_price * $depotPurchase->number; $depotPurchase->sum_price = $depotPurchase->purchase_price * $depotPurchase->number;
$depotPurchase->city_id = $info->city_id; $depotPurchase->city_id = $info->city_id;

2
sync/http/admin/auth.http
View File

@@ -394,5 +394,5 @@ POST {{host}}/admin/depot/depot_purchase_back
Content-Type: application/x-www-form-urlencoded Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{admin_token}} Authorization: Bearer {{admin_token}}
id=6&number=2 id=6