|
@@ -3,6 +3,7 @@ package com.aoyang.tms.service.impl;
|
|
|
import com.aoyang.common.param.PageParam;
|
|
import com.aoyang.common.param.PageParam;
|
|
|
import com.aoyang.common.result.Result;
|
|
import com.aoyang.common.result.Result;
|
|
|
import com.aoyang.tms.common.ErrCodeEnum;
|
|
import com.aoyang.tms.common.ErrCodeEnum;
|
|
|
|
|
+import com.aoyang.tms.common.WorkLogTypeEnum;
|
|
|
import com.aoyang.tms.common.WorkOrderEnum;
|
|
import com.aoyang.tms.common.WorkOrderEnum;
|
|
|
import com.aoyang.tms.controller.param.WorkManagePageParam;
|
|
import com.aoyang.tms.controller.param.WorkManagePageParam;
|
|
|
import com.aoyang.tms.controller.vo.*;
|
|
import com.aoyang.tms.controller.vo.*;
|
|
@@ -49,7 +50,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
@Resource
|
|
@Resource
|
|
|
private TruckMapper truckMapper;
|
|
private TruckMapper truckMapper;
|
|
|
@Resource
|
|
@Resource
|
|
|
- private WorkOrderService workOrderService;
|
|
|
|
|
|
|
+ private WorkLogService workLogService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private WorkOrderMapper workOrderMapper;
|
|
private WorkOrderMapper workOrderMapper;
|
|
|
@Resource
|
|
@Resource
|
|
@@ -272,6 +273,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
order.setOrderStatus(WorkOrderEnum.CONCELED.orderStatus());
|
|
order.setOrderStatus(WorkOrderEnum.CONCELED.orderStatus());
|
|
|
|
|
+ workLogService.logWorkCycleInfo(workOrder.getType() == 1 ? WorkLogTypeEnum.LOAD_CANCELED : WorkLogTypeEnum.UNLOAD_CANCELED, workOrder);
|
|
|
|
|
|
|
|
return new Result<>(updateById(order));
|
|
return new Result<>(updateById(order));
|
|
|
}
|
|
}
|