feat:行车日志

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

@@ -31,7 +31,7 @@ public enum WorkLogTypeEnum {
     LOAD_COMPLETE(30, "完成 装车运单"),
 
 
-    UNLOAD_POINT_EXECUTE(40, "执行 卸车运单, 前往卸车点"),
+    UNLOAD_ORDER_START(40, "执行 卸车运单, 前往卸车点"),
 
     UNLOAD_POINT_ARRIVED(50, "到达卸车点,开始\"卸车等待\""),
 

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

@@ -40,8 +40,8 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setNote(logType.workLogTitle + " " + workOrder.getSpotName());
             workLog.setCreaterName("自动上报");
             workLog.setCreateDate(workOrder.getType() == 1? workOrder.getEnterTime() : workOrder.getLeaveTime());
-        } else if (logType.equals(WorkLogTypeEnum.START)) {
-            // 执行装车订单
+        } else if (logType.equals(WorkLogTypeEnum.START) || logType.equals(WorkLogTypeEnum.UNLOAD_ORDER_START)) {
+            // 执行装车运单/卸车运单
             if (workOrder == null) {
                 log.error("记录执行装车订单日志错误：运单不存在");
                 return false;
@@ -96,7 +96,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setNote("开始装车");
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.LOAD_END)) {
-            // 结束作业，成功上报完成
+            // 结束作业，成果上报完成
             if (workOrder == null) {
                 log.error("记录执行装车订单日志错误：运单不存在");
                 return false;
@@ -106,6 +106,35 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setCycleId(workOrder.getCycleId());
             workLog.setNote("结束装车");
             workLog.setCreateDate(LocalDateTime.now());
+        } else if (logType.equals(WorkLogTypeEnum.LOAD_COMPLETE)) {
+            // 装车运单完成
+            if (workOrder == null) {
+                log.error("记录执行装车订单日志错误：运单不存在");
+                return false;
+            }
+            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setId(null);
+            workLog.setCycleId(workOrder.getCycleId());
+            // 日志内容
+            String content = "装车净重：" + workOrder.getJingWeight() + "  < a href='" + workOrder.getWeightingListUrl()
+                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>磅单信息</ a>";
+            workLog.setNote(content);
+            workLog.setCreateDate(LocalDateTime.now());
+        } else if (logType.equals(WorkLogTypeEnum.UNLOAD_POINT_ARRIVED)) {
+            // 执行卸车运单
+            if (workOrder == null) {
+                log.error("记录执行装车订单日志错误：运单不存在");
+                return false;
+            }
+            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setId(null);
+            // 日志内容
+            String content = "里程数：" + workOrder.getEndTrip() + "  < a href='" + workOrder.getStartTripUrl()
+                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>"
+                    + " 运单号：" + workOrder.getOrderNo();
+            workLog.setNote(content);
+            workLog.setCreaterName(workLog.getCreaterName());
+            workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.UNLOAD_COMPLETE)) {
             // 报备完成，结束卸车
             if (workOrder == null) {