Merge branch 'v21.1_jianzhuang_20240807' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -3235,6 +3235,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         for (OrderChild child : orderChildList) {
             String childNo = child.getChildNo();
             String truckNo = child.getTruckNo();
+            Long driverUserNo = child.getDriverUserNo();
             //解除监装限制的不进行处理
             if (Objects.equals(child.getRemoveLoadLimitStatus(), OrderChildEnum.RemoveLoadLimitStatus.REMOVED.getCode())) {
                 log.info("运单:{},卡车:{} 已解除监装限制", childNo, truckNo);
@@ -3247,6 +3248,12 @@ public class OrderChildServiceImpl implements OrderChildService {
             if (Objects.nonNull(truckTraceDTO)) {
                 truckLongitudeX = truckTraceDTO.getLocation()[0];
                 truckLatitudeY = truckTraceDTO.getLocation()[1];
+            } else {
+                BigDecimal[] location = truckTraceService.getCurrentPosition(truckNo, driverUserNo);
+                if (location != null && location.length > 2) {
+                    truckLongitudeX = location[0];
+                    truckLatitudeY = location[1];
+                }
             }
             //判断卡车是否出了货源地x公里范围
             String orderGoodsNo = child.getOrderGoodsNo();