Revert "问题件录入修改"

This reverts commit 0a252bf1

app/Http/Controllers/OrderIssueController.php

@@ -9,12 +9,10 @@ use App\OracleDOCOrderHeader;
 use App\Order;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
-use App\OrderIssueRejectedBill;
 use App\OrderIssueType;
 use App\Owner;
 use App\QualityLabel;
 use App\RejectedBill;
-use App\RejectedBillItem;
 use App\Services\common\ExportService;
 use App\Services\OrderIssueProcessLogService;
 use App\Services\OrderIssueService;
@@ -69,19 +67,21 @@ class OrderIssueController extends Controller
         if (!Gate::allows('订单管理-订单问题件生成')) {
             return redirect(url('/'));
         }
-        /**
-         * @var OrderIssueService $orderIssueService
-         * @var OrderIssue $orderIssue
-         */
+        /** @var OrderIssueService $orderIssueService */
         $orderIssueService = app('OrderIssueService');
         $orderIssueService->validatorCreate($request)->validate();
-        $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']);
+        /** @var OrderIssue $orderIssue */
+        $orderIssue = null;
+        if ($request->filled('logistic_number_return')) {
+            $orderIssue = $orderIssueService->createByLogisticNumber($request->all());
+        } else {
+            $orderIssue = $orderIssueService->create($request->all());
         }
-        $orderIssue->loadMissing('orderIssueRejectedBills');
-        $orderIssue->syncRejectingStatus();
-        OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => $request['content'], 'type' => '创建']);
+        if($request->has('logistic_number_return'))
+            $orderIssue->joinRejectedBill($request['logistic_number_return']);
+        OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '创建订单问题件', 'type' => '创建']);
+        if($request->has('content'))
+            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

@@ -14,11 +14,10 @@
                         <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'>
                         <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">