Merge branch 'dev' of xiangming.liao/i3plus-pojo into dev

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

@@ -21,18 +21,37 @@ import java.util.List;
 public class ProduceDispPassPlatoModel {
 
     @ApiParam("项目号")
-    private List<String> prodCfgTypeCodeList;
+    private String prodCfgTypeCode;
 
     @ApiParam("零件号")
-    private List<String> partNoList;
+    private String partNo;
 
-    @ApiParam("单项占比")
-    private BigDecimal singleRatio;
+    @ApiParam("缺陷代码")
+    private String defectCode;
 
-    @ApiParam("累计占比")
-    private BigDecimal cumulativeRatio;
+    @ApiParam("缺陷名称")
+    private String defectName;
 
-    @ApiParam("缺陷数量")
-    private BigDecimal defectQty;
+    @ApiParam("单项占比")
+    private Double singleRatio;
 
+    @ApiParam("累计占比")
+    private Double cumulativeRatio;
+
+    @ApiParam("数量")
+    private Long qty;
+
+    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, String defectCode, String defectName, Long qty) {
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.partNo = partNo;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.qty = qty;
+    }
+
+    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, Long qty) {
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.partNo = partNo;
+        this.qty = qty;
+    }
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model.report;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -17,7 +18,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProduceDispPassPlatoQueryModel {
+public class ProduceDispPassPlatoQueryModel extends BaseBean {
     /**
      * 必选
      */
@@ -25,8 +26,9 @@ public class ProduceDispPassPlatoQueryModel {
     @ApiParam("工序")
     private String processCode;
 
-    @ApiParam("统计方式")
-    private Integer statisticalPlacer;
+    //质量状态（20冻结，30报废）
+    @ApiParam("质量状态")
+    private List<Integer> qcStatusList;
     /**
      * 可选
      */
@@ -36,6 +38,10 @@ public class ProduceDispPassPlatoQueryModel {
     @ApiParam("零件号")
     private List<String> partNoList;
 
+    //统计方式（0按月，1按天）
+    @ApiParam("统计方式")
+    private Integer statisticalPlacer;
+
     @ApiParam("开始时间")
     private String modifyStartDate;
 

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

@@ -19,11 +19,9 @@ public class ProduceDispPassRateModel {
     @ApiParam("统计时间")
     private String statisticalTime;
 
-    @ApiParam("质量状态/类型")
-    private Integer qcStatus;
-
+    //统计选项（10=全部，20=冻结，30=报废）
     @ApiParam("统计选项")
-    private String statisticalOption;
+    private Integer statisticalOption;
 
     @ApiParam("冻结数")
     private BigDecimal freezeQty;
@@ -37,9 +35,8 @@ public class ProduceDispPassRateModel {
     @ApiParam("占比率")
     private BigDecimal ratio;
 
-    public ProduceDispPassRateModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
+    public ProduceDispPassRateModel(String statisticalTime, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
         this.statisticalTime = statisticalTime;
-        this.qcStatus = qcStatus;
         this.statisticalOption = statisticalOption;
         this.freezeQty = freezeQty;
         this.scrapQty = scrapQty;

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

@@ -25,11 +25,20 @@ public class ProduceDispPassRateQueryModel {
     @ApiParam("工序")
     private String processCode;
 
+    //统计方式（0=按月，1按天）
     @ApiParam("统计方式")
-    private Integer statisticalPlacer;
+    private Integer statisticalMethod;
 
+    //质量状态（10=合格，20=冻结，30=报废）
     @ApiParam("质量类型")
-    private String qcStatus;
+    private Integer qcStatus;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+
 
     /**
      * 可选
@@ -40,10 +49,5 @@ public class ProduceDispPassRateQueryModel {
     @ApiParam("零件号")
     private List<String> partNoList;
 
-    @ApiParam("开始时间")
-    private String modifyStartDate;
-
-    @ApiParam("结束时间")
-    private String modifyEndDate;
 
 }