Merge remote-tracking branch 'origin/master'

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

@@ -86,7 +86,7 @@ public class WorkOrderController {
     public Result stop(@RequestHeader(value = "userId") Long userId,
                        @RequestHeader(value = "userName") String userName,
                        @RequestBody WorkOrder param) {
-        if (param == null || param.getId() == null || param.getOrderStatus() != 60) {
+        if (param == null || param.getId() == null || param.getOrderStatus() != 60 || param.getStopNote() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
 

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

@@ -50,4 +50,7 @@ public class WorkOrderPageListVO {
     @ApiModelProperty(value = "（操作可能需要此状态）运单状态：待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已报废60")
     private Integer orderStatus;
 
+    @ApiModelProperty(value = "中止原因")
+    private String stopNote;
+
 }

src/main/java/com/aoyang/tms/entity/WorkOrder.java

@@ -236,6 +236,11 @@ public class WorkOrder implements Serializable {
     @TableField("settle_trip")
     private Integer settleTrip;
 
+    @ApiModelProperty(value = "中止原因")
+    @TableField("stop_note")
+    private String stopNote;
+
+
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")
     @JsonFormat(shape = JsonFormat.Shape.STRING)

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

@@ -242,6 +242,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         order.setOrderStatus(WorkOrderEnum.CONCELED.orderStatus());
         workLogService.logWorkCycleInfo(workOrder.getType() == 1 ? WorkLogTypeEnum.LOAD_CANCELED : WorkLogTypeEnum.UNLOAD_CANCELED, workOrder);
 
+        if(workOrder.getStopNote()!=null){
+            order.setStopNote(workOrder.getStopNote());
+        }
         return new Result<>(updateById(order));
     }
 
@@ -291,6 +294,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             workOrderPageListVO.setCompleteDate(workOrder.getCompleteTime());
             workOrderPageListVO.setOrderStatus(workOrder.getOrderStatus());
             workOrderPageListVO.setCarAndTrailerNumber("[" + workOrder.getCarNumber() + "]");
+            if (workOrder.getStopNote() != null) {
+                workOrderPageListVO.setStopNote(workOrder.getStopNote());
+            }
             if (workOrder.getTrailerNumber() != null) {
                 workOrderPageListVO.setCarAndTrailerNumber(workOrderPageListVO.getCarAndTrailerNumber() + "-[" + workOrder.getTrailerNumber() + "]");
             }