|
@@ -1180,7 +1180,7 @@ public class kwfTruckTraceService {
|
|
|
Wrappers.<KwtLogisticsOrderUnit>lambdaQuery()
|
|
Wrappers.<KwtLogisticsOrderUnit>lambdaQuery()
|
|
|
.eq(KwtLogisticsOrderUnit::getDelFlag, 0)
|
|
.eq(KwtLogisticsOrderUnit::getDelFlag, 0)
|
|
|
.in(KwtLogisticsOrderUnit::getEntId, allEnt)
|
|
.in(KwtLogisticsOrderUnit::getEntId, allEnt)
|
|
|
- .in(KwtLogisticsOrderUnit::getUnitType, Arrays.asList(1, 2)));
|
|
|
|
|
|
|
+ .in(KwtLogisticsOrderUnit::getUnitType, Arrays.asList(1, 2,3)));
|
|
|
if (CollectionUtils.isEmpty(allUnits)) {
|
|
if (CollectionUtils.isEmpty(allUnits)) {
|
|
|
return Set.of();
|
|
return Set.of();
|
|
|
}
|
|
}
|
|
@@ -1514,16 +1514,9 @@ public class kwfTruckTraceService {
|
|
|
* 生成车辆轨迹数据(异步执行)
|
|
* 生成车辆轨迹数据(异步执行)
|
|
|
* @param req 生成轨迹请求参数
|
|
* @param req 生成轨迹请求参数
|
|
|
*/
|
|
*/
|
|
|
- @Async("traceTaskExecutor")
|
|
|
|
|
|
|
+ // @Async("traceTaskExecutor")
|
|
|
public void generateTrace(GenerateTraceReq req) {
|
|
public void generateTrace(GenerateTraceReq req) {
|
|
|
- log.info("开始异步生成车辆轨迹,运单号:{}", req.getWayOrderNo());
|
|
|
|
|
- try {
|
|
|
|
|
- generateTraceInternal(req);
|
|
|
|
|
- log.info("异步生成车辆轨迹完成,运单号:{}", req.getWayOrderNo());
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
- log.error("异步生成车辆轨迹失败,运单号:{},错误信息:{}", req.getWayOrderNo(), e.getMessage(), e);
|
|
|
|
|
- // 异步方法中的异常需要记录,但不抛出(避免影响调用方)
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ generateTraceInternal(req);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|