diff --git a/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersFromYdPortalV2Processor.php b/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersFromYdPortalV2Processor.php index a93e9476..c2e76071 100644 --- a/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersFromYdPortalV2Processor.php +++ b/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersFromYdPortalV2Processor.php @@ -105,10 +105,12 @@ class FetchContainersFromYdPortalV2Processor $loadingDate = null; $etd = null; $eta = null; + $reference = $packingList->reference; $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [ - 'trakingno' => $packingList->reference + 'trakingno' => $reference ]); + Log::info('YDContainer reference ' . $reference); $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest); @@ -117,22 +119,24 @@ class FetchContainersFromYdPortalV2Processor } foreach (array_reverse($rows->data) as $trackingRow) { + Log::info('YDContainer trackingRow ' . json_encode($trackingRow)); if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) { $tracking = explode(':', $trackingRow->tracking); $containerReference = explode('预计到港时间', $tracking[1])[0]; $loadingDate = Carbon::parse($trackingRow->trackingtime); $etd = Carbon::parse($tracking[2])->subDays(5); - $eta = Carbon::parse($tracking[2]); + $eta = Carbon::parse($tracking[2]); } } if($containerReference) { try { + Log::info('YDContainer try ' . json_encode($containerReference)); $container = $this->fetchesContainer->execute(['reference' => $containerReference]); $container->packingLists()->detach($packingList); $container->packingLists()->attach($packingList); } catch (ResourceNotFoundException $exception){ - + Log::info('YDContainer catch ' . json_encode($containerReference)); if(!($packingList->owner instanceof Order)) return; $originWarehouse = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee; diff --git a/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersUpdatesFromYdPortalV2Processor.php b/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersUpdatesFromYdPortalV2Processor.php index 680bc63d..15b36ac5 100644 --- a/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersUpdatesFromYdPortalV2Processor.php +++ b/app/Classes/Modules/PackingLists/Processors/V2/FetchContainersUpdatesFromYdPortalV2Processor.php @@ -61,11 +61,13 @@ class FetchContainersUpdatesFromYdPortalV2Processor $time_start = microtime(true); $packingList = $container->packingLists()->first(); - + $reference = $packingList->reference; $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [ - 'trakingno' => $packingList->reference + 'trakingno' => $reference ]); + Log::info('YDContainerUpdates reference ' . $reference); + $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest); if(!$rows->data){ @@ -78,6 +80,8 @@ class FetchContainersUpdatesFromYdPortalV2Processor $checkShipArrivalDate = null; foreach (array_reverse($rows->data) as $trackingRow) { + Log::info('YDContainerUpdates trackingRow ' . json_encode($trackingRow)); + $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港'); $rescheduleETA = strpos($trackingRow->remark, '到港');