提交解绑车辆bug

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderRepository.java

@@ -60,7 +60,7 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
                 .ge(KwtWaybillOrder::getCreateTime, beforeDate)
                 .le(KwtWaybillOrder::getCreateTime, date)
                 .eq(KwtWaybillOrder::getDelFlag, 0)
-                .in(CollectionUtils.isNotEmpty(wayOrderIds),KwtWaybillOrder::getLOrderId, wayOrderIds)
+                .in(CollectionUtils.isNotEmpty(wayOrderIds),KwtWaybillOrder::getId, wayOrderIds)
                 .eq(StringUtils.isNotBlank(truckNo),KwtWaybillOrder::getTruckNo, truckNo)
                 .orderByDesc(KwtWaybillOrder::getCreateTime);
         return page(page,wrapper);

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

@@ -93,7 +93,7 @@ public class VehicleExceptionService {
         }
         
         // 提取所有不重复的运单ID
-        List<Long> waybillOrderNos = records.stream()
+        List<Long> waybillOrderIds = records.stream()
                 .map(KwtVehicleException::getWOrderId)
                 .distinct()
                 .collect(Collectors.toList());
@@ -103,9 +103,9 @@ public class VehicleExceptionService {
         Map<Long, KwtWaybillOrderSubtask> waybillOrderSubtaskMap = Maps.newHashMap();
         
         // 如果存在运单ID，则查询相关运单和地址信息
-        if (CollectionUtils.isNotEmpty(waybillOrderNos)){
+        if (CollectionUtils.isNotEmpty(waybillOrderIds)){
             // 查询运单信息
-            List<KwtWaybillOrderSubtask> subtasks = waybillOrderSubtaskRepository.queryByWOrderIds(waybillOrderNos);
+            List<KwtWaybillOrderSubtask> subtasks = waybillOrderSubtaskRepository.queryByWOrderIds(waybillOrderIds);
             List<Long> logisticOrderIds = Lists.newArrayList();
             
             // 如果查询到运单信息，则提取物流订单ID
@@ -202,8 +202,8 @@ public class VehicleExceptionService {
         vo.setUnloadAddress(unLoadAdd.getDetailAddress());
         vo.setEndLng(unLoadAdd.getLng());
         vo.setEndLat(unLoadAdd.getLat());
-        vo.setWaybillId(subtask.getWOrderId());
-        vo.setWaybillNo(subtask.getWOrderNo());
+        vo.setWaybillId(image.getWOrderId());
+        vo.setWaybillNo(image.getWOrderNo());
         return vo;
     }
     

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

@@ -1590,7 +1590,6 @@ public class kwfTruckTraceService {
         KwtLogisticsOrder logisticsOrder = kwtLogisticsOrderRepository.queryByLogisticsOrderId(subOrders.getLOrderId());
 
         // 构造要发送给数据中台的轨迹数据请求
-        String dateStr = req.getDate();
         // 输入的日期字符串
        // LocalDate date = LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         LocalDateTime dateTime = date.atTime(LocalTime.now());
@@ -1711,6 +1710,7 @@ public class kwfTruckTraceService {
         vehicleException.setEntId(order.getEntId());
         vehicleException.setTruckId(order.getTruckId());
         vehicleException.setTruckNo(req.getTruckNo());
+        vehicleException.setWOrderId(order.getId());
         vehicleException.setWOrderNo(req.getWayOrderNo());
         vehicleException.setDriverId(order.getDriverId());
         vehicleException.setDriverName(order.getDriverName());