feature(电子围栏): 非监装子任务的车在上传装货信息时不给提示监装信息

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

@@ -3306,7 +3306,9 @@ public class OrderChildServiceImpl implements OrderChildService {
             log.info("运单号：{}，卡车:{}，status:{}，站点经度：{},站点纬度：{},卡车经度：{},卡车纬度：{},距离:{}", orderGoodsNo, truckNo, child.getStatus(), siteLongitudeX, siteLatitudeY, truckLongitudeX, truckLatitudeY, distance);
             // 超出货源地+通知触发距离
             if (distance > driverNoticeConfigVO.getNoticeTriggerDistanceMeter()) {
-                if (Objects.equals(child.getExitNoticeStatus(), OrderChildEnum.ExitNoticeStatus.NOT_NOTIFIED.getCode())
+                // 运单驶入过1km且通知状态为未通知
+                if (Objects.equals(child.getEnterExitSendStatus(), OrderChildEnum.EnterExitSendStatus.DRIVE_IN.getCode()) &&
+                        Objects.equals(child.getExitNoticeStatus(), OrderChildEnum.ExitNoticeStatus.NOT_NOTIFIED.getCode())
                 ) {
                     //超出货源地x公里范围了,且通知状态为未通知
                     // 到达货源地
@@ -3579,7 +3581,9 @@ public class OrderChildServiceImpl implements OrderChildService {
 
             SupervisionLoadTruckInfoDto supervisionLoadTruckInfo = supervisionLoadTruckInfoDto.getData();
             if(Objects.nonNull(supervisionLoadTruckInfo)){
-                if(supervisionLoadTruckInfo.getLoadStatus()){
+                // 未监装并且监装车辆与运单车辆一致
+                if(supervisionLoadTruckInfo.getLoadStatus()
+                        && Objects.equals(supervisionLoadTruckInfo.getTruckNo(), orderChild.getTruckNo())){
                     result.setNeedAlert(1);
                     result.setLocation(supervisionLoadInfo.getTaskAddress());
                     result.setMobile(supervisionLoadInfo.getTaskMobile());