Power unit not getting attached to shipment

Summary:

We are getting GPS tracking events from an external application called Samsara which are coming on Power Unit GID in OTM so we have to attach that Tracking event to the shipment to which that particular Power Unit is assigned at that point of time.

But we have a case where 1 shipment is not completed and 2nd shipment is In-Transit with same Power unit to them then tracking events should get attached to the shipment which is in-transit at that point of time through Automation agent

So how can we our agent configured in a way to get the tracking events at in-transit shipment