节点轨迹过滤掉自动装载的节点数据

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -312,7 +312,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         forkliftWaybillOrderRepository.updateById(forkliftWaybillOrder);
 
         // 创建自动节点铲车节点轨迹
-        String remark = "装载员[" + defaultDriverName + "]已接单，装载单号[" + forkliftWaybillOrder.getFOrderNo() + "]";
+        String remark = "自动装载员[" + defaultDriverName + "]已接单，装载单号[" + forkliftWaybillOrder.getFOrderNo() + "]";
         creatWaybillOrderNode(waybillOrder, forkliftWaybillOrder, CarWaybillV1Enum.REFUSE_TRAFFIC, remark);
 
         log.info("[自动接单]铲车接单成功，铲车订单ID：{}", forkliftWaybillOrder.getWOrderId());
@@ -337,7 +337,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         updateWaybillOrder(forkliftWaybillOrder, CarWaybillV1Enum.EXIT_COMPLETED);
 
         //创建自动装载完成节点轨迹
-        String remark = "装载员[" + forkliftWaybillOrder.getDriverName() + "]已完成装载，装载单号[" + forkliftWaybillOrder.getFOrderNo() + "]";
+        String remark = "自动装载员[" + forkliftWaybillOrder.getDriverName() + "]已完成装载，装载单号[" + forkliftWaybillOrder.getFOrderNo() + "]";
         creatWaybillOrderNode(waybillOrder, forkliftWaybillOrder,  CarWaybillV1Enum.EXIT_COMPLETED, remark);
         log.info("[自动接单]铲车装载成功，铲车订单ID：{}", forkliftWaybillOrder.getWOrderId());
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -5673,7 +5673,13 @@ public class KwtWaybillOrderV1Service {
         WaybillOrderNodeVo waybillOrderNodeVo = new WaybillOrderNodeVo();
         //获取时间线
         List<WaybillOrderNodeVo.Timeline> voList = getTimelines(nodes);
-        waybillOrderNodeVo.setTimelines(voList);
+
+        // 过滤掉自动装载的节点数据
+        List<WaybillOrderNodeVo.Timeline> filteredVoList = voList.stream()
+                .filter(timeline -> timeline.getRemark() == null || !timeline.getRemark().contains("自动"))
+                .collect(Collectors.toList());
+
+        waybillOrderNodeVo.setTimelines(filteredVoList);
         // 获取时间节点，并按前端五步序号排序（映射写入 orderStatus / orderStatusName）
         List<WaybillOrderNodeVo.WaybillOrderNode> nodeList = getWaybillOrderNodes(voList);
         log.info("查询运单节点轨迹，时间节点：{}", JSON.toJSONString(nodeList));