Merge branch 'dev' of jessica.chen/i3plus-pojo into dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java

@@ -72,19 +72,17 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
-    @Column(name = "PPT_CODE")
-    @ApiParam("产品生产类型")
+@Column(name = "产品生产类型")
+    @ApiParam("产品类型名称")
     private String pptCode;
 
-    @Column(name = "QUEUE_GROUP_NO")
+   @Column(name = "QUEUE_GROUP_NO")
     @ApiParam("分组队列编号")
     private String queueGroupNo;
 
     @Column(name = "GROUP_NO")
     @ApiParam("组内编号")
-    private Integer groupNo;
-
-    @Transient
+    private Integer groupNo;    @Transient
     @ApiParam("队列序号")
     private Double queueSeq;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -79,6 +80,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
+    @ApiParam("生产主队列编号")
+    private String orderNo;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +