问题件创建

app/Http/Controllers/OrderIssueController.php

@@ -9,6 +9,7 @@ use App\OracleDOCOrderHeader;
 use App\Order;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
+use App\OrderIssueRejectedBill;
 use App\OrderIssueType;
 use App\Owner;
 use App\QualityLabel;
@@ -67,16 +68,19 @@ class OrderIssueController extends Controller
         if (!Gate::allows('订单管理-订单问题件生成')) {
             return redirect(url('/'));
         }
-        /** @var OrderIssueService $orderIssueService */
+        /**
+         * @var OrderIssueService $orderIssueService
+         * @var OrderIssue $orderIssue
+         */
         $orderIssueService = app('OrderIssueService');
         $orderIssueService->validatorCreate($request)->validate();
-        $orderIssue = null;
-        if ($request->filled('logistic_number_return')) {
-            $orderIssue = $orderIssueService->createByLogisticNumber($request->all());
-        } else {
-            $orderIssue = $orderIssueService->create($request->all());
+        $orderIssue = $orderIssueService->create($request->all());
+        if($request->has('logistic_number_return') && !OrderIssueRejectedBill::isExit($orderIssue->id,$request['logistic_number_return'])){
+            $orderIssue->joinRejectedBill($request['logistic_number_return']);
         }
-        OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '创建订单问题件', 'type' => '创建']);
+        $orderIssue->loadMissing('orderIssueRejectedBills');
+        $orderIssue->syncRejectingStatus();
+        OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => $request['content'], 'type' => '创建']);
         return redirect('order/issue/index');
     }
 

resources/views/order/issue/create.blade.php

@@ -13,10 +13,11 @@
                         @method('POST')
                         <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'>
                         <div class="form-group row">
                             <label for="logistic_number_return" class="col-2 col-form-label text-right ">退回运单号</label>
                             <div class="col-8 ">
-                                <input type="text" name="logistic_number_return" id="logistic_number_return" class="form-control col-lg-5 @error('logistic_number_return') is-invalid @enderror"
+                                <input type="text" name="logistic_number_return_" id="logistic_number_return" class="form-control col-lg-5 @error('logistic_number_return') is-invalid @enderror"
                                        v-model="logistic_number_return"
                                        value="@if(old('logistic_number_return')){{old('logistic_number_return')}}@endif"
                                        @blur="checkLogisticNumberReturn">
@@ -210,12 +211,17 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="" class="col-2 col-form-label text-right ">处理结果</label>
+                            <label for="" class="col-2 col-form-label text-right ">情况说明</label>
                             <div class="col-8">
                                 <textarea name="result_explain" class="form-control"></textarea>
                             </div>
                         </div>
-
+                        <div class="form-group row">
+                            <label for="" class="col-2 col-form-label text-right ">处理结果</label>
+                            <div class="col-8">
+                                <textarea name="content" class="form-control"></textarea>
+                            </div>
+                        </div>
                         <div class="form-group row">
                             <label for="logistic_indemnity_money"
                                    class="col-2 col-form-label text-right ">承运商赔偿金额</label>