diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index bc83711..850ce6c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1598,7 +1598,8 @@ public class MesEnumUtil { MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), MES_PLC(390,"PLC地址清单"), MES_PROCESS(400,"工序信息"), - MES_KPSN_RULE(410,"关键件条码校验规则"); + MES_KPSN_RULE(410,"关键件条码校验规则"), + MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列"); private int value; private String description; @@ -4062,4 +4063,75 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIT_ACTUAL_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_QUEUE_JIT_ACTUAL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 客户JIT生产队列特殊标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + NORMAL(10, "正常"), + EMPTYING(20, "放空"); + + private int value; + private String description; + + MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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 4642ad9..7d3d688 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 @@ -689,10 +689,10 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MonitorProcessMessageType { + public enum MONITOR_PROCESS_MESSAGE_TYPE { 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", "断开控制器"), + 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", "控制器反馈信号"), @@ -704,7 +704,7 @@ public class PtlPcnEnumUtil { private String callClass; private String description; - MonitorProcessMessageType(int value, String code, String callClass, String description) { + MONITOR_PROCESS_MESSAGE_TYPE(int value, String code, String callClass, String description) { this.value = value; this.code = code; this.callClass = callClass; @@ -727,11 +727,11 @@ public class PtlPcnEnumUtil { return description; } - public static MonitorProcessMessageType getTypeByValue(String code) { + public static MONITOR_PROCESS_MESSAGE_TYPE getTypeByValue(String code) { if (StringUtils.isEmpty(code)) { return null; } - for (MonitorProcessMessageType enums : MonitorProcessMessageType.values()) { + for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) { if (enums.getCode().equals(code)) { return enums; } @@ -741,7 +741,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum InterfaceSignalMessageType { + public enum INTERFACE_SIGNAL_MESSAGE_TYPE { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), @@ -757,7 +757,7 @@ public class PtlPcnEnumUtil { private String callClass; private String description; - InterfaceSignalMessageType(int value, String code, String callClass, String description) { + INTERFACE_SIGNAL_MESSAGE_TYPE(int value, String code, String callClass, String description) { this.value = value; this.code = code; this.callClass = callClass; @@ -780,11 +780,11 @@ public class PtlPcnEnumUtil { return description; } - public static InterfaceSignalMessageType getTypeByValue(String code) { + public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { if (StringUtils.isEmpty(code)) { return null; } - for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { + for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { if (enums.getCode().equals(code)) { return enums; } @@ -793,25 +793,33 @@ public class PtlPcnEnumUtil { } } + /** + * 生成任务actor message type + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsBusiType { - MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), - INTERFACE_PROCESS(10, "INTERFACE_PROCESS", "界面处理"); + public enum GEN_TASK_MESSAGE_TYPE { + GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); private int value; private String code; + private String callClass; private String description; - WsBusiType(int value, String code, String description) { + GEN_TASK_MESSAGE_TYPE(int value, String code, String callClass, String description) { this.value = value; - this.description = description; this.code = code; + this.callClass = callClass; + this.description = description; } public int getValue() { return value; } + public String getCallClass() { + return callClass; + } + public String getCode() { return code; } @@ -819,22 +827,33 @@ public class PtlPcnEnumUtil { public String getDescription() { return description; } + + public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsDataType { - TEXT(10, "TEXT", "正常信息"), - EXP_TEXT(20, "EXP_TEXT", "异常信息"), - TABLE(30, "TABLE", "表格"); + public enum WsBusiType { + MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), + INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理"); private int value; private String code; private String description; - WsDataType(int value, String code, String description) { + WsBusiType(int value, String code, String description) { this.value = value; - this.code = code; this.description = description; + this.code = code; } public int getValue() { @@ -851,16 +870,16 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum STATUS_TYPE { - START(10, "START", "开始状态"), - FINISH(20, "FINISH", "完成状态"), - TERMINATE(30, "TERMINATE", "中断状态"); + public enum WsDataType { + TEXT(10, "TEXT", "正常信息"), + EXP_TEXT(20, "EXP_TEXT", "异常信息"), + TABLE(30, "TABLE", "表格"); private int value; private String code; private String description; - STATUS_TYPE(int value, String code, String description) { + WsDataType(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -880,15 +899,16 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum AREA_SECTION_TASK_DETAIL_STATUS { - CREATE(10, "CREATE", "创建"), - COMPLETE(20, "COMPLETE", "完成"); + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + FINISH(20, "FINISH", "完成状态"), + TERMINATE(30, "TERMINATE", "中断状态"); private int value; private String code; private String description; - AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) { + STATUS_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -907,22 +927,18 @@ public class PtlPcnEnumUtil { } } - /** - * 生成任务actor message type - */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum GenTaskMessageType { - GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); + public enum AREA_SECTION_TASK_DETAIL_STATUS { + CREATE(10, "CREATE", "创建"), + COMPLETE(20, "COMPLETE", "完成"); private int value; private String code; - private String callClass; private String description; - GenTaskMessageType(int value, String code, String callClass, String description) { + AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) { this.value = value; this.code = code; - this.callClass = callClass; this.description = description; } @@ -930,10 +946,6 @@ public class PtlPcnEnumUtil { return value; } - public String getCallClass() { - return callClass; - } - public String getCode() { return code; } @@ -941,18 +953,6 @@ public class PtlPcnEnumUtil { public String getDescription() { return description; } - - public static InterfaceSignalMessageType getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } } /** @@ -1747,4 +1747,54 @@ public class PtlPcnEnumUtil { return valueOf(val); } } + + /** + * redis过期时间 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXPIRE_TIME { + + NEVER(-1, "不过期"), + ONE_HOUR(3600, "一小时"), + FIVE_MINS(300, "5分钟"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), + ONE_MIN(60, "一分钟"); + + private int value; + private String description; + + EXPIRE_TIME(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 String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : 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 e7b8cd0..57cadad 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 @@ -3857,7 +3857,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRINT_TYPE { - SN(10, "SN"); + SN(10, "SN"), + PACKAGE_NO(20, "PACKAGE_NO"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index c8da995..6224656 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -37,4 +37,12 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "CUST_PROD_LINE_NAME") @ApiParam("客户产线名称") private String custProdLineName; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; } 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 b326a99..011f6f5 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 @@ -88,6 +88,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("产品编码匹配类型") private Integer productMatchType; + @Column(name = "产品生产类型") + @ApiParam("产品类型名称") + private String pptCode; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java new file mode 100644 index 0000000..e680c19 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java @@ -0,0 +1,38 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/3/5 11:54 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_PRODUCE_TYPE") +@Api("产品生产类型") +public class MesPartProduceType extends BaseBean implements Serializable { + private static final long serialVersionUID = 9191695513960958568L; + + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") + private String pptCode; + + @Column(name = "PPT_NAME") + @ApiParam("产品生产类型名称") + private String pptName; +} 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 0285bb7..5fb24e8 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 @@ -45,4 +45,8 @@ public class MesProdRouteCfg extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") + private String pptCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java new file mode 100644 index 0000000..21fbfe9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java @@ -0,0 +1,42 @@ +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 : joke + * @CreateDate : 2020-03-06 9:34 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_GROUP") +@Api("MES_生产组") +public class MesProduceGroup extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6926189371427937743L; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "PG_NAME") + @ApiParam("生产组名称") + private String pgName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java new file mode 100644 index 0000000..0648f2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.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; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:22 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_GROUP_CFG") +@Api("MES_生产组配置") +public class MesProduceGroupCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 82611799819312505L; + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @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/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java new file mode 100644 index 0000000..1133c1a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -0,0 +1,49 @@ +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_QUEUE_JIT_ACTUAL_DETAIL + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_GROUP_COUNT") +@Api("MES_队列分组计数") +public class MesQueueGroupCount extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7799006330177462162L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "QTY") + @ApiParam("分组数量") + private Integer qty; + + @Column(name = "CNT_QTY") + @ApiParam("累计数") + private Integer cntQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java new file mode 100644 index 0000000..c9e3f4f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java @@ -0,0 +1,49 @@ +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_QUEUE_GROUP_COUNT + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_GROUP_RULE") +@Api("MES_队列分组规则") +public class MesQueueGroupRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6857842499743356177L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "QTY") + @ApiParam("分组数量") + private Integer qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java new file mode 100644 index 0000000..e3f8e55 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -0,0 +1,91 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_ACTUAL") +@Api("MES_客户JIT生产队列") +public class MesQueueJitActual extends BaseBean implements Serializable { + + private static final long serialVersionUID = 655875369308810110L; + + @Column(name = "JIS_ACTUAL_NO") + @ApiParam("队列编号") + private String jisActualNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "SEQ") + @ApiParam("排序号") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; + + @Column(name = "CUST_POINT_DATE") + @ApiParam("客户需求时间") + private String custPointDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Transient + @ApiParam("客户需求开始时间") + private String custPointStartDate; + + @Transient + @ApiParam("客户需求结束时间") + private String custPointEndDate; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java new file mode 100644 index 0000000..77e6c6f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -0,0 +1,61 @@ +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_QUEUE_JIT_ACTUAL + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL") +@Api("MES_客户JIT生产队列明细") +public class MesQueueJitActualDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1442091799346314190L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java new file mode 100644 index 0000000..d982dab --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -0,0 +1,77 @@ +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 : joke + * @CreateDate : 2020-03-06 9:40 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN") +@Api("MES_客户JIT预装队列") +public class MesQueueJitPlan extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6613487463796132500L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "VEHICLE_CODE") + @ApiParam("选配码") + private String vehicleCode; + + @Column(name = "SEQ") + @ApiParam("计划排序号") + private String seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "PLAN_DATE") + @ApiParam("计划上线时间") + private String planDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "VERSION") + @ApiParam("版本号") + private String version; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java new file mode 100644 index 0000000..1d9faad --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.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 : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:01 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN_BOM") +@Api("MES_客户JIT预装队列BOM") +public class MesQueueJitPlanBom extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2037991315471333415L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; + + @Column(name = "QTY") + @ApiParam("用量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java new file mode 100644 index 0000000..7111b75 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -0,0 +1,49 @@ +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 : joke + * @CreateDate : 2020-03-06 9:58 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL") +@Api("MES_客户JIT预装队列明细") +public class MesQueueJitPlanDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1263996676519565026L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; +} 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 cb39dc8..040bac7 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 @@ -72,6 +72,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; + @Column(name = "产品生产类型") + @ApiParam("产品类型名称") + private String pptCode; + @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java new file mode 100644 index 0000000..822087a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/3/9 15:35 + * @desc + */ +@Data +public class ActorMessageModel { + + private String msgType; + + private String clientInfo; + + private String workCellCode; + + private String workCenterCode; + + private String organizeCode; + + private String routeCode; + + private String serialNumber; + + private String productSn; + + private T dataObj; + + private List dataList; + + private Map dataMap; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 46134cc..d4961d3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 6b7eedd..7636eae 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.java new file mode 100644 index 0000000..0dcd234 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.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.MesPartProduceType; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartProduceTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java new file mode 100644 index 0000000..9065d3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.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.MesProduceGroupCfg; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:53 上午 + * @Modify: + **/ +public interface MesProduceGroupCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java new file mode 100644 index 0000000..55e5df0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.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.MesProduceGroup; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:52 上午 + * @Modify: + **/ +public interface MesProduceGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java new file mode 100644 index 0000000..5b5e0f3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.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.MesQueueGroupCount; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:54 上午 + * @Modify: + **/ +public interface MesQueueGroupCountRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java new file mode 100644 index 0000000..93a9798 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.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.MesQueueGroupRule; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:55 上午 + * @Modify: + **/ +public interface MesQueueGroupRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java new file mode 100644 index 0000000..2a56b7b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.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.MesQueueJitActualDetail; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesQueueJitActualDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java new file mode 100644 index 0000000..d7d0062 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.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.MesQueueJitActual; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueJitActualRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java new file mode 100644 index 0000000..182e8d9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.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.MesQueueJitPlanBom; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:58 上午 + * @Modify: + **/ +public interface MesQueueJitPlanBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java new file mode 100644 index 0000000..f645abc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.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.MesQueueJitPlanDetail; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:58 上午 + * @Modify: + **/ +public interface MesQueueJitPlanDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java new file mode 100644 index 0000000..2168ea9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.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.MesQueueJitPlan; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesQueueJitPlanRepository extends BaseRepository { +} 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 3670819..9e068c0 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 @@ -2164,4 +2164,46 @@ public class MesHqlPack { } return packBean; } + + /** + * 客户JIT生产队列 + * + * @param queueJitActual + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getCustPlantCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getCustPlantCode(), "custPlantCode", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getCustFlagNo())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getCustFlagNo(), "custFlagNo", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getVinCode(), "vinCode", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean); + } + if (queueJitActual.getStatus() != null) { + DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); + } + if (!StringUtil.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtil.isEmpty(queueJitActual.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + queueJitActual.getCreateDateTimeStart(), + queueJitActual.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtil.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtil.isEmpty(queueJitActual.getCustPointEndDate())) { + DdlPreparedPack.timeBuilder( + queueJitActual.getCustPointStartDate(), + queueJitActual.getCustPointEndDate(), + "createDatetime", packBean, true); + } + return packBean; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java new file mode 100644 index 0000000..e31f9c1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +public @interface ElasticSearch { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java new file mode 100644 index 0000000..b169b83 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface Json4Es { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index 64e3c64..cb738fd 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -31,7 +31,7 @@ public class PtlAreaTask extends BaseBean implements Serializable { @Column(name = "AREA_TASK_NO") @ApiParam("区域任务编号") - private Long areaTaskNo; + private String areaTaskNo; @Column(name = "AREA_NO") @ApiParam("区域代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java new file mode 100644 index 0000000..0de2878 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java @@ -0,0 +1,56 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2020/02/15 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_SYNC_DEAD_LETTER", indexes = { + @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"), + @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE") +}) +@Api("数据同步死信") +public class PtlSyncDeadLetter extends BaseBean implements Serializable { + private static final long serialVersionUID = 1151025992437433734L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型") + private Integer syncType; + + @Column(name = "PCN_CODE") + @ApiParam("pcn代码") + private String pcnCode; + + @Lob + @Column(name = "EX_MSG") + @ApiParam("同步数据") + private String exMsg; + + @Lob + @Column(name = "DATA") + @ApiParam("同步数据") + private String data; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index 34116b7..13576e2 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.ptl.model; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -29,6 +30,9 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("消息类型") private String msgType; + @ApiModelProperty("是否重试") + private Integer isRestart= CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @ApiModelProperty("消息数据") private Map msgData; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java new file mode 100644 index 0000000..c4bbcd4 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.ptl.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProductDataModel { + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java new file mode 100644 index 0000000..5f9062a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlSyncDeadLetter; + +/** + * @author Wynne.Lu + * @date 2020/2/18 09:19 + * @desc + */ +public interface PtlSyncDeadLetterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 9808095..a56cbf7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1301,6 +1301,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false,false); if (wmsStockSn.getIsValid() != null) {