From a880160f3d57665249d517aeabb9eb912a1d45f0 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Fri, 25 Oct 2019 10:28:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E3=80=91bug=206104?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index ac86f7e..b55e892 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -30,12 +30,12 @@ public class WmsInterfaceDataMapper extends BaseBean { * 排序编号 */ @Column(name = "SEQ") - public int seq; + public Integer seq; /** * 来源表的每次查询记录数，防止大量数据造成内存溢出 */ @Column(name = "SRC_GET_LIMIT") - public int srcGetLimit; + public Integer srcGetLimit; /** * 接口数据源编号（在动态表单中配置） */ @@ -132,23 +132,23 @@ public class WmsInterfaceDataMapper extends BaseBean { * 调用脚本方法获取数据 */ @Column(name = "USE_SCRIPT_PULL") - public int useScriptPull; + public Integer useScriptPull; /** * 调用脚本方法保存数据 */ - @Column(name = "USE_SCRIPT_PUSH") - public int useScriptPush; + @Column(name = "USE_SCRIPT_PUSH") + public Integer useScriptPush; /** * 调用脚本方法更新同步标志 */ @Column(name = "USE_SCRIPT_MARK") - public int useScriptMark; + public Integer useScriptMark; /** * 调用脚本方法过滤数据（查询来源数据后过滤） */ @Column(name = "USE_SCRIPT_FILTER") - public int useScriptFilter; + public Integer useScriptFilter; } From 00e849a62edbd9e6a7350a256874ca97e17d4613 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 25 Oct 2019 20:00:06 +0800 Subject: [PATCH 2/7] =?UTF-8?q?(1089=20=E8=BF=87=E7=A8=8B=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=9B1090=20=E8=BF=94=E5=8E=82=E8=BF=94=E4=BF=AE=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 189 +++++++++++++++++++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 162 ++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 10 ++ .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 7 +- .../pojo/mes/pcn/bean/MesDismantleRecord.java | 2 +- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 2 +- .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 16 +- .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 4 +- .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 2 +- .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 31 ++++ .../i3plus/pojo/mes/pcn/model/MesPartBomModel.java | 36 ---- .../pojo/mes/pcn/model/MesProcessBomModel.java | 61 +++++++ .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 59 +++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesRepair.java | 2 +- .../i3plus/pojo/mes/bean/MesRepairRecord.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 2 +- 19 files changed, 526 insertions(+), 67 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 15ae3e1..1d8aa2a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,159 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes 图片面位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_SIDE_LOCATION { + + A_SIDE(10, "A面"), + B_SIDE(20, "B面"), + C_SIDE(30, "C面"), + D_SIDE(40, "D面"); + + private int value; + private String description; + + MES_SIDE_LOCATION(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes缺陷类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_TYPE { + + DEFECT_TYPE1(10, "缺陷类型1"), + DEFECT_TYPE2(20, "缺陷类型2"), + DEFECT_TYPE3(30, "缺陷类型3"); + + private int value; + private String description; + + MES_DEFECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes类型信息，业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_TYPE_CFG_BUSIN_TYPE { + + BUSIN_TYPE1(10, "业务类型1"), + BUSIN_TYPE2(20, "业务类型2"), + BUSIN_TYPE3(30, "业务类型3"); + + private int value; + private String description; + + MES_TYPE_CFG_BUSIN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes缺陷原因类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_CAUSE_TYPE { + + QUALITY_DEFECTS(10, "质量缺陷"), + PROCESS_DEFECTS(20, "工艺缺陷"), + EQUIPMENT_DEFECT(30, "设备缺陷"); + + private int value; + private String description; + + MES_DEFECT_CAUSE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes设备作业任务明细-执行状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -452,8 +605,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_WORK_CELL_TYPE { - NORMAL(1, "正常"), - REWORK(2, "返修"); + NORMAL(10, "正常"), + REWORK(20, "返修"); private int value; private String description; @@ -500,8 +653,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_TYPE { - BIND(1, "绑定"), - UNTYING(2, "解绑"); + BIND(10, "绑定"), + UNTYING(20, "解绑"); private int value; private String description; @@ -548,8 +701,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_IS_KEY { - IS_KEY(1, "是"), - NO_KEY(2, "否"); + IS_KEY(10, "是"), + NO_KEY(20, "否"); private int value; private String description; @@ -596,8 +749,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_REPAIR_STATUS { - REPAIRED(1, "已维修"), - NO_REPAIR(2, "待维修"); + REPAIRED(10, "已维修"), + NO_REPAIR(20, "待维修"); private int value; private String description; @@ -644,11 +797,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_OPERATE_TYPE { - WORKSTATION_SCAN(1, "工位扫描"), - QUALITY_JUDGEMENT(2, "质量判定"), - MATERIAL_DISMANTLING(3, "物料拆解"), - REWORK(4, "返修作业"), - WORKSTATION_MONITORING(5, "工位监控"); + WORKSTATION_SCAN(10, "工位扫描"), + QUALITY_JUDGEMENT(20, "质量判定"), + MATERIAL_DISMANTLING(30, "物料拆解"), + REWORK(40, "返修作业"), + WORKSTATION_MONITORING(50, "工位监控"); private int value; private String description; @@ -1323,9 +1476,7 @@ public class MesEnumUtil { public enum PASS_FAIL { PASS(1, "合格"), - FAIL(2, "不合格"), - SCRAP(3, "报废"), - DISMANTLED(4, "已拆解"); + FAIL(2, "不合格"); private int value; private String description; @@ -1796,7 +1947,8 @@ public class MesEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), - SCRAPED(30, "报废"); + SCRAPED(30, "报废"), + DISMANTLED(40, "已拆解"); private int value; private String description; @@ -2104,7 +2256,8 @@ public class MesEnumUtil { UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"), PCN_PULL(60, "PCN_PULL"), PCN_PUSH(70, "PCN_PUSH"), - FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"); + FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"), + REWORK_REPAIR(90, "REWORK_REPAIR"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 34ce4d8..c6a96dc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,6 +13,168 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * mes缺陷原因类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_CAUSE_TYPE { + + QUALITY_DEFECTS(10, "质量缺陷"), + PROCESS_DEFECTS(20, "工艺缺陷"), + EQUIPMENT_DEFECT(30, "设备缺陷"); + + private int value; + private String description; + + MES_DEFECT_CAUSE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + + /** + * mes 图片面位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_SIDE_LOCATION { + + A_SIDE(10, "A面"), + B_SIDE(20, "B面"), + C_SIDE(30, "C面"), + D_SIDE(40, "D面"); + + private int value; + private String description; + + MES_SIDE_LOCATION(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes 维修状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_REPAIR_STATUS { + + REPAIRED(10, "已维修"), + NO_REPAIR(20, "待维修"); + + private int value; + private String description; + + MES_REPAIR_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes过程质量检测类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_CHECK_TYPE { + + FIRST_CHECK(10, "首检"), + ON_SITE_CHECK(20, "巡检"), + END_CHECK(30, "尾检"); + + private int value; + private String description; + + MES_QC_CHECK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * mes-pcn定时任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java index 09d4d3d..fa5a461 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -39,4 +41,12 @@ public class MesDefect extends BaseBean { @Column(name = "DEFECT_TYPE") @ApiParam("缺陷类型") private String defectType; + + @Transient + @ApiParam("缺陷位置") + private String defectLocation; + + @Transient + @ApiParam("缺陷类型子集") + private List mesDefectList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 72d0b14..53f4b36 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -49,7 +51,7 @@ public class MesDefectRecord extends BaseBean { @Column(name="DEFECT_LOCATION") @ApiParam("缺陷位置") - private Integer defectLocation; + private String defectLocation; @Column(name="REPAIR_STATUS") @ApiParam("维修状态") @@ -66,4 +68,7 @@ public class MesDefectRecord extends BaseBean { @Column(name="MEMO") @ApiParam("备注") private String memo; + + @Transient + private List mesDefectList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index a114b7a..2775754 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -82,5 +82,5 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index d708cb3..abb7861 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -87,7 +87,7 @@ public class MesProdBindRecord extends BaseBean { @Column(name = "IS_KEY") @ApiParam(value = "是否关键件") - private String isKey; + private Integer isKey; @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 43d8681..26bccb6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -80,7 +80,7 @@ public class MesQcCheckData extends BaseBean { @Column(name = "QTY") @ApiParam("产品数量") - private String qty; + private Integer qty; @Column(name = "MEMO") @ApiParam("备注") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java index 77c5220..9753ac8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java @@ -34,7 +34,7 @@ public class MesRepair extends BaseBean { @Column(name = "REPAIR_NAME") @ApiParam("维修名称") - private String repariName; + private String repairName; @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java index a3ce644..92c37be 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -82,5 +84,17 @@ public class MesRepairRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; + + @Transient + @ApiParam("备注") + private String spareMemo; + + @Transient + @ApiParam("不良记录id") + private Long defectRecordId; + + @Transient + @ApiParam("缺陷集合") + private List mesDefectList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index e83ca89..2c60f7a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -46,7 +46,7 @@ public class MesScrapRecord extends BaseBean { @Column(name = "SCRAP_CODE") @ApiParam("报废代码") - private String repairCode; + private String scrapCode; @Column(name = "SCRAP_NAME") @ApiParam("报废名称") @@ -66,5 +66,5 @@ public class MesScrapRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java index 753c9cb..efcf8fd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java @@ -45,5 +45,5 @@ public class MesWorkCell extends BaseBean { @Column(name = "WORK_CELL_TYPE") @ApiParam("工位类型") - private String workCellType; + private Integer workCellType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java new file mode 100644 index 0000000..b9acba1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesDefectModel { + + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @Transient + @ApiParam("缺陷分类子集") + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java deleted file mode 100644 index 0f0fccd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\18 19:15 - * @Modify: - **/ -@Data -@Api("mes 物料BOM") -public class MesPartBomModel { - - @ApiParam("物料编号") - private String partNo; - - @ApiParam("物料名称") - private String partName; - - @ApiParam("数量") - private Integer qty; - - public MesPartBomModel() { - - } - - public MesPartBomModel(String partNo, String partName, Integer qty) { - this.partNo = partNo; - this.partName = partName; - this.qty = qty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java new file mode 100644 index 0000000..11940aa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesProcessBomModel { + + private Long id; + @ApiParam("子物料编码") + private String itemPartNo; + @ApiParam("子物料名称") + private String itemPartName; + @ApiParam("产品数量") + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + + public MesProcessBomModel() { + + } + + public MesProcessBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java new file mode 100644 index 0000000..9dece32 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:05 + * @Modify: + **/ +@Data +public class MesProdBindRecordModel { + private Long id; + private String itemPartNo; + private String itemPartName; + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + private String kpSn; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + public MesProdBindRecordModel() { + + } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.dismantleQty = dismantleQty; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java index 98709ec..08f1544 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java @@ -38,5 +38,5 @@ public class MesRepair extends BaseBean { @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") - private Integer repairType; + private String repairType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index ba6331c..5e3e15f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -82,5 +82,5 @@ public class MesRepairRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 4dd7e2c..22086da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -62,5 +62,5 @@ public class MesScrapRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 68ef0b4..b0992b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -49,7 +49,7 @@ public class MesWorkCell extends BaseBean { @Column(name = "WORK_CELL_TYPE") @ApiParam("工位类型") - private String workCellType; + private Integer workCellType; @Transient @ApiParam(value = "子集列表") From d87d81e34ab8c8b30fb57942f02bb3966f3f8e78 Mon Sep 17 00:00:00 2001 From: jiajack Date: Sat, 26 Oct 2019 11:14:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E4=BA=A7=E7=BA=BF=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=83=85=E5=86=B5=E3=80=91-BI=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ProductBiModel.java | 77 ++++++++++++++++++++++ .../pojo/mes/model/ProductBiSeriesModel.java | 24 +++++++ 2 files changed, 101 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java new file mode 100644 index 0000000..a7a613f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 用于产线运行情况数据 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +public class ProductBiModel { + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("生产区域代码") + private String areaCode; + + @ApiParam("运行状态") + private Integer runningStatus; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "计划数量") + private double planQty; + + @ApiParam(value = "产量") + private double outputQty; + + @ApiParam(value = "完成率") + private double CompleteRate; + + @ApiParam(value = "合格数量") + private double passQty; + + @ApiParam(value = "不良数量") + private double ngQty; + + @ApiParam(value = "合格率") + private double passRate; + + @ApiParam(value = "不良率") + private double ngRate; + + @ApiParam("客户代码") + private String customerCode; + + @ApiParam("客户名称") + private String customerName; + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("图表显示的数据") + private List series; + + public double getCompleteRate() { + if(this.planQty != 0) { + this.CompleteRate = outputQty / planQty; + } else { + this.CompleteRate = 0; + } + return this.CompleteRate; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java new file mode 100644 index 0000000..d7b15f8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 用于产线运行情况数据 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +public class ProductBiSeriesModel { + @ApiParam("名称") + private String name; + @ApiParam("类型") + private String type; + @ApiParam("显示的数据") + private List data; +} From aef7f7a9480c2e50d749162d9a0efb82c2dc7a5d Mon Sep 17 00:00:00 2001 From: jiajack Date: Sat, 26 Oct 2019 11:15:34 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java index 37adc09..577fa77 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java @@ -47,4 +47,16 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private Double workTimes; + + @Column(name="SHIFT_SEQ") + @ApiParam("班次顺序") + private Integer shiftSeq; + + public int getShiftSeqVal() { + return this.shiftSeq == null ? 0 : this.shiftSeq; + } + + public double getWorkTimesVal() { + return this.workTimes == null ? 0.0d : this.workTimes; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 9c4f50a..0eb9772 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -47,4 +47,16 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private Double workTimes; + + @Column(name="SHIFT_SEQ") + @ApiParam("班次顺序") + private Integer shiftSeq; + + public int getShiftSeqVal() { + return this.shiftSeq == null ? 0 : this.shiftSeq; + } + + public double getWorkTimesVal() { + return this.workTimes == null ? 0.0d : this.workTimes; + } } From 9bdae2ad135507ef26bd453793e75844d0afd0b3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 26 Oct 2019 13:35:57 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1086?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 651fd4d..82bb4aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -58,6 +58,10 @@ public class MesEquTaskStandardRecord extends BaseBean { @ApiParam("操作指导") private String actionGuide; + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + @Column(name = "CHECK_RESULT") @ApiParam("判定结果") private Integer checkResult; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java index e26b0c3..49202fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java @@ -32,7 +32,7 @@ import java.util.List; public class EquTaskNotifyUserModel extends BaseBean { @ApiParam(value ="账户ID") - private Long userId; + private Long userInfoId; @Column(name="USER_NAME_RDD") @ApiParam(value ="用户名称" , access ="账号名称") From 8d10a46953ea9c06f6194531d276d1e462718a9b Mon Sep 17 00:00:00 2001 From: jokelone Date: Sat, 26 Oct 2019 16:57:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?(1092=20MesProdBindRecordModel=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9C=89=E5=8F=82=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java index 9dece32..aaa7497 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -56,4 +56,20 @@ public class MesProdBindRecordModel { this.parentPartName = parentPartName; this.dismantleQty = dismantleQty; } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } } From 56996126be34f7d5c3068161d157518ed754be4e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 26 Oct 2019 18:43:53 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1101?= =?UTF-8?q?=EF=BC=8Cmes=E5=90=8C=E6=AD=A5=E8=AE=BE=E5=A4=87=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E7=BB=B4=E4=BF=AE=E4=BB=BB=E5=8A=A1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++ .../i3plus/pojo/mes/model/AndonEquRepairModel.java | 86 ++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 1d8aa2a..856f7c2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -203,6 +203,43 @@ public class MesEnumUtil { } /** + * mes设备作业任务明细-判定结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_CHECK_RESULT { + + YES(10, "合格"), + NO(20, "不合格"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_CHECK_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes设备作业任务明细-整体结果 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java new file mode 100644 index 0000000..ed95336 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : mes同步设备安灯维修任务model + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes同步设备安灯维修任务model") +public class AndonEquRepairModel extends BaseBean { + + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @ApiParam(value = "工作中心代码") + public String workCenterCode; + + @ApiParam(value = "工作中心名称") + public String workCenterNameRdd; + + @ApiParam(value = "工作单元名称") + public String workCellNameRdd; + + @ApiParam(value = "工作单元代码") + public String workCellCode; + + @ApiParam(value = "设备代码") + public String equipmentCode; + + @ApiParam(value = "设备名称") + public String equipmentNameRdd; + + @ApiParam(value = "安灯状态代码") + public String statusCode; + + @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") + public String resetTime; + + @ApiParam(value = "呼叫原因代码") + public String acCode; + + @ApiParam(value = "呼叫原因描述") + public String acNameRdd; + + @ApiParam(value = "呼叫具体原因") + public String acDesc; + + @ApiParam(value = "事件原因代码") + public String ecCode; + + @ApiParam(value = "事件原因描述") + public String ecNameRdd; + + @ApiParam(value = "事件具体原因") + public String ecDesc; + + @ApiParam(value = "事件方法代码") + public String emCode; + + @ApiParam(value = "事件方法描述") + public String emNameRdd; + + @ApiParam(value = "事件具体方法") + public String emDesc; + + @ApiParam(value = "事件现象代码") + private String epmCode; + + @ApiParam(value = "事件现象描述") + private String epmNameRdd; + + @ApiParam(value = "组织名称") + private String organizeNameRdd; + +}