diff --git a/app/Request/Admin/DepotRequest.php b/app/Request/Admin/DepotRequest.php index 703d217..6a64519 100644 --- a/app/Request/Admin/DepotRequest.php +++ b/app/Request/Admin/DepotRequest.php @@ -38,7 +38,7 @@ class DepotRequest extends FormRequest 'depot_edit' => ['id','name'], 'depot_delete' => ['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'], ]; } diff --git a/app/Service/Admin/Depot/DepotService.php b/app/Service/Admin/Depot/DepotService.php index 000eb68..9165d76 100644 --- a/app/Service/Admin/Depot/DepotService.php +++ b/app/Service/Admin/Depot/DepotService.php @@ -190,7 +190,7 @@ class DepotService extends BaseService{ public function purchaseBack():array { $id = (int)$this->request->input('id'); - $number = (double)$this->request->input('number'); +// $number = (double)$this->request->input('number'); $info = $this->DepotPurchaseModel->getDepotPurchase($id); if (!empty($info)){ $depotPurchase = new DepotPurchase(); @@ -199,15 +199,15 @@ class DepotService extends BaseService{ $depotPurchase->supplier_id = $info->supplier_id; $depotPurchase->type = 2; $depotPurchase->purchase_price = $info->purchase_price; - if (empty($number)){ +// if (empty($number)){ $depotPurchase->number = $info->number; - } - else{ - if ($info->number >= $number) - $depotPurchase->number = $number; - else - throw new ErrException('采购退货数量不能大于进货数量'); - } +// } +// else{ +// if ($info->number >= $number) +// $depotPurchase->number = $number; +// else +// throw new ErrException('采购退货数量不能大于进货数量'); +// } $depotPurchase->sum_price = $depotPurchase->purchase_price * $depotPurchase->number; $depotPurchase->city_id = $info->city_id; diff --git a/sync/http/admin/auth.http b/sync/http/admin/auth.http index b760d82..1b2bb05 100644 --- a/sync/http/admin/auth.http +++ b/sync/http/admin/auth.http @@ -394,5 +394,5 @@ POST {{host}}/admin/depot/depot_purchase_back Content-Type: application/x-www-form-urlencoded Authorization: Bearer {{admin_token}} -id=6&number=2 +id=6