跟踪件导出 没有送到时间时，送达时间为空

app/Http/Controllers/OrderTrackingController.php

@@ -66,7 +66,7 @@ class OrderTrackingController extends Controller
         $column = ['owners_name','order_client_code','web_order_number','pick_up_at','sale','client','sku','sku_name','amount','order_remark',
             'gross_weight','bulk','pallet_total','logistic_name','logistic_number','city','planning_sent_at','is_on_duty_shift','is_arrival','signed_at','receive_bill_status','remark'];
         $mergeColumn = ['M'];
-        $rule = ["pick_up_at"=> "mysqlDate"];
+        $rule = ["pick_up_at"=> "mysqlDate",'planning_sent_at'=>"mysqlDate"];
         $post = Http::post(config('go.export.url'),['type'=>'unify','sql'=>$sql, 'connection'=>'mysql','rule' => json_encode($rule),
             'row'=>json_encode($row,JSON_UNESCAPED_UNICODE), 'column'=>json_encode($column),
             'mergeColumn'=>json_encode($mergeColumn),'datum'=>'pick_up_at','createFormat'=>'merge']);

app/Services/OrderIssueService.php

@@ -476,11 +476,7 @@ class OrderIssueService
         return ['success' => true, 'order' => $order];
     }
 
-    /**
-     * @param string $logisticNumber
-     * @param string $type
-     * @param string $result_explain
-     */
+
     public function createOrderIssue($logisticNumber, $type, $result_explain, $importedStatus = '正常', $custom_code = null)
     {
         $orderHeaders = OracleDOCOrderHeader::query()->with(['oracleDOCOrderDetails', 'actAllocationDetails', 'oracleBASCode'])

app/Services/OrderTrackingService.php

@@ -115,7 +115,8 @@ class OrderTrackingService
         }
         $order_tracking_colnums = "case order_trackings.order_client_code when  order_trackings.web_order_number then '' when order_trackings.order_client_code then  order_trackings.order_client_code end order_client_code,";
         $order_tracking_colnums .= 'order_trackings.web_order_number,order_trackings.pick_up_at,order_trackings.sale,order_trackings.client,order_trackings.order_remark,order_trackings.gross_weight,order_trackings.bulk,';
-        $order_tracking_colnums .= 'order_trackings.pallet_total,order_trackings.planning_sent_at,order_trackings.is_on_duty_shift,order_trackings.is_arrival,order_trackings.signed_at,order_trackings.receive_bill_status,order_trackings.remark';
+        $order_tracking_colnums .= "case order_trackings.planning_sent_at when '0000-00-00 00:00:00' then null else order_trackings.planning_sent_at end planning_sent_at,";
+        $order_tracking_colnums .= 'order_trackings.pallet_total,order_trackings.is_on_duty_shift,order_trackings.is_arrival,order_trackings.signed_at,order_trackings.receive_bill_status,order_trackings.remark';
         return  $this->getConditionQuery($params)
             ->orderBy('order_trackings.order_client_code')
             ->orderByDesc('order_trackings.pick_up_at')