日志添加

src/main/java/com/aoyang/tms/common/WorkLogTypeEnum.java

@@ -11,7 +11,7 @@ public enum WorkLogTypeEnum {
     /**
      * 执行 装车运单, 开始 出车前检查
      */
-    START(1, "执行 装车运单, 开始\"出车前检查\""),
+    LOAD_ORDER_START(1, "执行 装车运单, 开始\"出车前检查\""),
 
     ENGIN_ON(2, "车辆启动"),
 

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -382,7 +382,7 @@ public class WorkerController {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
-        //TODO 1.车辆进入作业中状态，2.订单进入装车等待状态，3.并记行车日志
+        //1.车辆进入作业中状态，2.订单进入装车等待状态，3.并记行车日志
         Boolean flag = workerService.startWait(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }

src/main/java/com/aoyang/tms/service/WorkerService.java

@@ -46,7 +46,7 @@ public interface WorkerService {
 
     /**
      * @Author guoyong
-     * @Description 上报成果
+     * @Description 上报磅单
      * @Date  2022/4/23
      * @Param
      * @return

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

@@ -3,13 +3,13 @@ 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;
 import com.aoyang.tms.entity.TruckCheckInfo;
 import com.aoyang.tms.entity.WorkCycle;
 import com.aoyang.tms.entity.WorkOrder;
 import com.aoyang.tms.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import groovyjarjarpicocli.CommandLine;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -84,16 +84,20 @@ public class WorkerServiceImpl implements WorkerService {
             workOrder.setExecuteTime(LocalDateTime.now());
             workOrderService.updateById(workOrder);
 
+            //插入日志
+            workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_ORDER_START, workOrder);
+
         } else if (workOrder.getType() == 2) {
             workOrder.setCycleId(workCycleOld.getId());
             //3.订单进入前往卸车点状态，
             workOrder.setOrderStatus(WorkOrderEnum.GOTO_XIECHE_SPOT.orderStatus());
             workOrder.setExecuteTime(LocalDateTime.now());
             workOrderService.updateById(workOrder);
+
+            //插入日志
+            workLogService.logWorkCycleInfo(WorkLogTypeEnum.UNLOAD_ORDER_START, workOrder);
         }
 
-        //4 记录日志
-        workLogService.logWorkCycleInfo(WorkLogTypeEnum.START, workOrder);
 
         return flag;
     }
@@ -102,7 +106,7 @@ public class WorkerServiceImpl implements WorkerService {
     @Transactional
     public Boolean starWork(Long userId, String userName, TruckCheckInfo truckCheckInfo) {
         Boolean flag = true;
-        //TODO 1.车辆进入作业中状态，2.插入车辆检查记录，3.并记行车日志
+        //1.车辆进入作业中状态，2.插入车辆检查记录，3.并记行车日志
         try {
             WorkOrder workOrder = workOrderService.getById(truckCheckInfo.getOrderId());
             if (workOrder != null) {
@@ -150,7 +154,11 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrderService.updateById(workOrder);
 
                 //3 记录日志
-                workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_POINT_ARRIVED, workOrder);
+                if (workOrder.getType() == 1) {
+                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_POINT_ARRIVED, workOrder);
+                } else {
+                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.UNLOAD_POINT_ARRIVED, workOrder);
+                }
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getStackTrace());
@@ -186,6 +194,13 @@ public class WorkerServiceImpl implements WorkerService {
 
                 //3 记录日志
                 workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_START, workOrder);
+
+                //3 记录日志
+                if (workOrder.getType() == 1) {
+                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_START, workOrder);
+                } else {
+                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.UNLOAD_START, workOrder);
+                }
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getStackTrace());
@@ -223,8 +238,14 @@ public class WorkerServiceImpl implements WorkerService {
                 workCycleService.updateById(workCycle);
 
                 //3.并记行车日志
-                workLogService.logWorkCycleInfo(WorkLogTypeEnum.UNLOAD_END, workOrder);
-                workLogService.logWorkCycleInfo(WorkLogTypeEnum.UNLOAD_COMPLETE, workOrder);
+                if (workOrder.getType() == 1) {
+                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_END, workOrder);
+                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_COMPLETE, workOrder);
+                } else {
+                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.UNLOAD_END, workOrder);
+                    workLogService.logWorkCycleInfo(WorkLogTypeEnum.UNLOAD_COMPLETE, workOrder);
+                }
+
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getStackTrace());