添加truckId

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

@@ -53,4 +53,8 @@ public class WorkOrderPageListVO {
     @ApiModelProperty(value = "中止原因")
     private String stopNote;
 
+    @ApiModelProperty(value = "分配卡车id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
 }

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

@@ -242,7 +242,7 @@ 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){
+        if (workOrder.getStopNote() != null) {
             order.setStopNote(workOrder.getStopNote());
         }
         return new Result<>(updateById(order));
@@ -300,6 +300,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             if (workOrder.getTrailerNumber() != null) {
                 workOrderPageListVO.setCarAndTrailerNumber(workOrderPageListVO.getCarAndTrailerNumber() + "-[" + workOrder.getTrailerNumber() + "]");
             }
+            if (workOrder.getTruckId() != null) {
+                workOrderPageListVO.setTruckId(workOrder.getTruckId());
+            }
             workOrderPageListVO.setTruckDeptName(workOrder.getDeptName());
 
             // TODO运单作业状态