@@ -47,4 +47,7 @@ public class WorkOrderPageListVO {
@ApiModelProperty(value = "已读未读信息")
private List<ReadInfo> readInfos;
+ @ApiModelProperty(value = "(操作可能需要此状态)运单状态:待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已报废60")
+ private Integer orderStatus;
+
}
@@ -240,6 +240,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
workOrderPageListVO.setSpotName(workOrder.getSpotName());
workOrderPageListVO.setCreateDate(workOrder.getCreateDate());
workOrderPageListVO.setCompleteDate(workOrder.getCompleteTime());
+ workOrderPageListVO.setOrderStatus(workOrder.getOrderStatus());
workOrderPageListVO.setCarAndTrailerNumber("[" + workOrder.getCarNumber() + "]");
if (workOrder.getTrailerNumber() != null) {
workOrderPageListVO.setCarAndTrailerNumber(workOrderPageListVO.getCarAndTrailerNumber() + "-[" + workOrder.getTrailerNumber() + "]");