feat:执行运单逻辑修改

src/main/java/com/aoyang/tms/controller/vo/AddWorkOrderVO.java

@@ -81,9 +81,11 @@ public class AddWorkOrderVO implements Serializable {
     private String contactPhone;
 
     @ApiModelProperty(value = "计划到达时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime planReachTime;
 
     @ApiModelProperty(value = "计划离开时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime planLeaveTime;
 
     @ApiModelProperty(value = "计划重量")

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.aoyang.tms.service.impl;
 
 import com.aoyang.tms.common.TmsTruckStatus;
+import com.aoyang.tms.common.WorkLogTypeEnum;
 import com.aoyang.tms.common.WorkOrderEnum;
 import com.aoyang.tms.controller.vo.WorkCycleVO;
 import com.aoyang.tms.entity.Truck;
@@ -36,6 +37,8 @@ public class WorkerServiceImpl implements WorkerService {
     private WorkOrderService workOrderService;
     @Resource
     private TruckCheckInfoService truckCheckInfoService;
+    @Resource
+    private WorkLogService workLogService;
 
     @Override
     @Transactional
@@ -94,7 +97,7 @@ public class WorkerServiceImpl implements WorkerService {
             }
 
             //4 记录日志
-            //TODO
+            workLogService.logWorkCycleInfo(WorkLogTypeEnum.START, workOrder);
 
         } catch (Exception e) {
             log.error("startOrder:{}", e.getMessage());
@@ -126,7 +129,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrder.setGotoSpotTime(LocalDateTime.now());
                 workOrderService.updateById(workOrder);
                 //4 记录日志
-                //TODO
+                workLogService.logWorkCycleInfo(WorkLogTypeEnum.FINISH_PRE_CHECK, workOrder);
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getMessage());
@@ -156,7 +159,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrderService.updateById(workOrder);
 
                 //3 记录日志
-                //TODO
+                workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_POINT_ARRIVED, workOrder);
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getMessage());
@@ -191,7 +194,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrderService.updateById(workOrder);
 
                 //3 记录日志
-                //TODO
+                workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_START, workOrder);
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getMessage());
@@ -229,7 +232,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workCycleService.updateById(workCycle);
 
                 //3.并记行车日志
-                //TODO
+                workLogService.logWorkCycleInfo(WorkLogTypeEnum.UNLOAD_COMPLETE, workOrder);
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getMessage());
@@ -251,7 +254,7 @@ public class WorkerServiceImpl implements WorkerService {
                 truck.setTmsStatus(TmsTruckStatus.AFTER_CHECK);
                 truckService.updateById(truck);
                 //2 记录日志
-                //TODO
+                workLogService.logWorkCycleInfo(WorkLogTypeEnum.RETURN_POINT_ARRIVED, workOrder);
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getMessage());
@@ -286,7 +289,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrder.setJingWeight(workOrderParam.getJingWeight());
                 workOrderService.updateById(workOrder);
                 //3 记录日志
-                //TODO
+                workLogService.logWorkCycleInfo(WorkLogTypeEnum.CLOSED, workOrder);
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getMessage());