From 747312eaa32b60ed13d50ce2c32a4d424b647f23 Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Mon, 28 Dec 2020 15:33:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8C=85=E8=A3=85=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=202.=E4=B8=80=E6=AC=A1=E6=80=A7=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/report/ProduceDispPassPlatoModel.java | 38 +++++++++++++++++++ .../report/ProduceDispPassPlatoQueryModel.java | 44 ++++++++++++++++++++++ .../ProduceDispPassRateModel.java} | 12 +++--- .../ProduceDispPassRateQueryModel.java} | 10 +---- 4 files changed, 90 insertions(+), 14 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesProduceSnDisposableModel.java => report/ProduceDispPassRateModel.java} (67%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesProduceSnDisposableQueryModel.java => report/ProduceDispPassRateQueryModel.java} (81%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java new file mode 100644 index 0000000..ca3ec40 --- /dev/null +++ b/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 prodCfgTypeCodeList; + + @ApiParam("零件号") + private List partNoList; + + @ApiParam("单项占比") + private BigDecimal singleRatio; + + @ApiParam("累计占比") + private BigDecimal cumulativeRatio; + + @ApiParam("缺陷数量") + private BigDecimal defectQty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java new file mode 100644 index 0000000..806e221 --- /dev/null +++ b/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 prodCfgTypeCodeList; + + @ApiParam("零件号") + private List partNoList; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java similarity index 67% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java index 0b444ce..d27e146 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java +++ b/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() { } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java similarity index 81% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java index a391502..ed9dd7b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java +++ b/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 partNoList; - @ApiParam("账号/工号") - private String userLoginName; - - @ApiParam("姓名") - private String userName; - @ApiParam("开始时间") private String modifyStartDate;