|
|
@@ -70,7 +70,7 @@ class RejectController
|
|
|
|
|
|
/**
|
|
|
* @api {post} /reject/delete 删除退货登记
|
|
|
- * @apiName save
|
|
|
+ * @apiName delete
|
|
|
* @apiGroup reject
|
|
|
*
|
|
|
*
|
|
|
@@ -95,12 +95,47 @@ class RejectController
|
|
|
return response()->json($response);
|
|
|
}
|
|
|
$rejectBill=RejectedBill::query()->where("logistic_number_return",$logistic_number_return)->first();
|
|
|
- RejectedBillItem::query()->where('id_rejected_bill',$rejectBill->id)->delete();
|
|
|
- $rejectBill->delete();
|
|
|
+ if ($rejectBill){
|
|
|
+ RejectedBillItem::query()->where('id_rejected_bill',$rejectBill->id)->delete();
|
|
|
+ $rejectBill->delete();
|
|
|
+ }
|
|
|
$response["message"] = "退件信息删除成功";
|
|
|
$response["code"] = 200;
|
|
|
return response()->json($response);
|
|
|
}
|
|
|
+ /**
|
|
|
+ * @api {post} /rejectBillItem/delete 删除退货登记
|
|
|
+ * @apiName rejectBillItemDelete
|
|
|
+ * @apiGroup reject
|
|
|
+ *
|
|
|
+ *
|
|
|
+ * @apiSuccess {string} message 响应描述
|
|
|
+ * @apiSuccess {int} status_code HTTP响应码
|
|
|
+ * @apiSuccess {bool} data 结果
|
|
|
+ *
|
|
|
+ * @apiSuccessExample {json} Success-Response:
|
|
|
+ * HTTP/1.1 200 OK
|
|
|
+ * {
|
|
|
+ * "message": "请求成功",
|
|
|
+ * "status_code": "200"
|
|
|
+ * "data":true
|
|
|
+ * }
|
|
|
+ *
|
|
|
+ */
|
|
|
+ public function rejectBillItemDelete(Request $request){
|
|
|
+ $data=$request->all();
|
|
|
+ if (!$data['logistic_number_return']){
|
|
|
+ $response["message"] = "请求失败,未携带退回单号";
|
|
|
+ $response["code"] = 410;
|
|
|
+ return response()->json($response);
|
|
|
+ }
|
|
|
+ $rejectBill_id=RejectedBill::query()->where("logistic_number_return",$data['logistic_number_return'])->first()['id'];
|
|
|
+ RejectedBillItem::query()->where('id_rejected_bill',$rejectBill_id)
|
|
|
+ ->where('barcode_goods',$data['barcode_goods'])->delete();
|
|
|
+ $response["message"] = "退件明细信息删除成功";
|
|
|
+ $response["code"] = 200;
|
|
|
+ return response()->json($response);
|
|
|
+ }
|
|
|
|
|
|
private function saveRejectBillItem($data,$rejectBill){
|
|
|
foreach ($data['rejectItems'] as $item){
|