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

app/Http/Controllers/TestController.php

@@ -1374,13 +1374,15 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
 
     public function orderTrackingUpdate()
     {
-        $start_at = '2021-01-01 00:00:00';
+        $start_at = '2021-01-08 00:00:00';
+        $end_at = '2021-01-12 00:00:00';
         // 修改【安桥，锐活】 订单号
         $orderHeaderService = new OracleDOCOrderHeaderService();
         $orderTrackingService = new OrderTrackingService();
         $query = $orderHeaderService->getQuery();
         $orderHeaders = $query->whereIn('Doc_Order_Header.customerid',['ONKYO','RUIHUO'])
             ->where('Doc_Order_Header.AddTime','>=',$start_at)
+            ->where('Doc_Order_Header.AddTime','<=',$end_at)
             ->get();
         $orderTrackingService->updateByWmsOrderHeaders($orderHeaders);
     }

app/OrderTracking.php

@@ -16,7 +16,7 @@ class OrderTracking extends Model
     protected $fillable = [
         'order_package_commodity_id','owner_id','logistic_id',
         'web_order_number',
-        'pick_up_at','sale','client','order_client_code',
+        'pick_up_at','sale','client','order_client_code','order_client_code_wms',
         'order_remark','pallet_total','planning_sent_at',
         'is_on_duty_shift','is_arrival','signed_at',
         'receive_bill_status','remark','gross_weight','bulk'];
@@ -39,6 +39,7 @@ class OrderTracking extends Model
      * remark 签收单情况
      * gross_weight 重量
      * bulk 体积
+     * customer_order_number 客户订单号
      */
 
     protected $appends =[

app/Services/OrderTrackingService.php

@@ -74,6 +74,10 @@ class OrderTrackingService
 //            });
         }
 
+        if(isset($params['order_client_code_wms'])){
+            $query->where('order_client_code_wms','like',$params['order_client_code_wms']);
+        }
+
         if(isset($params['logistic_id']))$query->where('logistic_id',$params['logistic_id']);   // 快递
 
         if ($params['client'] ?? false) $query->where('client', 'like', $params['client']);  // 客户
@@ -311,7 +315,7 @@ class OrderTrackingService
         $BasSKUs_code_sku_map = $dataService->dataHeader(['customerid','sku'],$BasSKUs);
 
         $update_params = [];
-        $update_params[0] =['id','client','pick_up_at','order_remark','gross_weight','bulk','planning_sent_at','web_order_number','order_client_code'];
+        $update_params[0] =['id','client','pick_up_at','order_remark','gross_weight','bulk','planning_sent_at','web_order_number','order_client_code','order_client_code_wms'];
         foreach ($orderHeaders as $orderHeader) {
             if($orderHeader->sostatus == '90'){continue;}
             $order_package_commodity_list = $order_package_commodity_order_code_map[$orderHeader->orderno] ?? false;
@@ -330,8 +334,9 @@ class OrderTrackingService
                     $order_tracking->pick_up_at != $params['pick_up_at'] ||
                     $order_tracking->gross_weight != $params['gross_weight'] ||
                     $order_tracking->bulk != $params['bulk'] ||
-                    $order_tracking->client != $params['client']
-                    || $order_tracking->order_client_code != $params['order_client_code']
+                    $order_tracking->client != $params['client'] ||
+                    $order_tracking->order_client_code_wms != $params['order_client_code_wms'] ||
+                    $order_tracking->order_client_code != $params['order_client_code']
                 ){
                     $params['updated_at'] = Carbon::now();
                     $update_params[] = $params;
@@ -509,6 +514,7 @@ class OrderTrackingService
         $params['gross_weight'] = round($basSkU->grossweight * $orderPackageCommodity->amount, 2) ?? null;  // 重量
         $params['bulk'] = round($basSkU->cube * $orderPackageCommodity->amount, 2) ?? null; // 体积
         $params['created_at'] = Carbon::now();  // 创建时间
+        $params['order_client_code_wms'] = $order->client_code;
         return $params;
     }
 }

database/migrations/2021_01_26_172812_add_column_order_client_code_wms_to_order_trackings.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddColumnOrderClientCodeWmsToOrderTrackings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('order_trackings', function (Blueprint $table) {
+            $table->string('order_client_code_wms')->index()->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('order_trackings', function (Blueprint $table) {
+            $table->dropColumn('order_client_code_wms');
+        });
+    }
+}

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

@@ -55,6 +55,7 @@
                         <th style="min-width: 50px">序号</th>
                         <th class="td-warm" style="min-width: 75px">公司</th>
                         <th class="td-warm" style="min-width: 120px">订单号</th>
+                        <th class="td-warm" style="min-width: 120px">客户订单号</th>
                         <th class="td-warm" style="min-width: 120px">WEB+订单号</th>
                         <th class="td-warm" style="min-width: 120px"> 提货日期</th>
                         <th class="td-warm" style="min-width: 120px">销售</th>
@@ -95,6 +96,10 @@
                             @endcan
                             </span>
                         </td>
+                        <td class="td-warm">
+                            @{{ trackOrder.order_client_code_wms }}
+                        </td>
+
                         <td class="td-warm">
                             @can('订单管理-跟踪-仓库编辑')
                                 <input class="form-control form-control-sm" :value="trackOrder.web_order_number" @change="warehouseUpdate($event,'web_order_number',trackOrder)" >
@@ -110,6 +115,7 @@
                             @endcan
                         </td>
                         <td class="td-warm">
+                        </td>
 {{--                            @can('订单管理-跟踪-仓库编辑')--}}
 {{--                                <input class="form-control form-control-sm" :value="trackOrder.sale" @change="warehouseUpdate($event,'sale',trackOrder)" >--}}
 {{--                            @else--}}