From 61364e21700591e7e51cf7b0bb0fe6b5c392ab43 Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Fri, 25 Dec 2020 17:19:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 28 ++++++++++++ .../mes/model/MesProduceSnDisposableModel.java | 52 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 158ed97..75b2b57 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -246,4 +246,32 @@ public class MesPackage extends BaseBean implements Serializable { this.custCode = custCode; this.shiftGroup = shiftGroup; } + + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty,Double packSpecQty, String unit,String lotNo, String fixLotNo,String packSpec,Integer isSealed, Integer printStatus,Integer packLevel,String workOrderNo, String workCenterCode, String workCellCode,String memo, String custCode, String inLocationTime, String ctNo,String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo) { + this.packageNo = packageNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.packSpecQty=packSpecQty; + this.unit = unit; + this.lotNo=lotNo; + this.fixLotNo = fixLotNo; + this.packSpec=packSpec; + this.isSealed=isSealed; + this.printStatus = printStatus; + this.packLevel=packLevel; + this.workOrderNo=workOrderNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.memo=memo; + this.custCode = custCode; + this.inLocationTime = inLocationTime; + this.ctNo = ctNo; + this.sampleType=sampleType; + this.packageLabelTemplate = packageLabelTemplate; + this.qrCode = qrCode; + this.locationCode = locationCode; + this.erpWorkCenterCode = erpWorkCenterCode; + this.fnLocationNo = fnLocationNo; + } } 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/MesProduceSnDisposableModel.java new file mode 100644 index 0000000..0b444ce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/22 14:38 下午 + * @Description: 每个月的冻结数、报废数、生产总数返回model + **/ +@Api("每个月的冻结数、报废数、生产总数返回model") +@Data +public class MesProduceSnDisposableModel { + @ApiParam("统计时间") + private String statisticalTime; + + @ApiParam("质量状态/类型") + private Integer qcStatus; + + @ApiParam("统计选项") + private String statisticalOption; + + @ApiParam("冻结数") + private BigDecimal freezeQty; + + @ApiParam("报废数") + private BigDecimal scrapQty; + + @ApiParam("生产总数") + private BigDecimal produceSumQty; + + @ApiParam("占比率") + private BigDecimal ratio; + + public MesProduceSnDisposableModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { + this.statisticalTime = statisticalTime; + this.qcStatus = qcStatus; + this.statisticalOption = statisticalOption; + this.freezeQty = freezeQty; + this.scrapQty = scrapQty; + this.produceSumQty = produceSumQty; + this.ratio = ratio; + } + + public MesProduceSnDisposableModel() { + } +} From 5e43c3213172d7d76631ed3912125928a38dc8c3 Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Fri, 25 Dec 2020 17:28:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=8C=85=E8=A3=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=202.=E4=B8=80=E6=AC=A1=E6=80=A7=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/MesPackageQueryModel.java | 40 ++++++++++++++++ .../model/MesProduceSnDisposableQueryModel.java | 55 ++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java new file mode 100644 index 0000000..38eaaa0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPackage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/18 16:13 下午 + * @Description: 包装查询报表返回model + **/ +@Api("包装查询报表返回model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MesPackageQueryModel extends MesPackage { + @ApiParam("工序名称") + private String processName; + + @ApiParam("产线") + private String workCenterName; + + @ApiParam("工作单元名称") + private String workCellName; + + public MesPackageQueryModel(String workCenterName, String workCellName) { + this.workCenterName = workCenterName; + this.workCellName = workCellName; + } + + public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName) { + super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo); + this.processName=processName; + this.workCenterName = workCenterName; + this.workCellName = workCellName; + } +} 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/MesProduceSnDisposableQueryModel.java new file mode 100644 index 0000000..a391502 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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/23 13:38 下午 + * @Description: 一次性通过率查询参数model + **/ +@Api("一次性通过率查询参数model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MesProduceSnDisposableQueryModel { + /** + * 必选 + */ + + @ApiParam("工序") + private String processCode; + + @ApiParam("统计方式") + private Integer statisticalPlacer; + + @ApiParam("质量类型") + private String qcStatus; + + /** + * 可选 + */ + @ApiParam("项目号") + private List prodCfgTypeCodeList; + + @ApiParam("零件号") + private List partNoList; + + @ApiParam("账号/工号") + private String userLoginName; + + @ApiParam("姓名") + private String userName; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; + +} 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 3/3] =?UTF-8?q?1.=E5=8C=85=E8=A3=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=202.=E4=B8=80=E6=AC=A1=E6=80=A7=E9=80=9A?= =?UTF-8?q?=E8=BF=87=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;