临时提交

app/Http/Controllers/TestController.php

@@ -516,11 +516,11 @@ class TestController extends Controller
         //$orderTrackingService->trackingWmsOrder($startDate);
         $owners = app(OrderTrackingOwnerService::class)->getTrackingOrderOwner();
         $startDate = \Illuminate\Support\Carbon::parse('2020-09-25 00:00:00')->toDateTimeString();
-//        $endData = \Illuminate\Support\Carbon::parse('2020-09-26 00:00:00')->toDateTimeString();
+        $endData = \Illuminate\Support\Carbon::parse('2020-09-26 00:00:00')->toDateTimeString();
         $orderHeaders = OracleDOCOrderHeader::query()
             ->with(['oracleDOCOrderDetails', 'actAllocationDetails','oracleBASCode'])
             ->where('addTime','>=',$startDate)
-//            ->where('addTime','<=',$endData)
+            ->where('addTime','<=',$endData)
             ->whereIn('customerID',data_get($owners,'*.code'))
             ->get();
 //        $orderHeaders = app(OracleDOCOrderHeaderService::class)->getWmsOrderOnStartDateCreate($startData);
@@ -638,19 +638,22 @@ class TestController extends Controller
 //        $batchUpdateService->batchUpdate('order_trackings',$fillables);
 //    }
 
-//    public function updateOrderTrackingLogistic(){
-//        $orderTrackings = OrderTracking::query()->with('commodities.package.order')->get();
-//        $order_nos = data_get($orderTrackings,'*.commodities.package.order.code');
-//        $order_nos =  array_unique($order_nos);
-//        $orders = Order::query()->whereIn('code',$order_nos)->get();
-//        $XJWL_logistic =Logistic::query()->where('code','XJWL')->first();
-//        foreach ($orders as $order) {
-//            $orderHeader = OracleDOCOrderHeader::query()->where('OrderNo',$order->code)->first();
-//            $logistic =Logistic::query()->where('code',$orderHeader->userdefine1)->first();
-//            if($orderHeader->userdefine1 == 'ZT'){$logistic =   $XJWL_logistic;}
-//            $order->update(['logistic_id'=>$logistic->id]);
-//        }
-//    }
+    public function updateOrderTrackingLogistic(){
+        $orderTrackings = OrderTracking::query()->with('commodities.package.order')->get();
+        $order_nos = data_get($orderTrackings,'*.commodities.package.order.code');
+        $order_nos =  array_unique($order_nos);
+        $orders = Order::query()->whereIn('code',$order_nos)->get();
+        foreach ($orders as $order) {
+            $orderHeader = OracleDOCOrderHeader::query()->where('OrderNo',$order->code)->first();
+            $logistic =Logistic::query()->where('code',$orderHeader->userdefine1)->first();
+            if($order->logistic_id == 61)continue;
+            if($order->logistic_id !== $logistic->id){
+                Order::query()->where('id',$order->id)->update(['logistic_id'=>$logistic->id]);
+                dd($order->logistic_id,$logistic->id,$order);
+            }
+        }
+    }
+
     public function updateOrderTracking(){
         $orderTrackings = OrderTracking::query()->with('commodities.package.order')->get();
         foreach ($orderTrackings as $orderTracking) {
@@ -664,4 +667,6 @@ class TestController extends Controller
         }
     }
 
+
+
 }

app/Services/OrderService.php

@@ -4,6 +4,7 @@ namespace App\Services;
 
 use App\Logistic;
 use App\OracleActAllocationDetails;
+use App\OracleBasCustomer;
 use App\OracleDOCASNHeader;
 use App\OracleDOCOrderHeader;
 use App\Order;
@@ -336,13 +337,14 @@ class OrderService
                 $shop = Shop::query()->firstOrCreate(['name' => $shop_name, 'owner_id' => $owner_id]);
                 $shop_Id = $shop['id'];
             }
-            $logistics = Logistic::query()->where(['code' => $orderHeadAttr['carrierid']])->first();
+            $logistics = Logistic::query()->where(['code' => $orderHeadAttr['userdefine1']])->first();
             $logistics_id = null;
             if ($logistics) {
                 $logistics_id = $logistics['id'];
             } else {
                 try {
-                    $logistics = Logistic::query()->create(['name' => $orderHeadAttr['carriername'], 'code' => $orderHeadAttr['carrierid']]);
+
+                    $logistics = Logistic::query()->create(['name' => $orderHeadAttr['carriername'], 'code' => $orderHeadAttr['userdefine1']]);
                     $logistics_id = $logistics['id'];
                     LogService::log(__METHOD__,__FUNCTION__,'创建承运商'.json_encode($logistics));
                 } catch (\Exception $e) {
@@ -771,9 +773,8 @@ class OrderService
             /** @var ShopService */
             $shop = app('shopService')->firstOrCreate(['name' => $shop_name, 'owner_id' => $owner->id]);
         }
-
-        $logistics = app('logisticService')->firstOrCreate(['code' => $orderHeader->carrierid],
-            ['code' => $orderHeader->carrierid, 'name' => $orderHeader->carriername]);
+        $logistics = app('logisticService')->firstOrCreate(['code' => $orderHeader->userdefine1],
+            ['code' => $orderHeader->userdefine1, 'name' => $orderHeader->carriername]);
         return Order::query()->create([
             'code' => $orderHeader->orderno,
             'owner_id' => $owner ? $owner->id : null,

resources/js/queryForm/queryForm.js

@@ -33,6 +33,17 @@ const query = function getQueryForm(data) {
             for (const key in _data) {
                 let map = _data[key];
                 if (["string", "number"].includes(fetchJsType(map.value)) && map.value !== '') {
+                    // console.log(map.value);
+                    // if(map.value){
+                    //     let string = new String(map.value);
+                    //     if(string.length > 1 ){
+                    //         // console.log(string);
+                    //         string = string.replace(/\+/g,',');
+                    //         map.value = string
+                    //         console.log(string);
+                    //     }
+                    // }
+                    // console.log(map.value);
                     form.append("<input name='" + key + "' value='" + map.value + "'>")
                 } else if ('array' === fetchJsType(map.value)) {
                     let string = map.value.join(',');
@@ -49,6 +60,7 @@ const query = function getQueryForm(data) {
             }
             _hidden_div.html('');
             _hidden_div.append(form);
+            // console.log(form);
             form.submit();
         }
 
@@ -1131,13 +1143,14 @@ const query = function getQueryForm(data) {
     function rendererSearchFormOn_data() {
         for (let key in _data) {
             let value = _data[key].value, type = _data[key].type, mold = _data[key].mold;
-            if(value){
-                let string = new String(value);
-                if(string.length > 1 ){
-                    string = string.replace('+',' ');
-                    value = string
-                }
-            }
+            // if(value){
+            //     let string = new String(value);
+            //     if(string.length > 1 ){
+            //         console.log(string);
+            //         string = string.replace(/\+/g,' ');
+            //         value = string
+            //     }
+            // }
             _data[key].select = value;
 
             if (['input', 'dateTime'].includes(mold)) {

resources/views/order/tracking/index.blade.php

@@ -119,9 +119,9 @@
                         <td class="td-yellow">@{{ trackOrder.sku.sku }}</td>
                         <td class="td-yellow" style="min-width: 120px">@{{ trackOrder.sku.skuName }}</td>
                         <td class="td-yellow">@{{ trackOrder.sku.skuAmount }}</td>
-                        <td class="td-yellow">
+                        <td class="td-yellow " data-toggle="tooltip" >
                             @can('订单管理-跟踪-仓库编辑')
-                                <input class="form-control form-control-sm" :value="trackOrder.order_remark" @change="warehouseUpdate($event,'order_remark',trackOrder)" >
+                                <input class="form-control form-control-sm" :value="trackOrder.order_remark" @change="warehouseUpdate($event,'order_remark',trackOrder)" data-toggle="tooltip" data-placement="bottom" :title="trackOrder.order_remark">
                             @else
                                 @{{ trackOrder.order_remark }}
                             @endcan
@@ -180,7 +180,7 @@
                         </td>
                         <td class="td-calm">
                             @can('订单管理-跟踪-物流公司编辑')
-                                <input class="form-control form-control-sm" @change="logisticUpdate($event,'remark',trackOrder)" :value="trackOrder.remark">
+                                <input class="form-control form-control-sm" @change="logisticUpdate($event,'remark',trackOrder)" :value="trackOrder.remark" data-toggle="tooltip" data-placement="bottom" :title="trackOrder.remark">
                             @else
                                 @{{ trackOrder.remark }}
                             @endcan
@@ -251,6 +251,7 @@
                 isArrival: ['是','否'],
             },
             mounted:function(){
+
                 let selectDate = [
                     {name:'31',value:'近一月'},
                     {name:'92',value:'近三月'},
@@ -261,6 +262,7 @@
 
                 $('.tooltipTarget').tooltip({'trigger': 'hover'});
                 $("#list").removeClass('d-none');
+                $('[data-toggle="tooltip"]').tooltip({'trigger': 'hover'})
                 let _this = this;
                 let data = [
                     [