|
@@ -187,7 +187,7 @@ public class WorkerController {
|
|
|
restInfo.setCreateDate(LocalDateTime.now());
|
|
restInfo.setCreateDate(LocalDateTime.now());
|
|
|
Boolean flag = restInfoService.save(restInfo);
|
|
Boolean flag = restInfoService.save(restInfo);
|
|
|
workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null);
|
|
workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null);
|
|
|
- workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, workCycle.getId()+"",
|
|
|
|
|
|
|
+ workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, workCycle.getId() + "",
|
|
|
DateUtils.betweenTime(restInfo.getStartTime(), restInfo.getEndTime()));
|
|
DateUtils.betweenTime(restInfo.getStartTime(), restInfo.getEndTime()));
|
|
|
return new Result<>(flag);
|
|
return new Result<>(flag);
|
|
|
}
|
|
}
|
|
@@ -215,7 +215,7 @@ public class WorkerController {
|
|
|
truckRepairInfo.setCreateDate(LocalDateTime.now());
|
|
truckRepairInfo.setCreateDate(LocalDateTime.now());
|
|
|
Boolean flag = truckRepairInfoService.save(truckRepairInfo);
|
|
Boolean flag = truckRepairInfoService.save(truckRepairInfo);
|
|
|
workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null);
|
|
workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null);
|
|
|
- workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, workCycle.getId()+"",
|
|
|
|
|
|
|
+ workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, workCycle.getId() + "",
|
|
|
DateUtils.betweenTime(truckRepairInfo.getStartTime(), truckRepairInfo.getEndTime()));
|
|
DateUtils.betweenTime(truckRepairInfo.getStartTime(), truckRepairInfo.getEndTime()));
|
|
|
return new Result<>(flag);
|
|
return new Result<>(flag);
|
|
|
}
|
|
}
|
|
@@ -357,6 +357,7 @@ public class WorkerController {
|
|
|
queryWrapper.and(wrapper -> wrapper.eq("order_status", WorkOrderEnum.GOTO_ZHUANGCHE_SPOT)
|
|
queryWrapper.and(wrapper -> wrapper.eq("order_status", WorkOrderEnum.GOTO_ZHUANGCHE_SPOT)
|
|
|
.or().eq("order_status", WorkOrderEnum.ZHUANGCHE_WAIT));
|
|
.or().eq("order_status", WorkOrderEnum.ZHUANGCHE_WAIT));
|
|
|
WorkOrder workOrder = workOrderService.getOne(queryWrapper);
|
|
WorkOrder workOrder = workOrderService.getOne(queryWrapper);
|
|
|
|
|
+ log.info("start_work workOrder:{}", JSON.toJSONString(workOrder));
|
|
|
if (workOrder == null) {
|
|
if (workOrder == null) {
|
|
|
log.error("无执行中装车运单 不能执行出车检查:{}", JSON.toJSONString(truckCheckInfo));
|
|
log.error("无执行中装车运单 不能执行出车检查:{}", JSON.toJSONString(truckCheckInfo));
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), "当前不能执行出车检查");
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), "当前不能执行出车检查");
|
|
@@ -379,7 +380,7 @@ public class WorkerController {
|
|
|
truckCheckInfo.setCreateDate(LocalDateTime.now());
|
|
truckCheckInfo.setCreateDate(LocalDateTime.now());
|
|
|
truckCheckInfoService.save(truckCheckInfo);
|
|
truckCheckInfoService.save(truckCheckInfo);
|
|
|
|
|
|
|
|
- if(truckCheckInfo.getOrderId()!=null) {
|
|
|
|
|
|
|
+ if (truckCheckInfo.getOrderId() != null) {
|
|
|
WorkOrder workOrderCheck = workOrderService.getById(truckCheckInfo.getOrderId());
|
|
WorkOrder workOrderCheck = workOrderService.getById(truckCheckInfo.getOrderId());
|
|
|
if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
|
|
if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
|
|
|
return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
|
|
return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
|