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

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -13,7 +14,7 @@ import java.util.Map;
  * @Modify:
  */
 @Data
-public class BiModel {
+public class BiModel implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
@@ -30,7 +31,7 @@ public class BiModel {
     private String partName;
 
     @ApiParam(value = "计划数量")
-    private double planQty;
+    private double planQty = 0;
 
     @ApiParam(value = "合格数量")
     private double passQty = 0;
@@ -92,6 +93,11 @@ public class BiModel {
     @ApiParam("末检")
     private Integer endCheck;//首件、30中件、40末件
 
+    private double qty;
+
+    @ApiParam("比率")
+    private double rate;
+
     @ApiParam("x坐标内容")
     private List<String> xAxis;
 
@@ -103,4 +109,11 @@ public class BiModel {
 
     @ApiParam("列名")
     private Map<String, String> colMap;
+
+    public BiModel() {}
+
+    public BiModel(Double qty, String partNo) {
+        this.qty = qty;
+        this.partNo = partNo;
+    }
 }