From 4ec01b61f7982cc71a20c1a13882b6d6913a5c51 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Mon, 21 Dec 2020 18:50:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8+=E5=85=A8=E5=B7=A5=E5=BA=8F=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=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/report/DefectRecordModel.java | 44 +++++++++++++ .../pojo/mes/model/report/PackageTravelModel.java | 76 ++++++++++++++++++++++ .../model/report/ProcessScrapRateQueryModel.java | 42 ++++++++++++ .../pojo/mes/model/report/ProductSnModel.java | 60 +++++++++++++++++ .../mes/model/report/ProductSnTravelModel.java | 62 ++++++++++++++++++ 5 files changed, 284 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java new file mode 100644 index 0000000..62fef81 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.io.Serializable; + +/** + * 产品履历报表-缺陷信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +public class DefectRecordModel implements Serializable { + + private static final long serialVersionUID = 4994719388513997046L; + + + @ApiParam("不良处理类型") + private Integer defectActionType; + + @ApiParam("不良处理类型Name") + private String defectActionTypeName; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("缺陷位置") + private String defectLocationName; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java new file mode 100644 index 0000000..926172c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-料箱信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 17:16 + **/ +@Data +public class PackageTravelModel implements Serializable { + + private static final long serialVersionUID = -7031472442162953544L; + + + + + @ApiParam("过程条码") + + private String serialNumber; + + @ApiParam("料箱编号") + private String ctNo; + + @ApiParam("包装号") + private String packageNo; + + @ApiParam("料箱类型") + private String cnCode; + + @ApiParam("料箱状态") + private String useStatus; + + @ApiParam("料箱状态Name") + private String useStatusName; + + @ApiParam("物料码") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工序信息") + private String processCode; + + @ApiParam("执行动作") + private Integer opType; + + @ApiParam("执行动作Name") + private String opTypeName; + + + @ApiParam("执行时间") + private String createDatetime; + + public PackageTravelModel(String serialNumber, String ctNo, String packageNo, String cnCode, String useStatus, String partNo, String partNameRdd, String workCenterCode, String processCode, Integer opType, String createDatetime) { + this.serialNumber = serialNumber; + this.ctNo = ctNo; + this.packageNo = packageNo; + this.cnCode = cnCode; + this.useStatus = useStatus; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.processCode = processCode; + this.opType = opType; + this.createDatetime = createDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java new file mode 100644 index 0000000..00746fd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * 全工序报废率-查询条件-model + * @author yumingxing + * @version 1.0 + * @date 2020/12/21 10:10 + **/ +@Data +public class ProcessScrapRateQueryModel { + + @ApiParam("工序") + private List processCodeList; + + @ApiParam("项目号") + private List prodCfgTypeCodeList; + + /** + * 零件号取物料号 + */ + @ApiParam("零件号") + private List partNoList; + + @ApiParam("开始日期") + private String modifyStartDate; + + @ApiParam("结束日期") + private String modifyEndDate; + + @ApiParam("账号") + private String userLoginName; + + @ApiParam("姓名") + private String userNameRdd; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java new file mode 100644 index 0000000..2a6ed2b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-产品信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +public class ProductSnModel implements Serializable { + + private static final long serialVersionUID = 5217363746963291483L; + + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("条码状态") + private Integer snStatus; + + @ApiParam("条码状态Name") + private String snStatusName; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("质量状态Name") + private String qcStatusName; + + @ApiParam("物料码") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("当前工序") + private String processCode; + + @ApiParam("条码类型") + private String snType; + + @ApiParam("条码类型Name") + private String snTypeName; + + + @ApiParam(value = "执行时间") + public String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java new file mode 100644 index 0000000..2109368 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-过程信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +public class ProductSnTravelModel implements Serializable { + + private static final long serialVersionUID = 6720300188491659067L; + + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("条码状态") + private Integer snStatus; + + @ApiParam("条码状态Name") + private String snStatusName; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("质量状态Name") + private String qcStatusName; + + @ApiParam("物料码") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("当前工序") + private String processCode; + + @ApiParam("当前工序") + private String nextProcessCode; + + @ApiParam("条码类型") + private Integer snType; + + @ApiParam("条码类型Name") + private String snTypeName; + + @ApiParam(value = "执行时间") + public String modifyDatetime; + +} From 13ca332c4bb34333acd691273969823cd2e86039 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Tue, 22 Dec 2020 18:11:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8+=E5=85=A8=E5=B7=A5=E5=BA=8F=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/report/ProcessModel.java | 25 ++++++++++++++++ .../pojo/mes/model/report/ProcessScrapRate.java | 35 ++++++++++++++++++++++ .../model/report/ProcessScrapRateQueryModel.java | 3 +- .../pojo/mes/model/report/ProductSnModel.java | 2 +- .../pojo/mes/model/report/UserQueryModel.java | 22 ++++++++++++++ 5 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java new file mode 100644 index 0000000..d24fad0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 工序代码+工序名称 实体类 + * @author yumingxing + * @version 1.0 + * @date 2020/12/22 16:56 + **/ +@Data +public class ProcessModel implements Serializable { + + + private static final long serialVersionUID = -6653836427174801385L; + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("工序名称") + private String processName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java new file mode 100644 index 0000000..e405321 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 全工序报废率-查询条件-model + * @author yumingxing + * @version 1.0 + * @date 2020/12/21 10:10 + **/ +@Data +@NoArgsConstructor +public class ProcessScrapRate { + + @ApiParam("工序") + private String processCode; + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("报废率") + private String scrapRate; + + + public ProcessScrapRate(String processCode, String prodCfgTypeCode, String workCellCode) { + this.processCode = processCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.workCellCode = workCellCode; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java index 00746fd..4a21371 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.mes.model.report; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -37,6 +36,6 @@ public class ProcessScrapRateQueryModel { private String userLoginName; @ApiParam("姓名") - private String userNameRdd; + private String userName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index 2a6ed2b..b722e09 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -48,7 +48,7 @@ public class ProductSnModel implements Serializable { private String processCode; @ApiParam("条码类型") - private String snType; + private Integer snType; @ApiParam("条码类型Name") private String snTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java new file mode 100644 index 0000000..be54cc9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author yumingxing + * @version 1.0 + * @date 2020/12/22 10:51 + **/ +@Data +public class UserQueryModel implements Serializable { + + @ApiParam("账号") + private String userLoginName; + @ApiParam("姓名") + private String userName; + + +} From 6b443a7d04a067c7234bc84a8a9dc8ed9d4df406 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Tue, 22 Dec 2020 18:37:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8+=E5=85=A8=E5=B7=A5=E5=BA=8F=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=8E=87=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/model/report/DefectRecordModel.java | 5 ++--- .../cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java | 4 +++- .../i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java | 2 ++ .../cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java | 3 +++ 8 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java index 62fef81..c02fbb2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java @@ -1,11 +1,9 @@ package cn.estsh.i3plus.pojo.mes.model.report; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.io.Serializable; /** @@ -15,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/18 15:16 **/ @Data +@ApiModel("产品履历报表-缺陷信息") public class DefectRecordModel implements Serializable { private static final long serialVersionUID = 4994719388513997046L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java index 926172c..14e0e68 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/18 17:16 **/ @Data +@ApiModel("产品履历报表-料箱信息") public class PackageTravelModel implements Serializable { private static final long serialVersionUID = -7031472442162953544L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java index d24fad0..8a0d44b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/22 16:56 **/ @Data +@ApiModel("工序代码+工序名称") public class ProcessModel implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java index e405321..c9afc65 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java @@ -1,17 +1,19 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.NoArgsConstructor; /** - * 全工序报废率-查询条件-model + * 全工序报废率-查询结果-model * @author yumingxing * @version 1.0 * @date 2020/12/21 10:10 **/ @Data @NoArgsConstructor +@ApiModel("全工序报废率-查询结果") public class ProcessScrapRate { @ApiParam("工序") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java index 4a21371..c584d30 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.util.List; * @date 2020/12/21 10:10 **/ @Data +@ApiModel("全工序报废率-查询条件") public class ProcessScrapRateQueryModel { @ApiParam("工序") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index b722e09..a58c651 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/18 15:16 **/ @Data +@ApiModel("产品履历报表-产品信息") public class ProductSnModel implements Serializable { private static final long serialVersionUID = 5217363746963291483L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java index 2109368..41b06c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/18 15:16 **/ @Data +@ApiModel("产品履历报表-过程信息") public class ProductSnTravelModel implements Serializable { private static final long serialVersionUID = 6720300188491659067L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java index be54cc9..6ab47bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java @@ -1,16 +1,19 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; /** + * 用户查询-账号+姓名 * @author yumingxing * @version 1.0 * @date 2020/12/22 10:51 **/ @Data +@ApiModel("用户查询-账号+姓名") public class UserQueryModel implements Serializable { @ApiParam("账号") From 1bebe59cc2e08b1e39417fc73cf38a9aec504094 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Thu, 24 Dec 2020 09:08:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8+=E5=85=A8=E5=B7=A5=E5=BA=8F=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=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/report/ProcessScrapRate.java | 4 +++- .../pojo/mes/model/report/ScrapOfPlatoModel.java | 26 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java index c9afc65..9589f43 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; + /** * 全工序报废率-查询结果-model * @author yumingxing @@ -26,7 +28,7 @@ public class ProcessScrapRate { private String workCellCode; @ApiParam("报废率") - private String scrapRate; + private BigDecimal scrapRate; public ProcessScrapRate(String processCode, String prodCfgTypeCode, String workCellCode) { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java new file mode 100644 index 0000000..de4cdfe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * 报废占比柏拉图Model + * @author yumingxing + * @version 1.0 + * @date 2020/12/23 15:09 + **/ +@Data +public class ScrapOfPlatoModel { + + @ApiParam("缺陷数") + private String numberOfDefects; + @ApiParam("缺陷类型") + private String defectType; + @ApiParam("缺陷类型名称") + private String defectTypeName; + @ApiParam("项目") + private String prodCfgTypeCode; + @ApiParam("零件号") + private String partNo; + +}