客服系统 阶段性提交6 [退回单号同步问题] by 'zengjun'

app/Services/OrderService.php

@@ -71,7 +71,6 @@ class OrderService
 
             $order = Order::create($arr);
             // $order = Order::create([]);
-
             $orderPackageService = app('orderPackageService');
             $order->packages = $orderPackageService->createdByOrder($order, $orderHeader);
         } else {
@@ -81,11 +80,11 @@ class OrderService
     }
 
     public function getOrderInfoByLogisticNumberReturn($logisticNumberReturn){
-        $ASNHeader =  OracleDOCASNHeader::where('ASNReference2',$logisticNumberReturn)->first();
+        $ASNHeader =  OracleDOCASNHeader::where('ASNReference3',$logisticNumberReturn)->first();
         if(!$ASNHeader){
             return null;
         }
-        $OrderHeader = OracleDOCOrderHeader::where('SOReference1',$ASNHeader->asnreference3)->first();
+        $OrderHeader = OracleDOCOrderHeader::where('SOReference1',$ASNHeader->asnreference2)->first();
         if(!$OrderHeader){
             return null;
         }

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

@@ -122,7 +122,7 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="wms_order_no" class="col-2 col-form-label text-right ">原始承运商</label>
+                            <label for="wms_order_no" class="col-2 col-form-label text-right text-primary">原始承运商</label>
                             <div class="col-8 row">
                                 <div class="form-group col-lg-5">
                                     <select class="form-control " name="logistic_id" v-model="order.logistic_id">
@@ -494,25 +494,6 @@
                         _this.isSubmit = false;
                     });
                 },
-                emptyOrder: function () {
-                    this.order = {
-                        orderno: '',
-                        logstic_number: '',
-                        address: '',
-                        province: '',
-                        city: '',
-                        district: '',
-                        consignee_name: '',
-                        consignee_phone: '',
-                        carrierid: '',
-                        owner: '',
-                        ownerName: ''
-                    };
-                },
-                emptyOrderInfo: function () {
-                    this.rejectedBill = '';
-                    this.emptyOrder();
-                },
             }
         })