追踪件导出 修改追踪件导出

app/Http/Controllers/OrderTrackingController.php

@@ -190,6 +190,9 @@ class OrderTrackingController extends Controller
             if($logistic=='新杰物流'||$logistic=='新杰物流到付'){
                 $logistic_number = $orderTracking->order_client_code;
             }
+            if(str_starts_with('null',$logistic_number)){
+                $logistic_number = '';
+            }
             $list[]=[
                 $orderTracking->owner->name ?? '',
                 $order_client_code,

app/Imports/OrderTrackingImport.php

@@ -107,26 +107,6 @@ class OrderTrackingImport implements ToCollection
                     }
                 }
             }
-//            $packages->each(function ($package) use ($items, &$orderPackageCommodities, &$bool) {
-//                if (!$bool) {
-//                    if ($package->commodities ?? false) {
-//                        $_commodities = $package->commodities;
-//                        $package->commodities = $package->commodities->filter(function ($commodities) use ($items, &$orderPackageCommodities, &$bool, &$_commodities) {
-//                            try {
-//                                if (isset($commodities->commodity) && $bool == false) {
-//                                    if ($commodities->commodity->sku == $items[6] && $commodities->amount == $items[8]) {
-//                                        $orderPackageCommodities = $_commodities->pull($commodities);
-//                                        $bool = true;
-//                                    }
-//                                }
-//                            } catch (\Exception $e) {
-//                                dd($_commodities);
-//                            }
-//                        });
-//                    }
-//                }
-//            });
-
         }elseif(count($packages)==1){
             $bool = false;
             foreach ($packages as $package) {
@@ -136,6 +116,7 @@ class OrderTrackingImport implements ToCollection
                             $package->commodities = $package->commodities->filter(function($item)use($commodities){
                                 return $item->id != $commodities->id;
                             });
+                            $this->orderPackages[$items[1]] = $packages;
                             return $commodities;
                         }
                     }
@@ -239,7 +220,7 @@ class OrderTrackingImport implements ToCollection
             return $this->orderPackages[$client_code];
         }else{
             $order = $this->getOrder($client_code,$items);
-            if($order->packages->count() > 0 ){
+            if($order && $order->packages->count() > 0 ){
                 $this->orderPackages[$client_code] = $order->packages;
                 return $order->packages;
             }else{

app/OracleBasSKU.php

@@ -20,5 +20,6 @@ class OracleBasSKU extends Model
      * column: SKU 产品编码
      *         ALTERNATE_SKU1 产品条码
      *         Descr_C 商品名称
+     *
      * */
 }