|
|
@@ -60,14 +60,16 @@ public class WorkerServiceImpl implements WorkerService {
|
|
|
if (truck.getTmsStatus() == 1 || truck.getTmsStatus() == 2) {
|
|
|
// 行车状态已开始行车周期
|
|
|
// 查询当前是否有中止的装车运单
|
|
|
- QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("cycle_id", workCycleOld.getId());
|
|
|
- queryWrapper.eq("order_status", 60);
|
|
|
- queryWrapper.eq("type", 1);
|
|
|
- queryWrapper.orderByDesc("id");
|
|
|
- List<WorkOrder> calcelList = workOrderService.list(queryWrapper);
|
|
|
- if (calcelList != null && calcelList.size() > 0) {
|
|
|
- cancelFlag = true;
|
|
|
+ if (workCycleOld != null) {
|
|
|
+ QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("cycle_id", workCycleOld.getId());
|
|
|
+ queryWrapper.eq("order_status", 60);
|
|
|
+ queryWrapper.eq("type", 1);
|
|
|
+ queryWrapper.orderByDesc("id");
|
|
|
+ List<WorkOrder> calcelList = workOrderService.list(queryWrapper);
|
|
|
+ if (calcelList != null && calcelList.size() > 0) {
|
|
|
+ cancelFlag = true;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (cancelFlag) {
|
guoyong