소스 검색

出车检查

guoyong 4 년 전
부모
커밋
3caa733e85
1개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 3
      src/main/java/com/aoyang/tms/controller/WorkerController.java

+ 4 - 3
src/main/java/com/aoyang/tms/controller/WorkerController.java

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