Kaynağa Gözat

修改问题件创建

ajun 5 yıl önce
ebeveyn
işleme
4e1a59d3be

+ 5 - 15
app/Http/Controllers/OrderIssueController.php

@@ -310,21 +310,11 @@ class OrderIssueController extends Controller
         if (!$request->filled('logisticNumberReturn')) {
             return ['success' => false, 'fail_info' => '缺少对应的参数或条件'];
         }
-        $logisticNumberReturn = $request->input('logisticNumberReturn');
-        $rejectedBill = RejectedBill::with('items')->where('logistic_number_return', $logisticNumberReturn)->first();
-        if ($rejectedBill) {
-            $orderIssue = OrderIssue::query()->where('rejected_bill_id', $rejectedBill->id)->first();
-
-            if ($orderIssue) {
-                return ['success' => false, 'fail_info' => '该退回单号已有对应的问题件'];
-            } else {
-                $orderService = app('OrderService');
-                $order = $orderService->findOrCreteByLogisticNumberReturn($logisticNumberReturn);
-                return ['success' => true, 'order' => $order, 'rejectedBill' => $rejectedBill];
-            }
-        } else {
-            return ['success' => true, 'meg' => '没有对应的退回单号,不与WMS同步'];
-        }
+        $rejectedBill = RejectedBill::query()->with('items')->where('logistic_number_return', $request['logisticNumberReturn'])->first();
+        if(!$rejectedBill) return ['success' => true, 'message' => '没有对应的退回单号,不与WMS同步'];
+        $exists = OrderIssueRejectedBill::query()->where('logistic_number_return',$request['logisticNumberReturn'])->exists();
+        if($exists)return ['success' => false, 'fail_info' => '该退回单号已有对应的问题件'];
+        return ['success' => true, 'rejectedBill' => $rejectedBill];
     }
 
     public function isExistByOrderNoApi(Request $request){

+ 2 - 6
resources/views/order/issue/create.blade.php

@@ -11,7 +11,6 @@
                     <form action="{{url('order/issue/store')}}" method="post">
                         @csrf`
                         @method('POST')
-                        <input type="hidden" name="rejected_bill_id" :value='rejectedBill.id'>
                         <input type="hidden" name="order_id" :value='order.id'>
                         <input type="hidden" name="second_order_id" :value='second_order_id'>
                         <input type="hidden" name="logistic_number_return" :value='logistic_number_return'>
@@ -374,15 +373,12 @@
                     let data = {logisticNumberReturn: this.logistic_number_return};
                     axios.post("{{url('apiLocal/order/issue/orderIssueHasLogisticNumberReturn')}}", data).then(function (res) {
                         if (res.data.success) {
-                            if (res.data.order) {
-                                _this.order = res.data.order;
-                            }
                             if (res.data.rejectedBill) {
                                 _this.rejectedBill = res.data.rejectedBill;
                             }
-                            if (res.data.meg) {
+                            if (res.data.message) {
                                 tempTip.setDuration(3000);
-                                tempTip.showSuccess(res.data.meg);
+                                tempTip.showSuccess(res.data.message);
                             }
                             _this.isSubmit = true;
                         } else {