Selaa lähdekoodia

作业状态,车辆状态提交

guoyong 4 vuotta sitten
vanhempi
commit
41a41fd5d1

+ 1 - 1
src/main/java/com/aoyang/tms/common/WorkOrderEnum.java

@@ -35,7 +35,7 @@ public enum WorkOrderEnum {
     CLOSED(50, "已关闭"),
 
     //已取消
-    CONCELED(10, "已取消");
+    CONCELED(60, "已取消");
 
 
     private Integer orderStatus;

+ 4 - 5
src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -45,9 +45,6 @@ public class WorkerInfo {
     @ApiModelProperty(value = "挂车车牌号")
     private String trailerCarNumber;
 
-    @ApiModelProperty(value = "车辆状态")
-    private Integer truckStatus;
-
     @ApiModelProperty(value = "位置经度")
     private String longitude;
 
@@ -57,9 +54,11 @@ public class WorkerInfo {
     @ApiModelProperty(value = "位置时间")
     private String localTime;
 
-    @ApiModelProperty(value = "作业状态")
-    private int workStatus;
+    @ApiModelProperty(value = "订单状态,待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已取消60")
+    private int orderStatus;
 
+    @ApiModelProperty(value = "车辆状态,已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
+    private Integer truckStatus;
 
 
 }