feat:行车日志修改

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

@@ -30,6 +30,8 @@ public enum WorkLogTypeEnum {
 
     LOAD_COMPLETE(30, "完成 装车运单"),
 
+    LOAD_CANCELED(31, "装车运单 终止"),
+
 
     UNLOAD_ORDER_START(40, "执行 卸车运单, 前往卸车点"),
 
@@ -45,6 +47,8 @@ public enum WorkLogTypeEnum {
 
     UNLOAD_COMPLETE(60, "完成 卸车运单"),
 
+    UNLOAD_CANCELED(61, "卸车运单 终止"),
+
 
     RETURN_POINT_ARRIVED(70, "到达 收车点，开始\"收车后检查\""),
 

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

@@ -128,7 +128,7 @@ public class WorkOrderManageController {
     @PostMapping("/add_load_order")
     public Result add(@RequestHeader(value = "orgId") Long orgId,
                       @RequestHeader(value = "userId") Long userId,
-                      @RequestHeader("userName") String userName,
+                      @RequestHeader(value = "userName") String userName,
                       @RequestBody AddWorkOrderVO orderVO) {
         log.info("运力调度派单，调用/tms/work_order_manage/add_order param:{} ", JSON.toJSONString(orderVO));
         if (orderVO == null || orderVO.getShipperId() == null || orderVO.getSpotId() == null ||

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

@@ -23,16 +23,12 @@ import java.time.LocalDateTime;
  * @since 2022-04-21
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("tms_work_order")
-@ApiModel(value="WorkOrder对象", description="运单运单表")
+@ApiModel(value="AddWorkOrderVO对象", description="运单运单表")
 public class AddWorkOrderVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "分配卡车id,批量id以逗号分隔")
-    @TableField("truck_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private String truckIds;
 

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

@@ -38,6 +38,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setId(null);
             // 日志内容
             workLog.setNote(logType.workLogTitle + " " + workOrder.getSpotName());
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName("自动上报");
             workLog.setCreateDate(workOrder.getType() == 1? workOrder.getEnterTime() : workOrder.getLeaveTime());
         } else if (logType.equals(WorkLogTypeEnum.LOAD_ORDER_START) || logType.equals(WorkLogTypeEnum.UNLOAD_ORDER_START)) {
@@ -53,6 +54,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
                     + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>"
                     + " 运单号：" + workOrder.getOrderNo();
             workLog.setNote(content);
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.FINISH_PRE_CHECK)) {
@@ -67,6 +69,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             String content = "< a href='" + args[0]
                     + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>检查表</ a>";
             workLog.setNote(content);
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.LOAD_POINT_ARRIVED)) {
@@ -81,6 +84,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             String content = "装车排队号：" + workOrder.getQueueNo() + "  < a href='" + workOrder.getStartTripUrl()
                     + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>";
             workLog.setNote(content);
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.LOAD_START)) {
@@ -93,6 +97,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setId(null);
             workLog.setCycleId(workOrder.getCycleId());
             workLog.setNote("开始装车");
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.LOAD_END)) {
             // 结束作业，成果上报完成
@@ -104,6 +109,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setId(null);
             workLog.setCycleId(workOrder.getCycleId());
             workLog.setNote("结束装车");
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.LOAD_COMPLETE)) {
             // 装车运单完成
@@ -118,6 +124,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             String content = "装车净重：" + workOrder.getJingWeight() + "  < a href='" + workOrder.getWeightingListUrl()
                     + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>磅单信息</ a>";
             workLog.setNote(content);
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.UNLOAD_POINT_ARRIVED)) {
             // 执行卸车运单
@@ -132,6 +139,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
                     + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>"
                     + " 运单号：" + workOrder.getOrderNo();
             workLog.setNote(content);
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.UNLOAD_COMPLETE)) {
@@ -142,6 +150,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             }
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCycleId(workOrder.getCycleId());
             // 日志内容
             workLog.setNote("结束卸车");
@@ -161,6 +170,18 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
                     + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</a>";
             workLog.setNote(content);
             workLog.setCreateDate(LocalDateTime.now());
+        } else if (logType.equals(WorkLogTypeEnum.LOAD_CANCELED) || logType.equals(WorkLogTypeEnum.UNLOAD_CANCELED)) {
+            // 装车运单中止
+            workLog.setCycleId(workOrder.getCycleId());
+            if (args.length < 2) {
+                log.error("记录行车日志错误：参数错误");
+                return false;
+            }
+            // 日志内容
+            String content = " 运单号：" + workOrder.getOrderNo();
+            workLog.setNote(content);
+            workLog.setOrderId(workOrder.getId()+"");
+            workLog.setCreateDate(LocalDateTime.now());
         } else {
             // 通用处理
             if (workOrder == null) {
@@ -172,6 +193,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             // 行车周期cycleId必传
             workLog.setCycleId(workOrder.getCycleId());
             workLog.setNote(null);
+            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreateDate(LocalDateTime.now());
         }