feat:行车日志调整

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

@@ -5,6 +5,7 @@ import com.aoyang.tms.entity.WorkLog;
 import com.aoyang.tms.entity.WorkOrder;
 import com.aoyang.tms.mapper.WorkLogMapper;
 import com.aoyang.tms.service.WorkLogService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -94,9 +95,6 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             // 日志内容
-            String content = "装车排队号：" + workOrder.getQueueNo();
-            workLog.setUrl(workOrder.getStartTripUrl());
-            workLog.setNote(content);
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
@@ -106,6 +104,17 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
                 log.error("记录开始装车日志错误：运单不存在");
                 return false;
             }
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("cycle_id", workOrder.getCycleId());
+            queryWrapper.eq("type", WorkLogTypeEnum.LOAD_POINT_ARRIVED.type);
+            queryWrapper.orderByDesc("id");
+            queryWrapper.last("limit 1");
+            WorkLog workLogArrived = this.baseMapper.selectOne(queryWrapper);
+            String content = "装车排队号：" + workOrder.getQueueNo();
+            workLogArrived.setNote(content);
+            workLogArrived.setUrl(workOrder.getStartTripUrl());
+            this.baseMapper.updateById(workLogArrived);
+
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             workLog.setCycleId(workOrder.getCycleId());
@@ -148,13 +157,50 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             // 日志内容
+//            String content = "里程数：" + workOrder.getEndTrip() + " 运单号：" + workOrder.getOrderNo();
+//            workLog.setUrl(workOrder.getStartTripUrl());
+//            workLog.setNote(content);
+            workLog.setOrderId(workOrder.getId()+"");
+            workLog.setCreaterName(workLog.getCreaterName());
+            workLog.setCreateDate(LocalDateTime.now());
+        } else if (logType.equals(WorkLogTypeEnum.UNLOAD_START)) {
+            // 开始卸车
+            if (workOrder == null) {
+                log.error("记录执行车日志错误：运单不存在");
+                return false;
+            }
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("cycle_id", workOrder.getCycleId());
+            queryWrapper.eq("type", WorkLogTypeEnum.UNLOAD_POINT_ARRIVED.type);
+            queryWrapper.orderByDesc("id");
+            queryWrapper.last("limit 1");
+            WorkLog workLogArrived = this.baseMapper.selectOne(queryWrapper);
+            workLogArrived.setNote("里程数：" + workOrder.getStartTrip());
+            workLogArrived.setUrl(workOrder.getStartTripUrl());
+            this.baseMapper.updateById(workLogArrived);
+
+            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setId(null);
+            // 日志内容
             String content = "里程数：" + workOrder.getEndTrip() + " 运单号：" + workOrder.getOrderNo();
             workLog.setUrl(workOrder.getStartTripUrl());
             workLog.setNote(content);
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
-        } else if (logType.equals(WorkLogTypeEnum.UNLOAD_COMPLETE)) {
+        }else if (logType.equals(WorkLogTypeEnum.UNLOAD_END)) {
+            // 卸车完成
+            if (workOrder == null) {
+                log.error("记录结束作业订单日志错误：运单不存在");
+                return false;
+            }
+            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setId(null);
+            workLog.setCycleId(workOrder.getCycleId());
+            workLog.setNote("结束卸车");
+            workLog.setOrderId(workOrder.getId()+"");
+            workLog.setCreateDate(LocalDateTime.now());
+        }  else if (logType.equals(WorkLogTypeEnum.UNLOAD_COMPLETE)) {
             // 报备完成，结束卸车
             if (workOrder == null) {
                 log.error("记录行车日志错误：运单不存在");