1.包装查询报表

2.一次性通过率报表

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/28 14:24 下午
+ * @Description: 一次性通过率占比柏拉图报表model
+ **/
+@Api("一次性通过率占比柏拉图报表model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProduceDispPassPlatoModel {
+
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+    @ApiParam("单项占比")
+    private BigDecimal singleRatio;
+
+    @ApiParam("累计占比")
+    private BigDecimal cumulativeRatio;
+
+    @ApiParam("缺陷数量")
+    private BigDecimal defectQty;
+
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/28 14:18 下午
+ * @Description: 一次性通过率占比柏拉图报表查询参数model
+ **/
+@Api("一次性通过率占比柏拉图报表查询参数model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProduceDispPassPlatoQueryModel {
+    /**
+     * 必选
+     */
+
+    @ApiParam("工序")
+    private String processCode;
+
+    @ApiParam("统计方式")
+    private Integer statisticalPlacer;
+    /**
+     * 可选
+     */
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+}

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model;
+package cn.estsh.i3plus.pojo.mes.model.report;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -11,11 +11,11 @@ import java.math.BigDecimal;
 /**
  * @Author: xiangming.liao
  * @CreateDate: 2020/12/22 14:38 下午
- * @Description: 每个月的冻结数、报废数、生产总数返回model
+ * @Description: 每个月/天的冻结数、报废数、生产总数、占比回model
  **/
-@Api("每个月的冻结数、报废数、生产总数返回model")
+@Api("每个月/天的冻结数、报废数、生产总数、占比返回model")
 @Data
-public class MesProduceSnDisposableModel {
+public class ProduceDispPassRateModel {
     @ApiParam("统计时间")
     private String statisticalTime;
 
@@ -37,7 +37,7 @@ public class MesProduceSnDisposableModel {
     @ApiParam("占比率")
     private BigDecimal ratio;
 
-    public MesProduceSnDisposableModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
+    public ProduceDispPassRateModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
         this.statisticalTime = statisticalTime;
         this.qcStatus = qcStatus;
         this.statisticalOption = statisticalOption;
@@ -47,6 +47,6 @@ public class MesProduceSnDisposableModel {
         this.ratio = ratio;
     }
 
-    public MesProduceSnDisposableModel() {
+    public ProduceDispPassRateModel() {
     }
 }

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model;
+package cn.estsh.i3plus.pojo.mes.model.report;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class MesProduceSnDisposableQueryModel {
+public class ProduceDispPassRateQueryModel {
     /**
      * 必选
      */
@@ -40,12 +40,6 @@ public class MesProduceSnDisposableQueryModel {
     @ApiParam("零件号")
     private List<String> partNoList;
 
-    @ApiParam("账号/工号")
-    private String userLoginName;
-
-    @ApiParam("姓名")
-    private String userName;
-
     @ApiParam("开始时间")
     private String modifyStartDate;