Merge branch 'zengjun' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/RejectedBillController.php

@@ -101,7 +101,7 @@ class RejectedBillController extends Controller
          * @var RejectedBillService $rejectedBillService
          */
         $rejectedBillService=app(RejectedBillService::class);
-        $rejectedBillService->syncOrderIssue($rejectedBill);
+        $rejectedBillService->joinOrderIssue($rejectedBill);
         $rejectedBillService->updateCheckedStatusByWms($request->input('logistic_number_return'));
 //        $rejectedBill->同步问题件退件状态();
 
@@ -297,7 +297,15 @@ class RejectedBillController extends Controller
     function seekOrder(Request $request)
     {
         if (!$request['logistic_number_return'])return ['success'=>false];
-        $result = app('RejectedBillService')->findOrder($request['logistic_number_return']);
+        /** @var RejectedBillService $service */
+        $service = app('RejectedBillService');
+        $result = $service->findOrderByOrderPackage($request['logistic_number_return']);
+        if($result)return ['success' => true,'data' => $result];
+        $result = $service->findOrderByStoreRejected($request['logistic_number_return']);
+        if($result)return ['success' => true,'data' => $result];
+        $result = $service->findOrderByOrderHeader($request['logistic_number_return']);
+        if($result)return ['success' => true,'data' => $result];
+        $result = $service->findOrderByOrderIssue($request['logistic_number_return']);
         if($result)return ['success' => true,'data' => $result];
         else return ['success'=>false];
     }
@@ -436,18 +444,4 @@ class RejectedBillController extends Controller
         return view('rejected.importRejectedNumber');
     }
 
-    public function findOrderByStoreRejectedApi(Request $request)
-    {
-        if (!$request['logistic_number_return'])return ['success'=>false];
-        /** @var RejectedBillService $service */
-        $service = app('RejectedBillService');
-        $result = $service->findOrderByStoreRejected($request['logistic_number_return']);
-        if($result)return ['success' => true,'data' => $result];
-        $result = $service->findOrderByOrderHeader($request['logistic_number_return']);
-        if($result)return ['success' => true,'data' => $result];
-        $result = $service->findOrderByOrderIssue($request['logistic_number_return']);
-        if($result)return ['success' => true,'data' => $result];
-        return ['success'=>false];
-    }
-
 }

app/Http/Controllers/RejectedBillItemController.php

@@ -95,7 +95,9 @@ class RejectedBillItemController extends Controller
 //        }
 
 
+        /** @var RejectedBill $rejectedBill */
         $rejectedBill = RejectedBill::query()->where('id',$request->input('id_rejected_bill'))->first();
+        $rejectedBill->updateIsNewRejecting();
         $rejectedBill->syncOrderIssue();     // 同步问题件 修改问题件退货状态
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','id'=>$rejectedBillItem['id']];
@@ -119,6 +121,7 @@ class RejectedBillItemController extends Controller
             //$rejectedBillItem->injectCommodityName();  Haozi 2020-12-09
             /** @var RejectedBill $rejectedBill */
             $rejectedBill = RejectedBill::query()->where('id',$rejectedBillItem->id_rejected_bill)->first();
+            $rejectedBill->updateIsNewRejecting();
             $rejectedBill->syncOrderIssue(); // 同步问题件 修改问题件退货状态
             app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return ['success'=>'true','id'=>$rejectedBillItem['id']];
@@ -361,6 +364,9 @@ class RejectedBillItemController extends Controller
         }
         $rejectedBillItem = RejectedBillItem::find($request->input('id'));
         $rejectedBillItem->forceDelete();
+        /** @var RejectedBill $rejectedBill */
+        $rejectedBill = RejectedBill::query()->where('id',$rejectedBillItem->id_rejected_bill)->first();
+        $rejectedBill->syncOrderIssue(); // 同步问题件 修改问题件退货状态
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($rejectedBillItem),Auth::user()['id']);
         return ['success'=>'true','id'=>$request->input('id')];
     }

app/RejectedBill.php

@@ -170,14 +170,17 @@ class RejectedBill extends Model
         return parent::delete(); // TODO: Change the autogenerated stub
     }
 
-    public function syncOrderIssue()
+    public function joinOrderIssue()
     {
-        if(isset($this->orderIssue)){
-            $this->orderIssue->syncRejectingStatus();
+        if(isset($this->orderIssueRejectedBill)){
             return;
         }
         /** @var OrderIssue $orderIssue */
-        $orderIssue = null;
+        $orderIssue = $this->orderIssueRejectedBill->orderIssue ?? null;
+        if($orderIssue){
+            $orderIssue->joinRejectedBill($this->logistic_number_return);
+            return;
+        }
         // 原单退回
         if($this->logistic_number === '原单退回'){
             $orderIssue = OrderIssue::query()->where('order_id',function ($query){
@@ -194,8 +197,20 @@ class RejectedBill extends Model
             })->first();
         }
         if(!$orderIssue)return;
-        if(!OrderIssueRejectedBill::isExit($orderIssue->id,$this->logistic_number_return)) $orderIssue->update(['is_new_rejecting' => '有']);
         $orderIssue->joinRejectedBill($this->logistic_number_return);
-        $orderIssue->syncRejectingStatus();
-     }
+    }
+
+    public function syncOrderIssue()
+    {
+        if(isset($this->orderIssueRejectedBill)){
+            if(isset($this->orderIssueRejectedBill->orderIssue)) $this->orderIssueRejectedBill->orderIssue->syncRejectingStatus();
+            return;
+        }
+    }
+
+    public function updateIsNewRejecting()
+    {
+        $orderIssue = $this->orderIssueRejectedBill->orderIssue ?? null;
+        if($orderIssue) $orderIssue->update(['is_new_rejecting' => '有']);
+    }
 }

app/Services/RejectedBillService.php

@@ -42,6 +42,17 @@ Class RejectedBillService
         return RejectedBill::query()->create($params);
     }
 
+    /**
+     * 连接问题件
+     *
+     * @param RejectedBill $rejectedBill
+     */
+    public function joinOrderIssue($rejectedBill)
+    {
+        $rejectedBill->joinOrderIssue();
+    }
+
+
     /**
      * 同步退回单号
      * @param RejectedBill $rejectedBill

resources/views/rejected/create.blade.php

@@ -143,7 +143,7 @@
                                 <td>
                                     <div class="form-group mb-0">
                                         <label for="logistic_number" class="col-form-label text-right">原单号</label>
-                                        <button class="btn btn-outline-primary btn-sm" @click="seek_order()" style="transform: scale(0.9)">原单退回</button>
+                                        <button class="btn btn-outline-primary btn-sm" @click="billInputting.logistic_number='原单退回'" style="transform: scale(0.9)">原单退回</button>
                                         <input type="text" class="form-control" :class="[errors.logistic_number?'is-invalid':'']"
                                                data-focusOrder="7"
                                                name="logistic_number" id="logistic_number" autocomplete="off"
@@ -469,11 +469,12 @@
                         if(response.data.success==='true'){
                             if(response.data.result==='true'){
                                 tempTip.okWindow('该退回单号"'+number+'"已有录入其他单','知道了')
-                            }else _this.findOrderByStoreRejected(number);
+                            }else _this.seek_order();
                         }
                     }).catch(function (response) {
                         console.log(response);
                     });
+
                 },
                 barcode_goodsChange:function(e){
                     let _this=this;
@@ -988,37 +989,11 @@
                                 tempTip.showSuccess('原单信息已填充');
                                 return;
                             }
-                            if(!response.data.data)_this.clearOrderInfoOrderInfo();
                             tempTip.setDuration(2000);
-                            tempTip.show('请校验退回单号是否复合，复合正确才可提交');
+                            tempTip.show('没有找到对应的数据，可手动填写 ');
                         });
                 },
-                clearOrderInfoOrderInfo(){
-                    this.billInputting.id_owner = null;
-                    this.billInputting.id_logistic_return = null;
-                    this.billInputting.sender = null;
-                    this.billInputting.mobile_sender = null;
-                    this.billInputting.order_number = null;
-                    this.billInputting.logistic_number = null;
-                },
-                findOrderByStoreRejected(logisticNumber){
-                    if(!logisticNumber)return;
-                    let _this = this;
-                    axios.post('{{url('apiLocal/rejectedBill/findOrderByStoreRejected')}}',{logistic_number_return:logisticNumber})
-                        .then(function (response) {
-                            if (response.data.success){
-                                if(response.data.data.owner_id)_this.billInputting.id_owner=response.data.data.owner_id;
-                                if(response.data.data.logistic_id)_this.billInputting.id_logistic_return = response.data.data.logistic_id;
-                                if(response.data.data.consignee_name)_this.billInputting.sender = response.data.data.consignee_name;
-                                if(response.data.data.consignee_phone)_this.billInputting.mobile_sender = response.data.data.consignee_phone;
-                                if(response.data.data.client_code)_this.billInputting.order_number = response.data.data.client_code;
-                                if(response.data.data.logistic_number)_this.billInputting.logistic_number = response.data.data.logistic_number;
-                                tempTip.setDuration(2000);
-                                tempTip.showSuccess('原单信息已填充');
-                                return;
-                            }
-                        });
-                }
+
             },
             filters:{
                 isLoaded:function (value) {

routes/apiLocal.php

@@ -20,7 +20,6 @@ Route::post('rejectedBill/apiSetIsLoadedAll', 'RejectedBillController@apiSetIsLo
 Route::post('rejectedBill/apiConfirmBeStored', 'RejectedBillController@apiConfirmBeStored');
 Route::post('rejectedBill/seekOrder','RejectedBillController@seekOrder');
 Route::post('rejectedBill/importRejectedNumber','RejectedBillController@disposeImportApi');
-Route::post('rejectedBill/findOrderByStoreRejected','RejectedBillController@findOrderByStoreRejectedApi');
 
 Route::post('logistic/numberFeatures/computeLogisticByNumber', 'LogisticNumberFeatureController@apiComputeLogisticByNumber');
 Route::post('logistic/logisticNumberReturnIsUnique', 'RejectedBillController@apiLogisticNumberReturnIsUnique');