Merge remote-tracking branch 'remotes/origin/master' into test

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

@@ -75,6 +75,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("节拍")
     private Integer planTakt;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

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

@@ -21,6 +21,12 @@ public class ProductBiModel {
     @ApiParam("工作中心名称")
     private String workCenterName;
 
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
     @ApiParam("生产区域代码")
     private String areaCode;
 
@@ -63,6 +69,18 @@ public class ProductBiModel {
     @ApiParam("客户名称")
     private String customerName;
 
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("总页数")
+    private Integer totalPage;
+
+    @ApiParam("开启工单标识")
+    private Integer opWoFlag = 2;
+
+    @ApiParam("工位序号")
+    private Integer workCellSeq;
+
     @ApiParam("x坐标内容")
     private List<String> xAxis;