Sfoglia il codice sorgente

feat:行车日志调整

wangweiyu 4 anni fa
parent
commit
1cc9e8a0d3

+ 5 - 4
src/main/java/com/aoyang/tms/service/impl/WorkLogServiceImpl.java

@@ -26,8 +26,6 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
     @Override
     public Boolean logWorkCycleInfo(WorkLogTypeEnum logType, WorkOrder workOrder, String ... args) {
         WorkLog workLog = new WorkLog();
-        workLog.setTitle(logType.workLogTitle);
-        workLog.setType(logType.type);
         if (logType.equals(WorkLogTypeEnum.ENTER_LOAD_SPOT) || logType.equals(WorkLogTypeEnum.LEAVE_LOAD_SPOT)
                 || logType.equals(WorkLogTypeEnum.ENTER_UNLOAD_SPOT) || logType.equals(WorkLogTypeEnum.LEAVE_UNLOAD_SPOT)) {
             // 进入离开围栏日志
@@ -188,7 +186,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
-        }else if (logType.equals(WorkLogTypeEnum.UNLOAD_END)) {
+        } else if (logType.equals(WorkLogTypeEnum.UNLOAD_END)) {
             // 卸车完成
             if (workOrder == null) {
                 log.error("记录结束作业订单日志错误:运单不存在");
@@ -200,7 +198,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setNote("结束卸车");
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreateDate(LocalDateTime.now());
-        }  else if (logType.equals(WorkLogTypeEnum.UNLOAD_COMPLETE)) {
+        } else if (logType.equals(WorkLogTypeEnum.UNLOAD_COMPLETE)) {
             // 报备完成,结束卸车
             if (workOrder == null) {
                 log.error("记录行车日志错误:运单不存在");
@@ -255,6 +253,9 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setCreateDate(LocalDateTime.now());
         }
 
+        workLog.setTitle(logType.workLogTitle);
+        workLog.setType(logType.type);
+
         return save(workLog);
     }
 }