diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 072df9e..3897219 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -423,4 +423,128 @@ public class PtlEnumUtil { return tmp; } } + + /** + * PCN同步PTL主数据同步类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_TYPE { + + GET_PTL_DATA(1, "pcn获取Ptl数据"), + DATA_TO_PTL(2, "pcn推送数据至ptl"); + + private int value; + private String description; + + SYNC_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; + } + } + + /** + * PCN同步PTL主数据同步方式枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_PATTERN { + + UPDATE(1, "修改"), + INSERT(2, "新增"); + + private int value; + private String description; + + SYNC_PATTERN(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; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRUE_OR_FALSE { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + TRUE_OR_FALSE(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; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e3c5ffc..cdb4071 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -12,6 +12,41 @@ import org.springframework.util.StringUtils; public class PtlPcnEnumUtil { /** + * 控制器状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_CONTROL_STATUS { + CONNECT(10, "连接"), + BREAK(20, "断开"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private PTL_CONTROL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 标签器LED数字解析枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -555,6 +590,7 @@ public class PtlPcnEnumUtil { public enum MonitorProcessMessageType { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), + EXCEPTION__DISCONNECT_CONTROL_CMD(25, "EXCEPTION__DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), @@ -607,7 +643,7 @@ public class PtlPcnEnumUtil { DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), - INIT_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); + INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); // UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), // LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), // LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); @@ -665,6 +701,7 @@ public class PtlPcnEnumUtil { WsBusiType(int value, String code, String description) { this.value = value; this.description = description; + this.code = code; } public int getValue() { @@ -739,35 +776,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PtlControlStatus { - CONNECT(10, "CONNECT", "连接"), - DISCONNECT(20, "DISCONNECT", "断开"); - - private int value; - private String code; - private String description; - - PtlControlStatus(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - } - - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SectionTaskDetailStatus { + public enum AREA_SECTION_TASK_DETAIL_STATUS { CREATE(10, "CREATE", "创建"), COMPLETE(20, "COMPLETE", "完成"); @@ -775,7 +784,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - SectionTaskDetailStatus(int value, String code, String description) { + AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -901,7 +910,7 @@ public class PtlPcnEnumUtil { * PTL_区段、区域亮灯任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum AREA_SECTION_TASKL_STATUS { + public enum AREA_SECTION_TASK_STATUS { CREATE(10, "CREATE", "新建"), RECEIPT(20, "RECEIPT", "执行中"), RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); @@ -910,7 +919,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - AREA_SECTION_TASKL_STATUS(int value, String code, String description) { + AREA_SECTION_TASK_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -1133,4 +1142,66 @@ public class PtlPcnEnumUtil { } } + /** + * 系统配置表枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONFIG_TYPE { + FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""), + NGINX_HOST(20, "NGINX_HOST", ""), + MES_STATION_SOCKET(30, "mes_station_socket", ""), + GATEWAY_IP(40, "GATEWAY_HOST", ""), + UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"), + PCN_PULL(60, "SYNC_DATA_URL", "PCN_PULL"), + PCN_PUSH(70, "SYNC_DATA_URL", "PCN_PUSH"), + FDFS_DOWNLOAD(80, "SYNC_DATA_URL", "FDFS_DOWNLOAD"), + REWORK_REPAIR(90, "REWORK_REPAIR", ""), + OPC_LINK_SERVER_URL(100, "OPC_LINK", "OPC_LINK_SERVER_URL"), + OPC_LINK_USERNAME(110, "OPC_LINK", "OPC_LINK_USERNAME"), + OPC_LINK_PASSWORD(120, "OPC_LINK", "OPC_LINK_PASSWORD"), + OPC_LINK_REALM(130, "OPC_LINK", "OPC_LINK_REALM"), + OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"), + SUPPLY_SWITCH(150, "SUPPLY_SWITCH", ""), + PCN_LOGIN(160, "PCN_LOGIN", ""), + PCN_MENU(170, "PCN_MENU", ""), + PCN_MODULE(180, "PCN_MODULE", ""), + PCN_LOGOUT(190, "PCN_LOGOUT", ""), + UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), + PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"), + PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE"); + + private int value; + private String code; + private String description; + + CONFIG_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0d3696a..e0a78cc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -703,7 +703,8 @@ public class WmsEnumUtil { FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), - UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"); + UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), + TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"); private int value; private String code; @@ -898,7 +899,8 @@ public class WmsEnumUtil { VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PICK_RC("KT_PICK_RC", "坤泰拣货"), - UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"); + UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"), + TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"); private String value; private String description; @@ -3992,7 +3994,8 @@ public class WmsEnumUtil { public enum SN_OPERATE_TYPE { REPORT(10, "REPORT", "生产报工"), BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"), - REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销"); + REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销"), + PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java index 85de33f..d1910a3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,7 +14,9 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description :生产区域 @@ -37,4 +41,19 @@ public class MesArea extends BaseBean implements Serializable { @Column(name = "AREA_NAME") @ApiParam("区域名称") private String areaName; + + @Transient + @ApiParam(value = "子集列表") + private List childTreeList; + + @Transient + @ApiParam(value = "名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value = "父节点", access = "父节点", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java index 0b7744f..b1b3d8c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java index 11ba452..556d26f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("流程工序关系") public class MesRouteProcess extends BaseBean implements Serializable { private static final long serialVersionUID = 3477334942090180010L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java index b1da58f..5907cec 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工序工作单元对照") public class MesRouteProcessCell extends BaseBean implements Serializable { private static final long serialVersionUID = -703779336699805482L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java index 9b5cd41..a7c1232 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("班次休息信息") public class MesShiftRest extends BaseBean implements Serializable { private static final long serialVersionUID = -8712815093203320523L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java index 47c1867..0d30d54 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java @@ -22,8 +22,8 @@ import java.io.Serializable; @Table(name = "MES_TIME") @Api("工步参数") public class MesTime extends BaseBean implements Serializable { - private static final long serialVersionUID = 1562011791394529076L; + @Column(name = "MODULE") @ApiParam("组件") private String module; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java index 43a0b61..b6071b9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 2900363253333046861L; + @Column(name = "SN") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java index b7d0b46..506ed2a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_TYPE_CFG") @Api("类型信息表") public class MesTypeCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -1699612238800419597L; + @Column(name = "TYPE_CODE") @ApiParam("类型代码") private String typeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java index f958bd1..a089f0a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_WC_CHECK") @Api("开线检查") public class MesWcCheck extends BaseBean implements Serializable { - private static final long serialVersionUID = 8057329890155185557L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java index e03e8e2..fbf5699 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java @@ -30,8 +30,8 @@ import java.io.Serializable; }) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2173902677953303765L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; 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 d6740f7..e9bd56b 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 @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { private static final long serialVersionUID = -493313481197504121L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java index 8047c46..2200ceb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -27,8 +27,8 @@ import java.io.Serializable; }) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -5634446206963213556L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java index 87a0f2e..2249726 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") public class MesWorkCellParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -3659425774085368499L; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java index c0d5a20..a434107 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工作单元参数配置") public class MesWorkCellParamCfg extends BaseBean implements Serializable { private static final long serialVersionUID = 1739991089354361293L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java index 74c2a09..0329add 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = 2881841596678871526L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java index 4ba402c..3d35275 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { private static final long serialVersionUID = -1119897685621371682L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 956a931..c4443eb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -27,11 +27,11 @@ import java.io.Serializable; @Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) -} -) +}) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 8065877030194822855L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java index e06560c..caba23a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean implements Serializable { private static final long serialVersionUID = -7018645997937147427L; + @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java index aac3eea..7883204 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java @@ -17,12 +17,21 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -@Api("pcn页面按钮控制model") +@Api("mes页面按钮控制model") public class MesButtonFlagModel implements Serializable { @ApiParam("修改按钮") private boolean updateButton; + @ApiParam("按配置修改按钮") + private boolean updateButtonConfig; + + @ApiParam("下达按钮") + private boolean transmitButton; + +// @ApiParam("测试动态下达按钮") +// private boolean dynamicTransmitButtonTest; + @ApiParam("启动按钮") private boolean startUpButton; @@ -38,5 +47,11 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("完成按钮") private boolean completeButton; + @ApiParam("关闭按钮-提醒") + private boolean closeButtonNoticeFlag; + + @ApiParam("维修任务按钮") + private boolean repairButton; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index f2bf9b4..8298ef7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; @@ -72,12 +73,12 @@ public class MesBom extends BaseBean implements Serializable { @Column(name = "EFF_START_TIME") @ApiParam(value = "生效时间") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam(value = "失效时间") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String effEndTime; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index cbd6a59..1328e56 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -27,7 +27,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER") -@Api("客户产线代码") +@Api("客户信息") public class MesCustomer extends BaseBean implements Serializable { private static final long serialVersionUID = 6049359006918853570L; @Column(name = "CUSTOMER_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index cfea1ba..b603553 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -58,16 +58,15 @@ public class MesDatasource extends BaseBean implements Serializable { @ApiParam("密码") private String dsPassword; + @Column(name = "DS_DB_NAME") + @ApiParam("数据库名称") + private String dsDbName; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; - @Column(name = "DS_DB_NAMsE") - @ApiParam("数据库名称") - private String dsDbName; - @Transient @ApiParam("设备名称") private String equipmentName; - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index 9157fa8..fddbb26 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -11,7 +11,9 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -41,4 +43,26 @@ public class MesDefect extends BaseBean implements Serializable { @Column(name = "DEFECT_TYPE") @ApiParam("缺陷类型") private String defectType; + + @Transient + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @Transient + @ApiParam("缺陷位置") + private String defectLocation; + + @Transient + @ApiParam("缺陷类型子集") + private List mesDefectList; + public MesDefect() { + + } + + public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) { + this.defectCode = defectCode; + this.defectName = defectName; + this.defectType = defectType; + this.defectTypeName = defectTypeName; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java index fb28c44..abc53be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_DEFECT_CAUSE") @Api("缺陷原因表") public class MesDefectCause extends BaseBean implements Serializable { - private static final long serialVersionUID = -4078847071878784152L; + @Column(name = "DC_CODE") @ApiParam("缺陷原因代码") private String dcCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index d034489..1b9a071 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -8,12 +8,10 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Description: @@ -34,6 +32,7 @@ import java.util.Date; @Api("不良信息记录表") public class MesDefectRecord extends BaseBean implements Serializable { private static final long serialVersionUID = -6672562641463628050L; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; @@ -78,6 +77,9 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("备注") private String memo; + @Transient + private List mesDefectList; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index 6fff826..0be20a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; +import java.math.BigDecimal; /** * @Description: @@ -60,11 +58,11 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("产品数量") - private Integer qty; + private Double qty; @Column(name = "DISMANTLE_QTY") @ApiParam("拆解数") - private Integer dismantleQty; + private BigDecimal dismantleQty; @Column(name = "ITEM_PART_NO") @ApiParam("子物料编码") @@ -76,17 +74,24 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @Column(name = "OK_QTY") @ApiParam("合格数") - private Integer okQty; + private BigDecimal okQty; @Column(name = "MISS_QTY") @ApiParam("缺失数") - private Integer missQty; + private BigDecimal missQty; @Column(name = "SCRAP_QTY") @ApiParam("报废数") - private Integer scrapQty; + private BigDecimal scrapQty; @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Transient + private String serialNumber; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java index 723251f..1234ffb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") public class MesEsop extends BaseBean implements Serializable { - private static final long serialVersionUID = -2025246159538929513L; + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java index c8905c5..ae69773 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("系统业务事件") public class MesEvent extends BaseBean implements Serializable { private static final long serialVersionUID = -2941486161983912085L; + @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java index 51b0507..6e6c529 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java @@ -34,6 +34,7 @@ import java.io.Serializable; @Api("系统业务事件动作") public class MesEventAction extends BaseBean implements Serializable { private static final long serialVersionUID = 1188871471049646861L; + @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index 24228ca..e3982b1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_FI_CFG") @Api("首检件配置") public class MesFiCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 6919161447256638470L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java index 9df7aa3..e5e7b26 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_FILE") @Api("文件表") public class MesFile extends BaseBean implements Serializable { - private static final long serialVersionUID = 5057339077996828057L; + @Column(name = "FILE_NAME") @ApiParam("文件名称") private String fileName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index f3bd22c..7c0abc6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -15,10 +15,10 @@ import javax.persistence.Transient; import java.io.Serializable; /** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-21 + * @Description :物料关键数据 + * @Reference : + * @Author : crish + * @CreateDate : 2019-05-15 * @Modify: **/ @Data @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("物料关键数据关系") public class MesKpData extends BaseBean implements Serializable { private static final long serialVersionUID = 8243089140216459544L; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index ffac585..7555717 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -27,8 +27,8 @@ import java.util.List; @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean implements Serializable { - private static final long serialVersionUID = 5371856566557305323L; + @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java index c106bb2..5b17a07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 6476163540527157643L; + @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index 604d661..4b08276 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("系统业务方法") public class MesMethod extends BaseBean implements Serializable { private static final long serialVersionUID = -3254086662292709833L; + @Column(name = "METHOD_CODE") @ApiParam("方法代码") private String methodCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java index 3025972..13b98ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_MONITOR_TASK") @Api("监听任务") public class MesMonitorTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 4606062283853607814L; + @Column(name = "TASK_NO") @ApiParam("任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index c2ef72e..2752dac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_MONITOR_TASK_DETAIL") @Api("监听任务明细") public class MesMonitorTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -8703163858851139587L; + @Column(name = "TASK_NO") @ApiParam("任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index cac557d..9ff7458 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -19,7 +19,6 @@ import java.io.Serializable; * @CreateDate: 2019/8/22 5:59 PM * @Description: **/ - @Data @Entity @DynamicInsert @@ -28,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_NUMBER_RULE") @Api("条码生成规则") public class MesNumberRule extends BaseBean implements Serializable { - private static final long serialVersionUID = -7547623897602721464L; + @Column(name = "RULE_CODE") @ApiParam("规则代码") private String ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java index d4551a2..d717036 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; import java.io.Serializable; /** @@ -27,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_NUMBER_SERIALNO") @Api("编码序号") public class MesNumberSerialno extends BaseBean implements Serializable { - private static final long serialVersionUID = -6004402998083665263L; + @Column(name = "CURRENT_NUMBER_PREFIX") @ApiParam("当前编号前缀") private String currentNumberPrefix; @@ -40,4 +41,9 @@ public class MesNumberSerialno extends BaseBean implements Serializable { @Column(name = "CURRENT_NUMBER") @ApiParam("当前编号") private String currentNumber; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index dfe9551..9f25f06 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_OBJECT_CFG") @Api("对象结构") public class MesObjectCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 55753384888695913L; + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -55,11 +55,11 @@ public class MesObjectCfg extends BaseBean implements Serializable { private String pojoAttr; @Column(name = "IS_SAVE") - @ApiParam("是否存储") + @ApiParam("是否保存 1存 2不存") private Integer isSave; @Transient - @ApiParam("是否存储") + @ApiParam("是否存储名") private String isSaveName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java index f54e7b6..d752e8c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Deprecated public class MesPLCConfigure extends BaseBean implements Serializable { private static final long serialVersionUID = 2609782937477343108L; + @Column(name = "IP") @ApiParam("设备ip") private String ipAddress; 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 79fe8cb..ea3a703 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 @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("包装规格") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; @@ -101,4 +102,18 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("打印状态文字") private String printStrStatus; + @Transient + @ApiParam("打印缓存id") + private String printId; + + public MesPackage() { + } + + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { + this.packageNo = packageNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.packSpecQty = packSpecQty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 5c44dcd..6da48a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -28,8 +28,8 @@ import java.io.Serializable; }) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 6980459490465566975L; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; @@ -39,11 +39,11 @@ public class MesPackageDetail extends BaseBean implements Serializable { private String serialNumber; @Column(name = "PART_NO") - @ApiParam("物料号") + @ApiParam("物料编号") private String partNo; @Column(name = "PART_NAME_RDD") - @ApiParam("产品条码") + @ApiParam("物料名称") private String partNameRdd; @Column(name = "PACKAGE_NO2") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 19434f5..1b9e494 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean implements Serializable { - private static final long serialVersionUID = -6425620221708201986L; + @Column(name = "PACKAGE_NO") @ApiParam("包装编码") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 3b117e8..b326a99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("物料信息") public class MesPart extends BaseBean implements Serializable { private static final long serialVersionUID = -7731182105899332283L; + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; @@ -75,10 +76,6 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("产品类型代码") private String produceCategoryCode; - @Transient - @ApiParam("产品类型名称") - private String produceCategoryName; - @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") private Integer processMatchType; @@ -92,6 +89,10 @@ public class MesPart extends BaseBean implements Serializable { private Integer productMatchType; @Transient + @ApiParam("产品类型名称") + private String produceCategoryName; + + @Transient @ApiParam("过程编码匹配类型名称") private String processMatchTypeName; @@ -102,4 +103,8 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("产品编码匹配类型") private String productMatchTypeName; + + @Transient + @ApiParam("分类名称") + private String categoryName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java index f356754..9553053 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("零件种类") public class MesPartCategory extends BaseBean implements Serializable { private static final long serialVersionUID = 106841156414035968L; + @Column(name = "CATEGORY_CODE") @ApiParam("分类代码") private String categoryCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index 62553f7..ef7ae49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -30,8 +30,8 @@ import java.io.Serializable; @Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") public class MesPatternJis extends BaseBean implements Serializable { - private static final long serialVersionUID = 216398440591829755L; + @Column(name = "PATTERN_NO") @ApiParam("模式编号") private String patternNo; @@ -45,7 +45,7 @@ public class MesPatternJis extends BaseBean implements Serializable { private Integer queueNo; @Column(name = "HANDLE_NO") - @ApiParam("一次处理队列数") + @ApiParam("一次处理套数") private Integer handleNo; @Column(name = "PATTERN_DESC") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index bc3f570..445fe79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("PCN节点") public class MesPcn extends BaseBean implements Serializable { private static final long serialVersionUID = -9150091413555406397L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java index 7e00e8e..94a4da7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("PCN节点连接日志") public class MesPcnConnectLog extends BaseBean implements Serializable { private static final long serialVersionUID = 2756240593256441951L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 2f33165..cc636ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -30,7 +30,6 @@ import java.io.Serializable; @Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") public class MesPcnSyncCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7270930330576127126L; @Column(name = "PCN_CODE") @@ -58,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable { private String syncTime; @Column(name = "SYNC_PATTERN") - @ApiParam("同步方式 2、新增 1、修改") + @ApiParam("同步方式 2.新增 1.修改") private Integer syncPattern; @Column(name = "SYNC_TYPE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java index 5c98174..2b79271 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("MES_PCN同步异常日志") public class MesPcnSyncErrorLog extends BaseBean implements Serializable { private static final long serialVersionUID = -6031591772505958774L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java new file mode 100644 index 0000000..dc26568 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : 账号离线登陆表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-01 11:02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_SYS_USER_OFFLINE") +@Api(value = "账号离线登陆表", description = "账号离线登陆表。") +public class MesPcnSysUserOffline extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7617353154826718154L; + @Column(name = "USER_ID") + @ApiParam(value = "人员ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号", access = "用户编号") + private String userCode; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名称", access = "账号名称") + private String userName; + + @Column(name = "LOGIN_NAME") + @ApiParam(value = "登陆名称", access = "登陆名称") + private String loginName; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + + @Lob + @Column(name="LOGIN_INFO") + @ApiParam(value ="登陆信息" , access ="登陆信息") + private String loginInfo; + + @Lob + @Column(name="MENU_LIST") + @ApiParam(value ="菜单" , access ="菜单") + private String menuList; + + @Lob + @Column(name="MODULE_LIST") + @ApiParam(value ="模块" , access ="模块") + private String moduleList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 6217557..83f9049 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") public class MesPcnTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 4129717677965409395L; + @Column(name = "TASK_CODE") @ApiParam("任务代码") private String taskCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java new file mode 100644 index 0000000..d483cd6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes-pcn定时任务工作清单同步记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_TASK_LOG") +@Api("mes-pcn定时任务工作清单同步记录") +public class MesPcnTaskLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -784806389462540310L; + + @Column(name = "SYNC_TIME_START") + @ApiParam("同步数据开始时间") + private String syncTimeStart; + + @Column(name = "SYNC_TIME_END") + @ApiParam("同步数据截止时间") + private String syncTimeEnd; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_CONTENT") + @ApiParam("异常内容") + private Long errorContent; + + public int getSyncStatusVal() { + return this.syncStatus == null ? 0 : this.syncStatus; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 01be425..d5f6ed3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("生产主计划") public class MesPlanOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 6773005820598583458L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 7d9c0b6..942809f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -30,8 +30,8 @@ import java.io.Serializable; @Table(name = "MES_PLC") @Api("PLC配置表") public class MesPlc extends BaseBean implements Serializable { - private static final long serialVersionUID = -7172265186837551268L; + @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java index a60fa3d..bc05708 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工序") public class MesProcess extends BaseBean implements Serializable { private static final long serialVersionUID = -615476712907856558L; + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 9f84b79..9d048c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.io.Serializable; @@ -36,6 +35,7 @@ import java.io.Serializable; @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean implements Serializable { private static final long serialVersionUID = -6984193022328810942L; + // 联合唯一索引必须加:, nullable = false @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam(value = "产品条码") @@ -79,11 +79,11 @@ public class MesProdBindRecord extends BaseBean implements Serializable { private String supplierCode; @Column(name = "LOT_NO") - @ApiParam + @ApiParam("关联批次") private String lotNo; @Column(name = "IS_FEED") - @ApiParam + @ApiParam("是否投料配置") private Integer isFeed; @Column(name = "VERSION") @@ -100,7 +100,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") - private String actionType; + private Integer actionType; @ApiParam(value = "是否绑定关键件名称") private String isBindKeyName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index f77984a..34389f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("产品配置") public class MesProdCfg extends BaseBean implements Serializable { private static final long serialVersionUID = -1301835558902463754L; + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index 151a929..f769488 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("产品配置明细") public class MesProdCfgDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -5678006170645940563L; + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index f5438ae..80fd5fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_PROD_PACK") @Api("产品包装关系") public class MesProdPack extends BaseBean implements Serializable { - private static final long serialVersionUID = -5748484568201154400L; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index d33cc8e..0285bb7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("产品类流程配置表") public class MesProdRouteCfg extends BaseBean implements Serializable { private static final long serialVersionUID = -3903152693262813917L; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java index 622dc1f..fdf53da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_PRODUCE_CATEGORY") @Api("系统业务动作") public class MesProduceCategory extends BaseBean implements Serializable { - private static final long serialVersionUID = -992595557921651448L; + @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCategoryCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index 4a8a103..ba53ce5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PRODUCE_CTGY_PICTURE") @Api("产品类型图片表") public class MesProduceCtgyPicture extends BaseBean implements Serializable { - private static final long serialVersionUID = 4199856772441042802L; + @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCtgyCode; @@ -43,7 +43,21 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable { @ApiParam("文件id") private Long fileId; + @Column(name = "PICTURE_URL") + @ApiParam("图片URL") + private String pictureUrl; + @Transient @ApiParam("文件原名称") private String fileOriginName; + + @Transient + @ApiParam("文件名称") + private String fileName; + + @Transient + @ApiParam("文件URL") + private String fileUrl; + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 2f6fe5e..7bf1165 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -33,8 +33,8 @@ import java.math.BigDecimal; }) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { - private static final long serialVersionUID = -1630924042562178494L; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; @@ -72,11 +72,11 @@ public class MesProduceSn extends BaseBean implements Serializable { private Integer printStatus; @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") + @ApiParam("生产线") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") + @ApiParam("工位") private String workCellCode; @Column(name = "ROUTE_CODE") @@ -120,7 +120,7 @@ public class MesProduceSn extends BaseBean implements Serializable { private String custCode; @Column(name = "SN_TYPE") - @ApiParam("条码类型") + @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; @Column(name = "TRAY_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index ef63c50..fb90102 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -33,6 +33,7 @@ import java.io.Serializable; @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean implements Serializable { private static final long serialVersionUID = -1807953720033107108L; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java index 83bd787..0622673 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PRODUCT_ENCODE_CFG") @Api("产品编码配置") public class MesProductEncodeCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 5608141802461306170L; + @Column(name = "CODE_TYPE") @ApiParam("编码类型") private Integer codeType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index 743751a..a068cce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -31,8 +31,8 @@ import java.util.List; }) @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean implements Serializable { - private static final long serialVersionUID = -8044433561607606170L; + @Column(name = "CHECK_ID") @ApiParam("检测id") private String checkId; @@ -116,4 +116,12 @@ public class MesQcCheckData extends BaseBean implements Serializable { @Transient @ApiParam("工作单元名称") private String workCellName; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + + @Transient + @ApiParam("过程质量检测数据") + private List mesQcCheckStandardList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index b4f6388..0bc3879 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -13,6 +13,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -29,8 +30,8 @@ import java.io.Serializable; @Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") public class MesQcCheckStandard extends BaseBean implements Serializable { - private static final long serialVersionUID = 3977375527789854590L; + @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; @@ -63,6 +64,18 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("频率") private String checkFrequency; + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("检测结果") + private String checkResult; + + @Transient + @ApiParam("检测值") + private String checkValue; + @Column(name = "CHECK_ITEM_TYPE") @ApiParam("检测项类型") private String checkItemType; @@ -71,4 +84,29 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("检测类型名称") private String checkTypeName; + @Transient + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + @Transient + private List childQcList; + + public MesQcCheckStandard() { + } + + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { + this.id = id; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.partName = partName; + this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index a2d6034..249fd29 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,8 +30,8 @@ import java.io.Serializable; @Table(name = "MES_QUEUE_JIS") @Api("JIS发运队列") public class MesQueueJis extends BaseBean implements Serializable { - private static final long serialVersionUID = -2712958514118946868L; + @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; @@ -63,4 +64,8 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Transient + @ApiParam("颜色") + private String color; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index f3defbd..5ac2924 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_QUEUE_JIS_DETAIL") @Api("JIS发运队列明细") public class MesQueueJisDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -3242843412307565585L; + @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; @@ -52,7 +52,7 @@ public class MesQueueJisDetail extends BaseBean implements Serializable { private Integer status; @Column(name = "FINAL_STATUS") - @ApiParam("发运整体状态") + @ApiParam("明细整体状态") private Integer finalStatus; @Column(name = "SERIAL_NUMBER") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 8b8a70c..159aa03 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,9 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; /** * @Description: @@ -35,6 +31,7 @@ import java.util.List; @Api("生产队列主表") public class MesQueueOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -7459452106180601417L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 589f92e..cb39dc8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 7840873844253353896L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; @@ -61,7 +62,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @Column(name = "WORK_TYPE") @ApiParam("生产类型") - private String workOrderType; + private String workType; @Column(name = "PRODUCE_CATEGORY_CODE") @ApiParam("产品类型代码") @@ -90,4 +91,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { public int getStatusVal() { return this.status == null ? 0 : this.status; } + + public MesQueueOrderDetail() { + } + + public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) { + this.queueSeq = queueSeq; + this.seq = seq; + this.serialNumber = serialNumber; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index cf7ee95..ee3e3b5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("原材料信息") public class MesRawPartSn extends BaseBean implements Serializable { private static final long serialVersionUID = 1590983555938105569L; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; 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 d2514e3..4c75791 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 @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("维修") public class MesRepair extends BaseBean implements Serializable { private static final long serialVersionUID = 5304257976947321917L; + @Column(name = "REPAIR_CODE") @ApiParam("维修代码") private String repairCode; 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 0026eeb..d717a56 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 @@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -33,8 +31,8 @@ import java.io.Serializable; }) @Api("维修信息记录表") public class MesRepairRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -1758374702271940323L; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; @@ -90,4 +88,16 @@ public class MesRepairRecord extends BaseBean implements Serializable { @Column(name = "MEMO") @ApiParam("备注") 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/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index ca98cbe..bea56af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("流程表") public class MesRoute extends BaseBean implements Serializable { private static final long serialVersionUID = -3616935751787295145L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index d24696d..fa6d9dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("流程工序关系") public class MesRouteProcess extends BaseBean implements Serializable { private static final long serialVersionUID = -1248219638779313299L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index 0e3e719..b677ede 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("工序工作单元对照") public class MesRouteProcessCell extends BaseBean implements Serializable { private static final long serialVersionUID = 4823057491756814599L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java index 81a7105..0478394 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("报废原因") public class MesScrap extends BaseBean implements Serializable { private static final long serialVersionUID = 2850681183524213132L; + @Column(name = "SCRAP_CODE") @ApiParam("报废代码") private String scrapCode; @@ -38,7 +39,7 @@ public class MesScrap extends BaseBean implements Serializable { @ApiParam("报废名称") private String scrapName; - @Column(name="SCRAP_TYPE") + @Column(name = "SCRAP_TYPE") @ApiParam("报废类型") private String scrapType; 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 6129a7b..bb4cb77 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 @@ -31,8 +31,8 @@ import java.io.Serializable; }) @Api("报废信息记录表") public class MesScrapRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -5451178133547076360L; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; @@ -51,7 +51,7 @@ public class MesScrapRecord extends BaseBean implements Serializable { @Column(name = "SCRAP_CODE") @ApiParam("报废代码") - private String repairCode; + private String scrapCode; @Column(name = "SCRAP_NAME") @ApiParam("报废名称") 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 34f25ed..3fd79bb 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 @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("班次信息") public class MesShift extends BaseBean implements Serializable { private static final long serialVersionUID = 4001070186534674096L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 1d7c663..6a01945 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("班组") public class MesShiftGroup extends BaseBean implements Serializable { private static final long serialVersionUID = 3409573116624543569L; + @Column(name = "GROUP_CODE") @ApiParam("班组代码") private String groupCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index c7e212a..ef567e2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("班次休息信息") public class MesShiftRest extends BaseBean implements Serializable { private static final long serialVersionUID = 5486276486536860088L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 0ad8795..bab6d9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -32,6 +32,7 @@ import java.io.Serializable; @Api("工位物料清单") public class MesStationBom extends BaseBean implements Serializable { private static final long serialVersionUID = 1817387724628691734L; + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; @@ -69,7 +70,6 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "是否检查") private Integer isCheck; - @Column(name = "IS_FEED") @ApiParam(value = "是否投料配置") private Integer isFeed; @@ -91,6 +91,14 @@ public class MesStationBom extends BaseBean implements Serializable { private Double boundQty; @Transient + @ApiParam("关键件代码") + private String keyBarCode; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + + @Transient @ApiParam(value = "是否可重复名称") private String isRepeatName; @@ -126,6 +134,10 @@ public class MesStationBom extends BaseBean implements Serializable { return this.isBind == null ? false : this.isBind; } + public double getBoundQtyVal() { + return this.boundQty == null ? 0.0d : this.boundQty; + } + @Override public String toString() { return "MesStationBom{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index 32fa323..bad1874 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,6 +30,7 @@ import java.io.Serializable; @Api("工步") public class MesStep extends BaseBean implements Serializable { private static final long serialVersionUID = -1106608189453496947L; + @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; @@ -48,4 +50,54 @@ public class MesStep extends BaseBean implements Serializable { @Column(name = "STEP_OBJECT") @ApiParam("工步对象") private String stepObject; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("流程代码") + private String routeCode; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工序代码") + private String processCode; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工步顺序") + private Integer stepSeq; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工步执行完毕") + private boolean isComplete; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工步是否跳过") + private boolean isJump; + + public MesStep() { + } + + public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject, + String routeCode, String processCode, Integer stepSeq) { + this.stepCode = stepCode; + this.stepName = stepName; + this.stepText = stepText; + this.stepType = stepType; + this.stepObject = stepObject; + this.routeCode = routeCode; + this.processCode = processCode; + this.stepSeq = stepSeq; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index b2ca5cf..237df3e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工步参数") public class MesStepParam extends BaseBean implements Serializable { private static final long serialVersionUID = 6709455994477993263L; + @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; @@ -44,8 +45,8 @@ public class MesStepParam extends BaseBean implements Serializable { @Column(name = "PARAM_NAME") @ApiParam("参数名称") private String paramName; - //text select + @Column(name = "PARAM_ATTRIBUTE") - @ApiParam("参数属性") + @ApiParam("参数属性 text select") private String paramAttribute; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java new file mode 100644 index 0000000..326dafe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TIME") +@Api("工步参数") +public class MesTime extends BaseBean implements Serializable { + private static final long serialVersionUID = 1562011791394529076L; + + @Column(name = "MODULE") + @ApiParam("组件") + private String module; + + @Column(name = "ELAPSE") + @ApiParam("耗时") + private Long elapse; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java new file mode 100644 index 0000000..570ffd1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :扭矩信息记录表 + * @Reference : + * @Author : Crish + * @CreateDate : 2019-05-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TORQUE_DETAIL") +@Api("扭矩信息记录表") +public class MesTorqueDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 2900363253333046861L; + + @Column(name = "SN") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "UPPER_LIMIT") + @ApiParam("最大值") + private Double upperLimit; + + @Column(name = "LOWER_LIMIT") + @ApiParam("最小值") + private Double lowerLimit; + + @Column(name = "TORQUE_DETAIL_VALUE") + @ApiParam("扭矩值") + private Double torqueValue; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "ok") + @ApiParam("扭矩是否合格") + private String ok; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "p_set") + @ApiParam("螺丝枪PSET设置值") + private String deviceSetValue; + + @Column(name = "MAXANGLE") + @ApiParam("最大扭矩") + private String maxAngle; + + @Column(name = "MINANGLE") + @ApiParam("最小扭矩") + private String minAngel; + + @Column(name = "FINALANGLE") + @ApiParam("最终扭矩") + private Integer finalAngle; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name = "KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name = "RESULT_MSG") + @ApiParam("扭矩判定结果") + private String resultMsg; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index a1a92cd..9f87ea7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_TYPE_CFG") @Api("类型信息表") public class MesTypeCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7666533200631763797L; + @Column(name = "TYPE_CODE") @ApiParam("类型代码") private String typeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java index ff626d1..7d83053 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_WC_CHECK") @Api("开线检查") public class MesWcCheck extends BaseBean implements Serializable { - private static final long serialVersionUID = 7937744978114334701L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java index 5d7bced..534e549 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -30,8 +30,8 @@ import java.io.Serializable; }) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 6919654845394560128L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -77,7 +77,7 @@ public class MesWcCheckRecord extends BaseBean implements Serializable { private String groupCode; @Column(name = "OVERALL_RESULT") - @ApiParam + @ApiParam("总体结果") private Integer overAllResult; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java index cb619b7..a3ab8a2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_WC_EQUIPMENT") @Api("工作单元设备关系表") public class MesWcEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 188390912605665500L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; 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 2f0533a..f275899 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 @@ -33,6 +33,7 @@ import java.util.List; @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { private static final long serialVersionUID = 8552890090536989486L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index 06dc991..92bcaf8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -30,8 +27,8 @@ import java.io.Serializable; }) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = 1432794181428753903L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -44,7 +41,7 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "workOrderNo") + @Column(name = "WORK_ORDER_NO") @ApiParam("工单") private String workOrderNo; @@ -60,6 +57,7 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable { @ApiParam("流程") private String routeCOde; + @Lob @Column(name = "MESSAGE") @ApiParam("异常信息") private String message; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java index eb03cdc..c5aaec2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") public class MesWorkCellParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 1017369816822438021L; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index 8c33b9c..2b85a2b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("工作单元参数配置") public class MesWorkCellParamCfg extends BaseBean implements Serializable { private static final long serialVersionUID = -8507576103087989740L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index ed04956..cd8463a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -32,8 +32,8 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = -6817903235638554748L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index f57305a..33cb908 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -33,6 +33,7 @@ import java.util.List; @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { private static final long serialVersionUID = 5583253625290231595L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 7633f77..535d711 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -24,14 +24,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = { - @Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) -}) +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}, + uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + }) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; @@ -215,6 +215,9 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "下达按钮编号") public String buttonCode; + @Transient + @ApiParam("批量打包开窗页面查询工单=1") + private String pageType; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 1f91275..6366551 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean implements Serializable { private static final long serialVersionUID = -5859382100462830988L; + @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestModel.java similarity index 77% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestModel.java index 3c022ef..97b9adc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestModel.java @@ -15,7 +15,7 @@ import java.util.Map; * @Modify: **/ @Data -public class ActionRequestBean implements Serializable { +public class ActionRequestModel implements Serializable { @ApiParam("事件代码") @Deprecated @@ -25,14 +25,17 @@ public class ActionRequestBean implements Serializable { public String buttonCode; @ApiParam("单个结果") - public Obj resultObject; + public T resultObject; @ApiParam("List请求集") - public List resultList; + public List resultList; @ApiParam("Map请求集") public Map resultMap; @ApiParam("module代码") public Integer moduleCode; + + @ApiParam("目的状态") + private Integer destStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AttrBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AttrBean.java new file mode 100644 index 0000000..16c5353 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AttrBean.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class AttrBean implements Serializable { + + @ApiParam("属性名称") + private String attrName; + + @ApiParam("属性名称别名") + private String attrNameAlias; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java new file mode 100644 index 0000000..47a4f4f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ButtonBean implements Serializable { + @ApiParam(value = "按钮代码") + private String buttonCode; + + @ApiParam(value = "按钮名称") + private String buttonName; + + // 执行类方法,sql,或者标记 + @ApiParam(value = "执行内容") + private String methodContent; + + @ApiParam(value = "按钮描述") + private String buttonDesc; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataAcquisitionModel.java new file mode 100644 index 0000000..0837b72 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataAcquisitionModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/10 0010 - 15:28 + */ +@Data +@Api("数据采集Model") +public class DataAcquisitionModel { + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +// +// @ApiParam("组号") +// private String groupNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectModel.java new file mode 100644 index 0000000..749de7f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\28 19:50 + * @Modify: + **/ +@Data +public class DefectModel { + + private Long id; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("缺陷类型子集") + private List mesDefectList; + public DefectModel() { + + } + + public DefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) { + this.id = id; + this.defectCode = defectCode; + this.defectName = defectName; + this.defectType = defectType; + this.defectTypeName = defectTypeName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 5313cb0..845d2bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -1,17 +1,12 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule; -import cn.estsh.i3plus.pojo.mes.bean.MesNumberSerialno; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Column; - /** * @Author: Wynne.Lu * @CreateDate: 2019/8/23 11:42 AM diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDefectModel.java new file mode 100644 index 0000000..c656489 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDefectModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.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 String defectTypeName; + + @Transient + @ApiParam("缺陷分类子集") + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java new file mode 100644 index 0000000..e41b5ce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java @@ -0,0 +1,125 @@ +package cn.estsh.i3plus.pojo.mes.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; + @ApiParam("创建时间") + private String createUser; + @ApiParam("创建时间") + private String createDatetime; + @ApiParam("修改人") + private String modifyUser; + @ApiParam("修改时间") + private String modifyDatetime; + @ApiParam("产品条码") + private String serialNumber; + @ApiParam("关联批次") + private String lotNo; + public MesProdBindRecordModel() { + + } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + 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; + this.lotNo = lotNo; + } + + 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, String lotNo) { + 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.lotNo = lotNo; + } + + 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, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) { + 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.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.serialNumber = serialNumber; + this.lotNo = lotNo; + } + + public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) { + this.itemPartNo = itemPartNo; + 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.serialNumber = serialNumber; + this.lotNo = lotNo; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java new file mode 100644 index 0000000..e0f1f6f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesStationBomModel { + + 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 MesStationBomModel() { + + } + + public MesStationBomModel(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; + } + + public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + 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/src/main/java/cn/estsh/i3plus/pojo/mes/model/PLCInteracticeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PLCInteracticeModel.java new file mode 100644 index 0000000..4563b9c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PLCInteracticeModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/25 7:41 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("PLC交互model") +public class PLCInteracticeModel { + + private String serverIp; + + private String serverPort; + + private String mwContext; + + private String protocol; + + private String plcCode; + + private String dataType; + + private String userName; + + private String password; + + private Integer enabled; + + private String realm; + + private String tag; + + private String value; + + private String comment; + + private String authenKey; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcCacheKeyModel.java similarity index 81% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcCacheKeyModel.java index 1c11d71..15a6667 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcCacheKeyModel.java @@ -1,10 +1,8 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; /** * @Author: Wynne.Lu diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackageModel.java new file mode 100644 index 0000000..b9662c7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackageModel.java @@ -0,0 +1,78 @@ +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; + +import java.util.List; + +/** + * @Author: wangjie + * @CreateDate: 2019/9/23 8:06 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProdPackageModel { + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("班次名称") + private String shiftName; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam("工单数量") + private Double workOrderQty; + + @ApiParam("完成数量") + private Double completeQty; + + @ApiParam("包装规格数量") + private Double packSpecQty; + + @ApiParam("包装规格") + private String packSpec; + + @ApiParam("数量") + private Double qty; + + @ApiParam("特殊批次") + private String fixLotNo; + + @ApiParam("包装集合") + private List packageList; + + @ApiParam("打印状态文字") + private String printStrStatus; + + @ApiParam("包装层级名称") + private String packLevelName; + + @ApiParam("是否封箱名称") + private String isSealedName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckStandardModel.java new file mode 100644 index 0000000..04d0d00 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckStandardModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckStandard; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2020\1\13 17:23 + * @Modify: + **/ +@Data +public class QcCheckStandardModel { + + private Long id; + + @ApiParam("列头") + private String title; + + private List resultList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java new file mode 100644 index 0000000..1ba9f4e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QueueJisModel implements Serializable { + + @ApiParam("主队列编号") + private String jisNo; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("车号") + private String carNo; + + @ApiParam("排序") + private Double seq; + + @ApiParam("状态") + private Integer status; + + @ApiParam("产品配置代码") + private String prodCfgCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("明细状态") + private Integer detailStatus; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("明细整体状态") + private Integer finalStatus; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("明细状态名称") + private String detailStatusName; + + @ApiParam("明细整体状态名称") + private String finalStatusName; + + @ApiParam("颜色") + private String color; + + public String getStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); + } + + public String getDetailStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); + } + + public String getFinalStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); + } + + public QueueJisModel() { + } + + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { + this.jisNo = jisNo; + this.vinCode = vinCode; + this.carNo = carNo; + this.seq = seq; + this.status = status; + this.prodCfgCode = prodCfgCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.detailStatus = detailStatus; + this.serialNumber = serialNumber; + this.finalStatus = finalStatus; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 5c9e79c..9acf8a7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -6,7 +6,6 @@ import lombok.Data; import javax.persistence.Transient; import java.io.Serializable; -import java.util.List; /** * @Description : JIT队列列表Model @@ -18,6 +17,7 @@ import java.util.List; @Data @Api("JIT队列列表Model") public class QueueOrderModel implements Serializable { + private Long id; @ApiParam("队列序号") public Double queueSeq; @ApiParam("队列明细序号") @@ -41,6 +41,14 @@ public class QueueOrderModel implements Serializable { @Transient @ApiParam("显示颜色") private String color; + @ApiParam("工厂代码") + private String organizeCode; + @ApiParam("展示行数") + private Integer prodNum; + @ApiParam("产线") + private String workCenterCode; + @ApiParam("工位") + private String workCellCode; public QueueOrderModel() { } @@ -58,4 +66,19 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } + + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java index 1bada8a..73200ff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesPart; -import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.bean.*; import java.util.List; @@ -16,6 +13,12 @@ import java.util.List; **/ public class RequestModel { + private List mesDefectRecordList; // 不良/缺陷记录数据集 + + private List mesRepairRecordList; // 维修记录数据集 + + private List dismantleRecordList; // 拆解记录数据集 + private List workOrderList; // 工单数据集 private List partList; // 物料数据集 @@ -34,7 +37,9 @@ public class RequestModel { private List orderNoList;//工单编号 - private List requestBeanList;//工单下达 + private List requestBeanList;//工单下达 + + private ActionRequestModel actionRequestBean;//工单状态 public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { this.queueOrderList = queueOrderList; @@ -53,6 +58,30 @@ public class RequestModel { this.partList = partList; } + public List getMesDefectRecordList() { + return mesDefectRecordList; + } + + public void setMesDefectRecordList(List mesDefectRecordList) { + this.mesDefectRecordList = mesDefectRecordList; + } + + public List getMesRepairRecordList() { + return mesRepairRecordList; + } + + public void setMesRepairRecordList(List mesRepairRecordList) { + this.mesRepairRecordList = mesRepairRecordList; + } + + public List getDismantleRecordList() { + return dismantleRecordList; + } + + public void setDismantleRecordList(List dismantleRecordList) { + this.dismantleRecordList = dismantleRecordList; + } + public List getWorkOrderList() { return workOrderList; } @@ -96,11 +125,15 @@ public class RequestModel { return orderNoList; } - public void setRequestBeanList(List requestBeanList) { + public void setRequestBeanList(List requestBeanList) { this.requestBeanList = requestBeanList; } - public List getRequestBeanList() { return requestBeanList; } + public List getRequestBeanList() { return requestBeanList; } + + public void setActionRequestBean(ActionRequestModel actionRequestBean) { this.actionRequestBean = actionRequestBean; } + + public ActionRequestModel getActionRequestBean() { return actionRequestBean; } public Double getCurrentSeq() { return currentSeq == null ? 0.0d : currentSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java new file mode 100644 index 0000000..257a159 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 打印信息封装 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息封装") +public class SnPrintDataModel { + + @ApiParam("打印数据") + private List valueList; + + @ApiParam("打印模板及参数") + private MesLabelTemplate labelTemplate; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java new file mode 100644 index 0000000..1144967 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 打印信息汇总 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息汇总") +public class SnPrintModel extends StepPrintSnModel { + + @ApiParam("过程条码") + private SnPrintDataModel serialPrintDataModel; + + @ApiParam("产品条码") + private SnPrintDataModel prodPrintDataModel; + + @ApiParam("包装条码") + private SnPrintDataModel packPrintDataModel; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationBomModel.java new file mode 100644 index 0000000..41addbf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationBomModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesStationBom; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 3:11 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工位BOM model") +public class StationBomModel extends MesStationBom { + + @ApiParam("上料数量") + private Long cellFeedQty; + + @ApiParam("是否上料数量满足") + private Boolean isFeedSatisfied; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java new file mode 100644 index 0000000..bf849fe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 工位结果bean + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-24 + * @Modify: + **/ +@Data +public class StationResultBean implements Serializable { + + /** + * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 + * moduleContent组件内容,taskComplete整个扫描完成 + */ + @ApiParam("业务类型") + private String busiType; + + /** + * 对于相同业务类型的数据，区分不同数据类型。 + * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， + * image-图片 + */ + @ApiParam("数据类型") + private String dataType; + + @ApiParam("执行结果信息") + private String message; + + @ApiParam("List结果集") + private List resultList; + + @ApiParam("结果对象") + private Object resultObj; + + @ApiParam("Map结果集") + public Map resultMap; + + @ApiParam("List结果集的属性") + private List dataAttrList; + + @ApiParam("图片路径") + private String imageUrl; + + @ApiParam("多个数据集") + private List> stationResultBeans; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java index 2a90b5e..a2464b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.List; import java.util.Map; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java new file mode 100644 index 0000000..2004603 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 打印条码工步， 打印信息模板 + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息模板") +public class StepPrintSnModel extends MesProduceSn { + @ApiParam("打印描述") + private String printDesc; + + @ApiParam("条码") + private String barCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("批次号") + private String batchNo; + + @ApiParam("箱数量") + private String boxQty; + + @ApiParam("订单号") + private String orderNo; + + @ApiParam("生产日期") + private String productionTime; + + @ApiParam("包装编码") + private String packageNo; + + @ApiParam("包装规格") + private String packageSpec; + + @ApiParam("供应商") + private String supplier; + + @ApiParam("客户名称") + private String customerName; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("客户物料名称") + private String customerPartName; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam("特殊批号") + private String fixLotNo; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java new file mode 100644 index 0000000..22d2fa3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Collection; + +@Data +@Api("工步返回信息") +public class StepResult { + + private boolean isCompleted; + + private T data; + + private Collection dataCollection; + + private String msg; + + public static StepResult getSuccessComplete() { + return new StepResult(true,""); + } + + public static StepResult getNonComplete() { + return new StepResult(false,""); + } + + public static StepResult getSuccessComplete(String msg) { + return new StepResult(true, msg); + } + + public static StepResult getNonComplete(String msg) { + return new StepResult(false, msg); + } + + public static StepResult getSuccessData(T data, String msg) { + return new StepResult<>(true, data, msg); + } + + public static StepResult getSuccessData(Collection data, String msg) { + return new StepResult(true, data, msg); + } + + private StepResult() { + } + + private StepResult(boolean isCompleted) { + this.isCompleted = isCompleted; + } + + private StepResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public StepResult(boolean isCompleted, T data, String msg) { + this.isCompleted = isCompleted; + this.data = data; + this.msg = msg; + } + + public StepResult(boolean isCompleted, Collection dataCollection, String msg) { + this.isCompleted = isCompleted; + this.dataCollection = dataCollection; + this.msg = msg; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueModel.java new file mode 100644 index 0000000..53a3e0c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.model; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-06-03-11:44 + * @Modify: + **/ + +public class TorqueModel { + private Long id; + + private Double upperLimit; + + private Double lowerLimit; + + private Double torqueValue; + + private boolean ok; + + private String color; + + public boolean isOk() { + return ok; + } + + public void setOk(boolean ok) { + this.ok = ok; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Double getUpperLimit() { + return upperLimit; + } + + public void setUpperLimit(Double upperLimit) { + this.upperLimit = (upperLimit == null ? 0 : upperLimit); + } + + public Double getLowerLimit() { + return lowerLimit; + } + + public void setLowerLimit(Double lowerLimit) { + this.lowerLimit = (lowerLimit == null ? 0 : lowerLimit); + } + + public Double getTorqueValue() { + return torqueValue; + } + + public void setTorqueValue(Double torqueValue) { + this.torqueValue = (torqueValue == null ? 0 : torqueValue); + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java new file mode 100644 index 0000000..e7c08e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesWcCheckRecord; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 8:06 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("开线管控model") +public class WcCheckModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工单") + private String workOrder; + + @ApiParam("产品号") + private String partNo; + + @ApiParam("是否通过") + private Integer isPass; + + @ApiParam("开线信号") + private Integer onlineSignal; + + @ApiParam("开线对象") + MesWcCheckRecord onlineSignalEqu; + + @ApiParam("需要展示的数据") + private Map titleMap; + + @ApiParam("对象list和列关系") + private Map> dataColumnRelation; + + @ApiParam("重构map") + private Map> dataMap; + + public WcCheckModel initialWcCheckModel() { + WcCheckModel wcCheckModel = new WcCheckModel(); + wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); + wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); + onlineSignalEqu = new MesWcCheckRecord(); + wcCheckModel.setTitleMap(new LinkedHashMap<>()); + wcCheckModel.setDataMap(new LinkedHashMap<>()); + wcCheckModel.setDataColumnRelation(new LinkedHashMap<>()); + return wcCheckModel; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRepository.java new file mode 100644 index 0000000..fc75844 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCellFeed; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesCellFeedRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDismantleRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDismantleRecordRepository.java new file mode 100644 index 0000000..a602139 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDismantleRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:06 + * @Modify: + **/ +public interface MesDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSysUserOfflineRepository.java new file mode 100644 index 0000000..50b1858 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSysUserOfflineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnSysUserOffline; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-02 + * @Modify: + **/ +@Repository +public interface MesPcnSysUserOfflineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskLogRepository.java new file mode 100644 index 0000000..eb90ab6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnTaskLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Repository +public interface MesPcnTaskLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScrapRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScrapRecordRepository.java new file mode 100644 index 0000000..596245a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScrapRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesScrapRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:07 + * @Modify: + **/ +public interface MesScrapRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTimeRepository.java new file mode 100644 index 0000000..5ba359e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTimeRepository.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTime; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesTimeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTorqueDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTorqueDetailRepository.java new file mode 100644 index 0000000..8c1a0d1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTorqueDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTorqueDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesTorqueDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellMonitorLogRepository.java new file mode 100644 index 0000000..1298b5c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellMonitorLogRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellMonitorLog; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesWorkCellMonitorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java deleted file mode 100644 index 2f615de..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -//package cn.estsh.i3plus.pojo.mes.repositorymongo; -// -// -//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -//import cn.estsh.i3plus.pojo.mes.bean.MesProductData; -//import org.springframework.stereotype.Repository; -// -///** -// * @Author: Wynne.Lu -// * @CreateDate: 2019/12/25 1:30 下午 -// * @Description: -// **/ -//@Repository -//public interface MesProductDataRepository extends BaseMongoRepository { -//} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 9a46d75..3670819 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1889,7 +1889,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesProdBindRecord.getIsBindKey(), "isBindKey", packBean); } if (mesProdBindRecord.getActionType() != null) { - DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getActionType(), "actionType", packBean); + DdlPreparedPack.getNumEqualPack(mesProdBindRecord.getActionType(), "actionType", packBean); } if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java new file mode 100644 index 0000000..3ab2c36 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -0,0 +1,425 @@ +package cn.estsh.i3plus.pojo.mes.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.*; +import org.springframework.util.StringUtils; + +/** + * @Description: + * @Reference: Mes 条件封装 + * @Author: Crish + * @CreateDate:2019-04-22-14:58 + * @Modify: + **/ +public class MesPcnHqlPack { + + + /** + * 系统业务动作 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getMesAllData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } + + /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * MES PCN系统配置信息条件查询 + * + * @param mesConfig + * @return + */ + public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); + } + if (!StringUtils.isEmpty(mesConfig.getCfgName())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); + } + if (!StringUtils.isEmpty(mesConfig.getIsValid())) { + DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); + } + return packBean; + } + + /** + * 根据打印模板的模板代码查询模板信息 + * + * @param mesLabelTemplate + * @return + */ + public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); + return packBean; + } + + /** + * 获取工作中心下所有的投料数据 + * + * @param mesCellFeed + * @param org + * @return + */ + public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + return packBean; + } + + + /** + * 获取原材料扫描信息的对应工序BOM + * + * @param stationBom + * @param rawPartSn + * @return + */ + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); + DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); + return packBean; + } + + /** + * 生产工单查询条件封装 + * + * @param mesWorkOrder + * @return + */ + public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); + } else { + if (!StringUtils.isEmpty(mesWorkOrder.getPageType()) && "1".equals(mesWorkOrder.getPageType())) { + DdlPreparedPack.getInPackArray(new Object[]{MesPcnEnumUtil.WORK_ORDER_STATUS.OPEN.getValue(), MesPcnEnumUtil.WORK_ORDER_STATUS.PAUSE.getValue(), + MesPcnEnumUtil.WORK_ORDER_STATUS.COMPLETE.getValue()}, "workOrderStatus", packBean); + } + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getApprovalStatus())) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getIsValid())) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); + } + + // 时间段查询 + if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } + + /** + * 物料信息查询条件封装 + * + * @param mesPart + * @return + */ + public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + + if (!StringUtils.isEmpty(mesPart.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesPart.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); + } + if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); + } + if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); + } + return packBean; + } + + /** + * MES 客户信息查询条件封装 + * + * @param customer + * @return + */ + public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); + if (!StringUtils.isEmpty(customer.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(customer.getCustomerName())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); + } + + return packBean; + } + + /** + * MES PCN系维修信息条件查询 + * + * @param mesRepair + * @return + */ + public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesRepair.getRepairCode())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); + } + if (!StringUtils.isEmpty(mesRepair.getRepairName())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); + } + if (!StringUtils.isEmpty(mesRepair.getRepairType())) { + DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); + } + return packBean; + } + + /** + * MES PCN系维修信息条件查询 + * + * @param mesScrap + * @return + */ + public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesScrap.getScrapCode())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); + } + if (!StringUtils.isEmpty(mesScrap.getScrapName())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); + } + if (!StringUtils.isEmpty(mesScrap.getScrapType())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean); + } + return packBean; + } + + /** + * MES PCN缺陷原因信息条件查询 + * + * @param mesDefectCause + * @return + */ + public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean); + } + if (!StringUtils.isEmpty(mesDefectCause.getDcName())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean); + } + if (!StringUtils.isEmpty(mesDefectCause.getDcType())) { + DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean); + } + return packBean; + } + + /** + * 按条件分页查询产品条码补打印数据 + * @param mesProduceSn + * @return + */ + public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { + DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); + if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { + DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); + } + + // 时间段查询 + if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterTimeStart(), + mesProduceSn.getOutWorkCenterTimeEnd(), + "outWorkCenterTime", packBean, true); + } + return packBean; + } + + /** + * 按条件分页查询包装条码补打印数据 + * @param mesPackage + * @return + */ + public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) { + + DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPackage.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { + DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesPackage.getCreateDateTimeStart(), + mesPackage.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + + return packBean; + } + + + /** + * MES班组信息查询条件封装 + * + * @param shiftGroup + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { + + DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); + if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); + } + if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); + } + if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + + public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } + + + + /** + * 按条件分页查询类型信息数据 + * @param typeCfg + * @return + */ + public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) { + + DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode()); + if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); + } + if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean); + } + if (!StringUtils.isEmpty(typeCfg.getTypeCode())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean); + } + + return packBean; + } +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java new file mode 100644 index 0000000..3f1c2d1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :配置表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_CONFIG") +@Api("PTL配置表") +public class PtlConfig extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8720461903130735342L; + + @Column(name = "CFG_CODE") + @ApiParam("配置代码") + private String cfgCode; + + @Column(name = "CFG_NAME") + @ApiParam("配置名称") + private String cfgName; + + @Column(name = "CFG_TYPE") + @ApiParam("配置类型") + private String cfgType; + + @Column(name = "CFG_KEY") + @ApiParam("配置key") + private String cfgKey; + + @Column(name = "CFG_VALUE") + @ApiParam("配置value") + private String cfgValue; + + @Column(name = "CFG_VAULE_DESC") + @ApiParam("配置value描述") + private String cfgValueDesc; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index 7dfbfcc..1f81fd1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; import java.io.Serializable; /** @@ -73,4 +74,9 @@ public class PtlControl extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer frequency; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java new file mode 100644 index 0000000..a14a5a3 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_LABEL_TEMPLATE") +@Api(value = "打印模板", description = "打印模板") +public class PtlLabelTemplate extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8287307324960885418L; + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") + private String templateCode; + + @Column(name = "TEMPLATE_NAME") + @ApiParam(value = "模板名称") + private String templateName; + + @Lob + @Column(name = "TEMPLATE_CONTENT") + @ApiParam(value = "模板内容") + private String templateContent; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value = "模板参数拼接") + @Transient + private String paramsPack; + + @Transient + @ApiParam(value = "模板id对应的模板参数") + private List labelTemplateParamList; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java new file mode 100644 index 0000000..08a100e --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : 打印模板参数 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_LABEL_TEMPLATE_PARAM") +@Api(value = "打印模板参数", description = "打印模板参数") +public class PtlLabelTemplateParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7292367173575992422L; + @Column(name = "TEMPLATE_ID") + @ApiParam(value = "模板ID", access = "模板ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") + private String templateCode; + + @Column(name = "TEMPLATE_PARAM") + @ApiParam(value = "模板参数") + private String templateParam; + + @Lob + @Column(name = "TEMPLATE_PARAM_TEXT") + @ApiParam(value = "模板参数描述") + private String templateParamText; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value = "模板参数值") + @Transient + private String templateParamValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java new file mode 100644 index 0000000..fd3a0d9 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_NODE") +@Api("PCN节点") +public class PtlNode extends BaseBean implements Serializable { + private static final long serialVersionUID = -9140094723555406392L; + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name = "AREA_NO") + @ApiParam("区域") + private String areaNo; + + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name = "CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name = "CONNECT_COUNT") + @ApiParam("连接次数") + private Integer connectCount; + + @Column(name = "IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name = "CONNECT_TIME") + @ApiParam("连接时间") + private String connectTime; + + @Column(name = "CODE_SPECIFIC") + @ApiParam("PCN特殊字段") + private String codeSpecific; + + public int getConnectCountVal() { + return this.connectCount == null ? 0 : this.connectCount; + } + + public int getIsConnectVal() { + return this.isConnect == null ? 0 : this.isConnect; + } +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java new file mode 100644 index 0000000..d86d1b1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :PTL_对象与dao对应关系 + * @Reference : + * @Author : adair.song + * @CreateDate : 2019-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_OBJECT_DAO") +@Api("PTL_对象与dao对应关系") +public class PtlObjectDao extends BaseBean implements Serializable { + private static final long serialVersionUID = 2286752328499060L; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "DAO_CLASS") + @ApiParam("dao层类名") + private String daoClass; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java new file mode 100644 index 0000000..060404d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -0,0 +1,111 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2020-02-28 10:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_SYNC_CFG") +@Api("PTL_PCN_同步配置") +public class PtlPcnSyncCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7270948230576127126L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "OBJECT_KEY") + @ApiParam("对象主键") + private String objectKey; + + @Column(name = "SYNC_FREQUENCY") + @ApiParam("同步频率") + private Integer syncFrequency; + + @Column(name = "SYNC_TIME") + @ApiParam(value = "同步时间") + private String syncTime; + + @Column(name = "SYNC_PATTERN") + @ApiParam("同步方式 1、修改 2、新增") + private Integer syncPattern; + + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型 1.pcn获取PTL数据 2.pcn推送数据至PTL") + private Integer syncType; + + @Column(name = "LAST_SYNC_TIME") + @ApiParam(value = "上一同步时间") + private String lastSyncTime; + + @Column(name = "EXTRACT_GAP") + @ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制") + private Integer extractGap; + + @Column(name = "EXTRACT_CONDITION") + @ApiParam(value = "从数据库抽取的条件限制") + private String extractCondition; + + @Column(name = "IS_IGNORE_ORG") + @ApiParam(value = "同步的时候是否区分工厂") + private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Transient + @ApiParam("同步方式") + private String syncPatternName; + + @Transient + @ApiParam("同步类型名称") + private String syncTypeName; + + @Transient + @ApiParam(value = "同步的时候是否区分工厂") + private String isIgnoreOrgName; + + public int getIsIgnoreOrgVal() { + return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg; + } + + public int getSyncFrequencyVal() { + return this.syncFrequency == null ? 0 : this.syncFrequency; + } + + public int getSyncTypeVal() { + return this.syncType == null ? 0 : this.syncType; + } + + public int getSyncPatternVal() { + return this.syncPattern == null ? 0 : this.syncPattern; + } +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java new file mode 100644 index 0000000..110f4a8 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: crish + * @CreateDate:2019-08-23-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_SYNC_ERRORLOG") +@Api("PTL_PCN同步异常日志") +public class PtlPcnSyncErrorLog extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8285936568677939604L; + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "ERROR_SPOT") + @ApiParam("异常位置") + private String errorSpot; + + @Lob + @Column(name = "ERROR_CONTENT") + @ApiParam("异常内容") + private String errorContent; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java new file mode 100644 index 0000000..d07f684 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : 账号离线登陆表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-01 11:02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_SYS_USER_OFFLINE") +@Api(value = "账号离线登陆表", description = "账号离线登陆表。") +public class PtlSysUserOffline extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6191798106333324803L; + + @Column(name = "USER_ID") + @ApiParam(value = "人员ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号", access = "用户编号") + private String userCode; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名称", access = "账号名称") + private String userName; + + @Column(name = "LOGIN_NAME") + @ApiParam(value = "登陆名称", access = "登陆名称") + private String loginName; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + + @Lob + @Column(name="LOGIN_INFO") + @ApiParam(value ="登陆信息" , access ="登陆信息") + private String loginInfo; + + @Lob + @Column(name="MENU_LIST") + @ApiParam(value ="菜单" , access ="菜单") + private String menuList; + + @Lob + @Column(name="MODULE_LIST") + @ApiParam(value ="模块" , access ="模块") + private String moduleList; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index 5044a8b..bb576ab 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -78,7 +78,7 @@ public class PtlTag extends BaseBean implements Serializable { private Integer tagStatus; @Column(name = "LIGHT_MODE") - @ApiParam("亮灯状态") + @ApiParam("亮灯方式") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_MODE") private Integer lightMode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java new file mode 100644 index 0000000..cd3cec6 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-02-27 5:32 下午 + * @Modify: + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +@ApiModel("actor消息类型及属性") +public class AreaSectionTaskDetailModel { + + private Long id; + + @ApiParam("ip地址") + private String ip; + + @ApiParam("端口") + private String port; + + @ApiParam("亮灯方式") + private Integer lightMode; + + @ApiParam("亮灯颜色") + private Integer lightColor; + + @ApiParam("标签编号") + private Integer tagNo; + + @ApiParam("是否蜂鸣") + private Integer isBuzzing; + + @ApiParam("音乐类型") + private Integer musicType; + + @ApiParam("显示内容") + private String displayContent; + + @ApiParam("任务状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java new file mode 100644 index 0000000..28b0ed1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import cn.estsh.i3plus.pojo.ptl.bean.PtlControl; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 亮灯监听Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-03-02 13:27 + * @Modify: + **/ +@Data +@Api("亮灯监听Model") +public class PtlMonitorControlModel implements Serializable { + + @ApiParam("刷新频率") + public String refreshTime; + + @ApiParam("PCN代码") + public String pcnCode; + + @ApiParam("区域代码") + public String areaNo; + + @ApiParam("区域名称") + public String areaName; + + @ApiParam("控制器集合") + public List ptlControlList; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlConfigRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlConfigRepository.java new file mode 100644 index 0000000..a52a8fe --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlConfigRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlConfig; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlConfigRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateParamRepository.java new file mode 100644 index 0000000..aef8d8a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlLabelTemplateParam; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface PtlLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateRepository.java new file mode 100644 index 0000000..7fd7624 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlLabelTemplate; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface PtlLabelTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java new file mode 100644 index 0000000..d4b869c --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlNode; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2020-02-28-17:13 + * @Modify: + **/ +@Repository +public interface PtlNodeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlObjectDaoRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlObjectDaoRepository.java new file mode 100644 index 0000000..93c461d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlObjectDaoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlObjectDao; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2019-04-23 + * @Modify: + **/ +@Repository +public interface PtlObjectDaoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncCfgRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncCfgRepository.java new file mode 100644 index 0000000..0b0be41 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnSyncCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnSyncCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncErrorLogRepository.java new file mode 100644 index 0000000..d7e461f --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncErrorLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnSyncErrorLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: crish + * @CreateDate:2019-08-23-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnSyncErrorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSysUserOfflineRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSysUserOfflineRepository.java new file mode 100644 index 0000000..ce38550 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSysUserOfflineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlSysUserOffline; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-02 + * @Modify: + **/ +@Repository +public interface PtlSysUserOfflineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 6455056..5efbb4d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -5,15 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.ptl.bean.PtlPrinterConfigure; -import cn.estsh.i3plus.pojo.ptl.bean.PtlPrintingQueue; -import com.alibaba.fastjson.JSONObject; -import com.google.common.base.Strings; -import org.apache.commons.lang3.StringUtils; - -import java.util.*; -import java.util.stream.Collectors; +import cn.estsh.i3plus.pojo.ptl.bean.*; +import org.springframework.util.StringUtils; /** * @Description : PTL对象封装 @@ -34,13 +27,13 @@ public class PtlHqlPack { public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + if (!StringUtils.isEmpty(bean.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); - if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(bean.getCreateDateTimeStart()) && !StringUtils.isEmpty(bean.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); } // 封装有效状态、删除状态、创建人和创建时间 @@ -51,6 +44,20 @@ public class PtlHqlPack { } /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** * 打印机管理信息分页查询条件 * * @param ptlPrinterConfigure @@ -85,4 +92,95 @@ public class PtlHqlPack { return result; } + /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * 配置信息 + * @param ptlConfig + * @return + */ + public static DdlPackBean getPtlConfig(PtlConfig ptlConfig) { + DdlPackBean packBean = getAllBaseDataByNormalPro(ptlConfig, ptlConfig.getOrganizeCode()); + if (!StringUtils.isEmpty(ptlConfig.getCfgCode())) { + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgCode(), "cfgCode", packBean); + } + if (!StringUtils.isEmpty(ptlConfig.getCfgType())) { + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgType(), "cfgType", packBean); + } + if (!StringUtils.isEmpty(ptlConfig.getCfgKey())) { + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgKey(), "cfgKey", packBean); + } + return packBean; + } + + + /** + * PTL-PCN节点查询条件封装 + * + * @param ptlPcn + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlPcnByCondition(PtlNode ptlPcn, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(ptlPcn.getConnectIp())) { + DdlPreparedPack.getStringLikerPack(ptlPcn.getConnectIp(), "connectIp", packBean); + } + if (!StringUtils.isEmpty(ptlPcn.getPcnName())) { + DdlPreparedPack.getStringLikerPack(ptlPcn.getPcnName(), "pcnName", packBean); + } + if (!StringUtils.isEmpty(ptlPcn.getPcnCode())) { + DdlPreparedPack.getStringLikerPack(ptlPcn.getPcnCode(), "pcnCode", packBean); + } + if (!StringUtils.isEmpty(ptlPcn.getAreaNo())) { + DdlPreparedPack.getStringLikerPack(ptlPcn.getAreaNo(), "areaNo", packBean); + } + if (ptlPcn.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(ptlPcn.getIsValid(), "isValid", packBean); + } + return packBean; + } + + /** + * PTL-PCN同步配置查询条件封装 + * + * @param pcnSyncCfg + * @return + */ + public static DdlPackBean getPtlPcnSyncCfg(PtlPcnSyncCfg pcnSyncCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); + DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); + return packBean; + } + + /** + * PTL对象与dao对应关系查询条件封装 + * + * @param objectDao + * @return + */ + public static DdlPackBean getPtlObjectDao(PtlObjectDao objectDao, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode); + if (!StringUtils.isEmpty(objectDao.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(objectDao.getDaoClass())) { + DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean); + } + + return packBean; + } } diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..55e4e84 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,16 @@ +# must be unique in a given SonarQube instance +sonar.projectKey=i3plus.pojo:i3plus-pojo + +# --- optional properties --- + +# defaults to project key +sonar.projectName=i3plus-pojo +# defaults to 'not provided' +sonar.projectVersion=1.0-DEV-SNAPSHOT + +# Path is relative to the sonar-project.properties file. Defaults to . +#sonar.sources=./ +#sonar.java.binaries=target + +# Encoding of the source code. Default is default system encoding +sonar.sourceEncoding=UTF-8 \ No newline at end of file