diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 3fcd451..393ee0e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -10,15 +10,12 @@ import java.util.Date; @Data public class GanttCalendarModel { - private Long parent; + private Long resourceId; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date start_date; + private Date startDate; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date end_date; - private String color; - private Long id; - private Long workId; - private String text; + private Date endDate; + private String cls; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index ef05abd..f2ef95b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.GenericGenerator; +import org.springframework.data.mongodb.core.index.IndexDirection; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; @@ -78,6 +80,7 @@ public abstract class BaseBean implements Serializable { @AnnoOutputColumn(hidden = true) public String createUser; + @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") public String createDatetime; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index 3cb1b28..dfb4079 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -221,8 +221,9 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PARAM_VALUE_TYPE{ - NUMBER(1,"数字"), - STRING(2,"字符串"); + INTEGER(1,"整数"), + STRING(2,"字符串"), + FLOAT(3,"浮点"); private int value; private String description; @@ -341,4 +342,116 @@ public class LacEnumUtil { } } + /** + * 逻辑运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOGICAL_OPERATOR{ + OR(10,"或"), + AND(20,"与"); + + private int value; + private String description; + + LOGICAL_OPERATOR(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; + } + + } + + /** + * 关系运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RELATIONAL_OPERATOR{ + GT(10,">"), + LT(20,"<"), + EQ(20,"=="), + NE(20,"!="), + GE(20,">="), + LE(20,"<="); + + private int value; + private String description; + + RELATIONAL_OPERATOR(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; + } + + } + + /** + * 任务检查类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TASK_CHECK_TYPE{ + MASTER(10,"主"), + SLAVE(20,"从"); + + private int value; + private String description; + + TASK_CHECK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + } 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 9c9e922..1ac00de 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 @@ -1417,8 +1417,14 @@ public class MesEnumUtil { MES_QC_CHECK_STANDARD(250, "质量检测标准"), MES_FAULT_CAUSE(260,"设备故障原因"), MES_FAULT_METHOD(270,"设备故障处理措施"), - MES_FAULT_PHENOMENON(280,"设备故障现象"); - + MES_FAULT_PHENOMENON(280,"设备故障现象"), + MES_DEFECT(290,"缺陷"), + MES_DEFECT_CAUSE(300,"缺陷原因"), + MES_SCRAP(310,"报废原因"), + MES_REPAIR(320,"质量数据处理措施"), + MES_EQU_TASK_PLAN(330,"设备作业周期计划"), + MES_PART_OJBECT(340,"物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"); private int value; private String description; 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 7a0883a..50a5461 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 @@ -51,6 +51,26 @@ public class WmsEnumUtil { } return null; } + + 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 int descriptionOfValue(String desc) { + int tmp = DISABLE.value; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -1015,6 +1035,62 @@ public class WmsEnumUtil { } } + + /** + * 业务表：库存条码状态 + * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CARRIAGE_STATUS { + CREATE(10, "创建"), + PUBLISH(20, "发布"), + RECEIVE(30, "承运商接收"), + ARRIVE(40, "车辆到达"), + INSTALL(50, "装车完成"), + CARRIAGE_IN(60, "运输中"), + CLOSE(70, "已关单"); + + private int value; + private String description; + + CARRIAGE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * 单据是否生成任务状态 */ @@ -1922,7 +1998,7 @@ public class WmsEnumUtil { * 成功标志枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RC_OK_VALUE { + public enum AM_OK_VALUE { IS_TRUE(10, true, "成功"), IS_FALSE(20, false, "失败"); @@ -1931,7 +2007,7 @@ public class WmsEnumUtil { private boolean codeValue; private String description; - RC_OK_VALUE(int value, boolean codeValue, String description) { + AM_OK_VALUE(int value, boolean codeValue, String description) { this.value = value; this.codeValue = codeValue; this.description = description; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index cb0905e..49e34bf 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.lac.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -75,6 +77,7 @@ public class LacSuitTaskParam extends BaseBean { @Column(name="PARAM_TYPE") @ApiParam(value ="参数类型") + @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_TYPE.class) private Integer paramType; @Column(name="PARAM_VALUE_TYPE") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java new file mode 100644 index 0000000..5c14b36 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; +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.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-12-09 14:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_TASK_CHECK") +@Api(value="任务检查",description = "任务检查") +public class LacTaskCheck extends BaseBean { + + @Column(name="COMMAND_STACK_TEMPLATE_ID") + @ApiParam(value ="指令集模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTemplateId; + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; + + @Column(name="STEP_TASK_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepTaskId; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CHECK_TYPE") + @ApiParam(value ="任务检查类型") + @AnnoOutputColumn(refClass = LacEnumUtil.TASK_CHECK_TYPE.class) + private Integer taskCheckType; + + @Column(name="TASK_CHECK_GROUP") + @ApiParam(value ="任务检查组") + private String taskCheckGroup; + + @Column(name="PARAM_ID") + @ApiParam(value ="参数id") + @JsonSerialize(using = ToStringSerializer.class) + private Long paramId; + + @Column(name="PARAM_NAME_RDD") + @ApiParam(value ="任务名称") + private String paramNameRdd; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class) + private Integer paramValueType; + + @Column(name="RELATIONAL_OPERATOR") + @ApiParam(value ="关系运算符") + @AnnoOutputColumn(refClass = LacEnumUtil.RELATIONAL_OPERATOR.class) + private Integer relationalOperator; + + @Column(name="LOGICAL_OPERATOR") + @ApiParam(value ="逻辑运算符") + @AnnoOutputColumn(refClass = LacEnumUtil.LOGICAL_OPERATOR.class) + private Integer logicalOperator; + + @Column(name="CHECK_VALUE") + @ApiParam(value ="检查值") + private String checkValue; + + @Column(name="TARGET_STEP_ID") + @ApiParam(value ="目标步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long targetStepId; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java new file mode 100644 index 0000000..82ab490 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacTaskCheck; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-12-10 15:10 + * @Modify: + **/ +public interface LacTaskCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 8f317e9..10b2e48 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -4,17 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType; -import cn.estsh.i3plus.pojo.lac.bean.LacLogTask; -import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter; -import cn.estsh.i3plus.pojo.lac.bean.LacTaskType; +import cn.estsh.i3plus.pojo.lac.bean.*; + import java.util.List; /** @@ -187,4 +178,10 @@ public class LacHqlPack { DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean); return ddlPackBean; } + + public static DdlPackBean packHqlCheckLacTaskCheckMasterOnly(LacTaskCheck lacTaskCheck){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(lacTaskCheck); + DdlPreparedPack.getStringEqualPack(lacTaskCheck.getTaskCheckGroup(),"taskCheckGroup",ddlPackBean); + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 30c641c..2b6489c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,30 +23,33 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_DEFECT_RECORD") +@Table(name = "MES_DEFECT_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("不良信息记录表") public class MesDefectRecord extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("物料名称") private String partName; - @Column(name="DEFECT_CODE") + @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; - @Column(name="DEFECT_NAME") + @Column(name = "DEFECT_NAME") @ApiParam("缺陷名称") private String defectName; - @Column(name="DEFECT_LOCATION") + @Column(name = "DEFECT_LOCATION") @ApiParam("缺陷位置") private String defectLocation; @@ -57,19 +57,19 @@ public class MesDefectRecord extends BaseBean { @ApiParam("面位") private String sideLocation; - @Column(name="REPAIR_STATUS") + @Column(name = "REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 18b83aa..209c69a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.math.BigDecimal; /** @@ -26,7 +23,10 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD") +@Table(name = "MES_DISMANTLE_RECORD", indexes = { + @Index(columnList = "SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("物料拆解记录表") public class MesDismantleRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index f21218e..39d5e93 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Author: Wynne.Lu @@ -24,7 +21,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格") public class MesPackage extends BaseBean { @Column(name = "PACKAGE_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 883c12a..88c635c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL") +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java index 19bd5d9..ddcdc82 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL") +@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java index b6833de..ff1c82d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER") +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产主计划") public class MesPlanOrder extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index 111be8e..984e6d6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; 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 javax.persistence.*; /** * @Description :产品绑定记录表 @@ -26,7 +23,10 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD") +@Table(name = "MES_PROD_BIND_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "KP_SN") +}) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean { @Column(name = "SERIAL_NUMBER") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 87fcaeb..6eb2592 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +23,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN") +@Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { @@ -128,7 +129,7 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("返回信息") private String resultMsg; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index c9bbc09..7a17c7d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 产品条码履历实体类 @@ -25,7 +22,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL") +@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 5431d77..532ec2a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA") +@Table(name = "MES_PRODUCT_DATA", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "OBJECT_CODE"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") @@ -48,6 +54,10 @@ public class MesProductData extends BaseBean { @ApiParam("产品条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 7d03fcd..20fa8b6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA") +@Table(name = "MES_QC_CHECK_DATA", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "SN") +}) @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index fd39205..c098cd9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER") +@Table(name = "MES_QUEUE_ORDER", indexes = { + @Index(columnList = "CUST_FLAG_NO") +}) @Api("生产队列主表") public class MesQueueOrder extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 455c6be..f058270 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL") +@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { + @Index(columnList = "ORDER_NO") +}) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java index 4a2bae6..b9d4630 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN") +@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") public class MesRawPartSn extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java index 92c37be..e6974e9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD") +@Table(name = "MES_REPAIR_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("维修信息记录表") public class MesRepairRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index 46b20b1..f7cad22 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD") +@Table(name = "MES_SCRAP_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("报废信息记录表") public class MesScrapRecord extends BaseBean { 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 d52c590..a5e339d 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD") +@Table(name = "MES_WC_CHECK_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean { 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 cdbbbe4..811c01c 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean { 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 f6805e0..4a52798 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER") +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产工单") public class MesWorkOrder extends BaseBean { @Column(name = "ORDER_NO") 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 616096a..acaf12d 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,10 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG") +@Table(name = "MES_WORK_ORDER_LOG", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 3758b18..3f7588b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_ORDER") +@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("客户信息") public class MesCustOrder extends BaseBean { 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 9008e5e..270686e 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.util.Date; @@ -25,30 +26,33 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_RECORD") +@Table(name = "MES_DEFECT_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("不良信息记录表") public class MesDefectRecord extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("物料名称") private String partName; - @Column(name="DEFECT_CODE") + @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; - @Column(name="DEFECT_NAME") + @Column(name = "DEFECT_NAME") @ApiParam("缺陷名称") private String defectName; - @Column(name="DEFECT_LOCATION") + @Column(name = "DEFECT_LOCATION") @ApiParam("缺陷位置") private String defectLocation; @@ -56,19 +60,19 @@ public class MesDefectRecord extends BaseBean { @ApiParam("面位") private String sideLocation; - @Column(name="REPAIR_STATUS") + @Column(name = "REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; 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 d340256..d75e2d4 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,10 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD") +@Table(name = "MES_DISMANTLE_RECORD", indexes = { + @Index(columnList = "SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("物料拆解记录表") public class MesDismantleRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 8ad11ab..6b6fbc2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -27,7 +24,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK") +@Table(name = "MES_EQU_TASK", indexes = { + @Index(columnList = "TASK_NO") +}) @Api("设备作业任务") public class MesEquTask extends BaseBean { @@ -84,7 +83,7 @@ public class MesEquTask extends BaseBean { private String pageType; @Transient - @ApiParam(value ="明细列表") + @ApiParam(value = "明细列表") private List mesEquTaskDetailList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index c62fb18..8f3b70f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -27,7 +24,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK_DETAIL") +@Table(name = "MES_EQU_TASK_DETAIL", indexes = { + @Index(columnList = "EQUIPMENT_CODE") +}) @Api("设备作业任务明细") public class MesEquTaskDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java index 1ffe9c2..2ecea3c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :设备维修作业记录 @@ -26,7 +23,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK_REPAIR_RECORD") +@Table(name = "MES_EQU_TASK_REPAIR_RECORD", indexes = { + @Index(columnList = "EQUIPMENT_CODE") +}) @Api("设备维修作业记录") public class MesEquTaskRepairRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 41d7209..b3c3b6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :设备点检保养作业记录 @@ -26,7 +23,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK_STANDARD_RECORD") +@Table(name = "MES_EQU_TASK_STANDARD_RECORD", indexes = { + @Index(columnList = "EQUIPMENT_CODE") +}) @Api("设备点检保养作业记录") public class MesEquTaskStandardRecord extends BaseBean { 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 93339b7..ec8810e 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Author: Wynne.Lu @@ -24,7 +21,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格") public class MesPackage extends BaseBean { @Column(name = "PACKAGE_NO") 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 95483c1..20a1b79 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL") +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean { 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 76a808b..589f3f6 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL") +@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean { 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 0cbb477..b803060 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER") +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产主计划") public class MesPlanOrder extends BaseBean { @Column(name = "ORDER_NO") 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 f689f22..32ad09c 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 @@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,10 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD") +@Table(name = "MES_PROD_BIND_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "KP_SN") +}) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean { @Column(name = "SERIAL_NUMBER") 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 c543454..4a0664a 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN") +@Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("产品条码表") public class MesProduceSn extends BaseBean { @@ -121,7 +122,7 @@ public class MesProduceSn extends BaseBean { @ApiParam("托盘号") private String trayNo; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; 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 79037ef..2ffdb60 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 产品条码履历实体类 @@ -25,7 +22,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL") +@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") @@ -120,7 +122,7 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("托盘号") private String trayNo; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 504c480..2b2d84a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; @@ -26,7 +27,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA") +@Table(name = "MES_PRODUCT_DATA", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "OBJECT_CODE"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") 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 a315dc6..1daf186 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA") +@Table(name = "MES_QC_CHECK_DATA", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "SN") +}) @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean { 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 7ea3abb..d98293c 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -29,7 +26,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER") +@Table(name = "MES_QUEUE_ORDER", indexes = { + @Index(columnList = "CUST_FLAG_NO") +}) @Api("生产队列主表") public class MesQueueOrder extends BaseBean { @Column(name = "ORDER_NO") 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 416ae36..c57ba78 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL") +@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { + @Index(columnList = "ORDER_NO") +}) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name = "ORDER_NO") 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 77054d4..5c3ceb5 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN") +@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") public class MesRawPartSn extends BaseBean { @Column(name = "PART_NO") 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 5e3e15f..6d526a0 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,10 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD") +@Table(name = "MES_REPAIR_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("维修信息记录表") public class MesRepairRecord extends BaseBean { 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 22086da..8138447 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD") +@Table(name = "MES_SCRAP_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("报废信息记录表") public class MesScrapRecord extends BaseBean { 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 5aef545..9beab8f 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD") +@Table(name = "MES_WC_CHECK_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean { 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 9f3f20a..7806868 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean { 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 a5523bd..557402d 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER") +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产工单") public class MesWorkOrder extends BaseBean { @Column(name = "ORDER_NO") 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 f3c006d..c9d175e 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,10 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG") +@Table(name = "MES_WORK_ORDER_LOG", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java new file mode 100644 index 0000000..4d3f2fd --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.*; +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 dragon + * @CreateDate 2019/12/10 11:26 + * @Modify + */ +@Data +@Api("作业流程导入Model") +public class WmsAgImportModel implements Serializable { + private static final long serialVersionUID = 5322363872992177667L; + @ApiParam("流程集合") + public List agList; + @ApiParam("流程明细集合") + List agdList; + @ApiParam("步骤调用参数集合") + List ascpList; + @ApiParam("作业步骤集合") + List asList; + @ApiParam("作业步骤调用集合") + List ascList; + @ApiParam("作业组件集合") + List amList; + @ApiParam("作业组件参数集合") + List ampList; + @ApiParam("作业步骤参数类型集合") + List astList; + @ApiParam("工厂代码") + public String organizeCode; + @ApiParam("是否覆盖") + public Integer isConvert; + @ApiParam("用户名") + public String userName; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index f277ace..e4b46a1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -9,10 +9,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -27,16 +27,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION", - indexes = { - @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID") - } -) +@Table(name="SYS_LOG_EXCEPTION") @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { //CommonEnumUtil.SOFT_TYPE + @Indexed @Column(name="EXC_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 5e20049..57bb047 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -12,10 +12,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -30,16 +30,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_OPERATE", - indexes = { - @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "OPERATE_MODULE DESC", name = "LOG_INDEX_OPERATE_MODULE"), - @Index(columnList = "OPERATE_TYPE DESC", name = "LOG_INDEX_OPERATE_TYPE") -}) +@Table(name="SYS_LOG_OPERATE") @Api(value="操作日志表",description = "操作日志表") public class SysLogOperate extends BaseBean { - //CommonEnumUtil.SOFT_TYPE + @Indexed @Column(name="OPERATE_MODULE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") @@ -53,7 +48,7 @@ public class SysLogOperate extends BaseBean { return operateModuleName; } - //ImppEnumUtil.OPERATE_TYPE（枚举） + @Indexed @Column(name="OPERATE_TYPE") @ApiParam(value ="操作类型" , example = "-1") @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index f4fdc54..9db1e2f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -12,10 +12,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -30,24 +30,19 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_SYSTEM", - indexes = { - @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "LOG_LEVEL", name = "LOG_INDEX_LOG_LEVEL"), - @Index(columnList = "LOG_MODULE_ID", name = "LOG_INDEX_LOG_MODULE_ID") - }) +@Table(name="SYS_LOG_SYSTEM") @Api(value="系统日志表",description = "系统日志表") public class SysLogSystem extends BaseBean { + @Indexed @Column(name="LOG_LEVEL") @ApiParam(value ="日志级别" , example ="1") - //ImppEnumUtil.LOG_LEVEL @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name") private Integer logLevel; + @Indexed @Column(name="LOG_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") - //CommonEnumUtil.SOFT_TYPE @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer logModuleId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index a6a8dbb..5268d83 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -11,9 +11,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; + import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -28,12 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_TASK_TIME", - indexes = { - @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "NAME DESC", name = "LOG_INDEX_LOG_NAME"), - @Index(columnList = "GROUP_NAME DESC", name = "LOG_INDEX_LOG_GROUP_NAME") - }) +@Table(name="SYS_LOG_TASK_TIME") @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { @@ -79,6 +75,7 @@ public class SysLogTaskTime extends BaseBean { @ApiParam(value ="任务周期表达式") private String taskCycleExpsRdd; + @Indexed @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index 403d234..23db18b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -9,11 +9,8 @@ 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 javax.persistence.Transient; + +import javax.persistence.*; import java.util.List; /** @@ -28,7 +25,12 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_SUIT_DATA_DETAIL") +@Table(name = "BS_SUIT_DATA_DETAIL",indexes = { + @Index(name="bs_suit_data_detail_suit_record_id_idx",columnList = "SUIT_RECORD_ID"), + @Index(name="bs_suit_data_detail_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="bs_suit_data_detail_suit_case_code_idx",columnList = "SUIT_CASE_CODE_RDD"), + @Index(name="bs_suit_data_detail_create_date_time_idx",columnList = "CREATE_DATE_TIME") +}) @Api(value = "适配报文详情", description = "适配报文详情") public class BsSuitDataDetail extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 260df43..c451f54 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -9,11 +9,8 @@ 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 javax.persistence.Transient; + +import javax.persistence.*; import java.util.List; /** @@ -28,7 +25,12 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_SUIT_RECORD") +@Table(name = "BS_SUIT_RECORD",indexes = { + @Index(name="bs_suit_record_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="bs_suit_record_suit_case_code_idx",columnList = "SUIT_CASE_CODE"), + @Index(name="bs_suit_record_create_date_time_idx",columnList = "CREATE_DATE_TIME"), + @Index(name="bs_suit_record_process_time_idx",columnList = "PROCESS_TIME"), +}) @Api(value = "适配记录", description = "适配记录") public class BsSuitRecord extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index 5b384ce..e85deb6 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -9,6 +9,7 @@ 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; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "SUIT_RECORD_PARAM") +@Table(name = "SUIT_RECORD_PARAM",indexes = { + @Index(name="suit_record_param_suit_record_id_idx",columnList = "SUIT_RECORD_ID"), +}) @Api(value = "适配记录参数", description = "适配记录参数") public class BsSuitRecordParam extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index e00832f..b699e9b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -9,10 +9,8 @@ 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 javax.persistence.*; /** * @Description : 请求适配记录 @@ -26,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_SUIT_REQUEST_RECORD") +@Table(name = "BS_SUIT_REQUEST_RECORD",indexes = { + @Index(name="bs_suit_request_record_suit_record_id_idx",columnList = "SUIT_RECORD_ID"), +}) @Api(value = "请求适配记录", description = "请求适配记录") public class BsSuitRequestRecord extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 336e497..9d502de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -29,45 +30,49 @@ import javax.persistence.*; public class WmsActionGroup extends BaseBean { private static final long serialVersionUID = -4169996695337717755L; - @Column(name = "AG_NAME_E") + @Column(name = "AG_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam("英文流程名称") private String agNameE; - @Column(name = "AG_DESC_E") + @Column(name = "AG_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam("英文流程描述") private String agDescE; - @Column(name = "AG_NAME_C") + @Column(name = "AG_NAME_C", nullable = false) @ApiParam("中文流程名称") + @AnnoOutputColumn private String agNameC; - @Column(name = "AG_DESC_C") + @Column(name = "AG_DESC_C", nullable = false) @ApiParam("中文流程描述") + @AnnoOutputColumn private String agDescC; - @Column(name = "INIT_AM_ID") + @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "初始化组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; - @Column(name = "DETAILS_AM_ID") + @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; - @Column(name = "END_AM_ID") + @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; // 1=true, 2 = false - @Column(name = "AUTO_INIT") + @Column(name = "AUTO_INIT", nullable = false) @ApiParam(value = "任务自动初始化", example = "0") + @AnnoOutputColumn private Integer autoInit; // 1=true, 2 = false - @Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false) + @Column(name = "IS_COMMIT_REF_MOVE", nullable = false) @ApiParam(value = "是否连带提交创建状态移动单", example = "2") + @AnnoOutputColumn private Integer isCommitRefMove; @Lob diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index fc0f62b..5878561 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -32,98 +33,107 @@ import javax.persistence.Transient; public class WmsActionGroupDetails extends BaseBean { private static final long serialVersionUID = 544189352378073377L; - @Column(name = "AG_ID") + @Column(name = "AG_ID", nullable = false) @ApiParam(value = "作业流程ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long agId; - @Column(name = "SEQ") + @Column(name = "SEQ", nullable = false) @ApiParam(value = "序号", example = "0") + @AnnoOutputColumn private Integer seq; - @Column(name = "OK_SEQ") + @Column(name = "OK_SEQ", nullable = false) @ApiParam(value = "成功跳转步骤", example = "0") + @AnnoOutputColumn private Integer okSeq; - @Column(name = "NG_SEQ") + @Column(name = "NG_SEQ",nullable = false) @ApiParam(value = "失败跳转步骤", example = "0") + @AnnoOutputColumn private Integer ngSeq; - @Column(name = "VALUE_TYPE") + @Column(name = "VALUE_TYPE", nullable = false) @ApiParam(value = "动作类型", example = "10") + @AnnoOutputColumn private Integer valueType; - @Column(name = "TO_UPPER") + @Column(name = "TO_UPPER", nullable = false) @ApiParam(value = "是否转为大写", example = "2") + @AnnoOutputColumn private Integer toUpper; - @Column(name = "LEN_CHECK") + @Column(name = "LEN_CHECK", columnDefinition = "int default 0") @ApiParam(value = "长度检查", example = "0") private Integer lenCheck; - @Column(name = "REGULAR_CHECK") + @Column(name = "REGULAR_CHECK", columnDefinition = "varchar(1000) default ''") @ApiParam(value = "正则校验") private String regularCheck; - @Column(name = "REGULAR_CHECK_FAIL_MSG") + @Column(name = "REGULAR_CHECK_FAIL_MSG", columnDefinition = "varchar(1000) default ''") @ApiParam(value = "正则校验失败提示") private String regularCheckFailMsg; - @Column(name = "AS_ID") - @ApiParam(value = "作业步骤", example = "0") + @Column(name = "AS_ID", nullable = false) + @ApiParam(value = "作业步骤") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long asId; - @Column(name = "AT_ID") - @ApiParam(value = "步骤类型编号", example = "0") + @Column(name = "AT_ID", nullable = false) + @ApiParam(value = "步骤类型编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long atId; - @Transient - @ApiParam(value = "作业步骤名称") - private String asName; - - @Transient - @ApiParam(value = "步骤类型名称") - private String atName; - - @Transient - @ApiParam(value = "流程名称") - private String agName; - - @Column(name = "GOTO_BTN_CODE") + @Column(name = "GOTO_BTN_CODE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "跳转按钮代码") private String goToBtnCode; - @Column(name = "GOTO_BTN_NAME") + @Column(name = "GOTO_BTN_NAME", columnDefinition = "varchar(225) default ''") @ApiParam(value = "跳转按钮名称") private String goToBtnName; - @Column(name = "PRE_SHOW") - @ApiParam(value = "是否预显示", example = "1") + @Column(name = "PRE_SHOW", columnDefinition = "int default 0") + @ApiParam(value = "是否预显示") private Integer preShow; - @Column(name = "SHOW_AM_ID") - @ApiParam(value = "回显组件方法ID", example = "1") + @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0") + @ApiParam(value = "回显组件方法ID") @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; - @Column(name = "IS_COMMIT_ABLE") - @ApiParam(value = "是否可提交", example = "2") + @Column(name = "IS_COMMIT_ABLE", nullable = false) + @ApiParam(value = "是否可提交") + @AnnoOutputColumn private Integer isCommitAble; - @Column(name = "IS_AUTO_OPEN_WINDOW") - @ApiParam(value = "是否自动开窗", example = "2") + @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false) + @ApiParam(value = "是否自动开窗") private Integer isAutoOpenWindow; - @Column(name = "SEARCH_KEY") + @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''") @ApiParam(value = "搜索KEY") private String searchKey; - @Column(name = "GROUP_KEY") + @Column(name = "GROUP_KEY", columnDefinition = "varchar(225) default ''") @ApiParam(value = "分组KEY") private String groupKey; + @Transient + @ApiParam(value = "作业步骤名称") + private String asName; + + @Transient + @ApiParam(value = "步骤类型名称") + private String atName; + + @Transient + @ApiParam(value = "流程名称") + private String agName; + public int getSeqVal() { return this.seq == null ? 0 : this.seq; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index a41ef59..d43b2d8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -29,31 +30,36 @@ import javax.persistence.Table; public class WmsActionModule extends BaseBean { private static final long serialVersionUID = 9117362998863937579L; - @Column(name = "AM_NAME") + @Column(name = "AM_NAME",nullable = false) @ApiParam("组件名称") + @AnnoOutputColumn public String amName; - @Column(name = "AM_DESC") + @Column(name = "AM_DESC", nullable = false) @ApiParam("组件描述") + @AnnoOutputColumn public String amDesc; - @Column(name = "CALL_CLASS") + @Column(name = "CALL_CLASS",nullable = false) @ApiParam("实现类") + @AnnoOutputColumn public String callClass; - @Column(name = "AM_TYPE") - @ApiParam(value = "组件类型", example = "0") + @Column(name = "AM_TYPE", nullable = false) + @ApiParam(value = "组件类型") + @AnnoOutputColumn public Integer amType; - @Column(name = "OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "作业类型") public String opTypeCode; - @Column(name = "IS_SHOW_INFO") - @ApiParam(value = "是否实现回显", example = "0") + @Column(name = "IS_SHOW_INFO", nullable = false) + @ApiParam(value = "是否实现回显") + @AnnoOutputColumn public Integer isShowInfo; - @ApiParam(value = "作业类型名称", example = "0") + @ApiParam(value = "作业类型名称") public String opTypeName; public WmsActionModule() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index a87c559..1923bb0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -31,29 +32,34 @@ import javax.persistence.Table; public class WmsActionModuleParam extends BaseBean { private static final long serialVersionUID = 8099621042858629818L; - @Column(name = "AM_ID") - @ApiParam(value = "组件ID", example = "0") + @Column(name = "AM_ID", nullable = false) + @ApiParam(value = "组件ID") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long amId; - @Column(name = "METHOD_NAME") + @Column(name = "METHOD_NAME", columnDefinition = "varchar(255) default ''") @ApiParam("组件执行方法名称") + @AnnoOutputColumn public String methodName; - @Column(name = "PARAM_CODE") + @Column(name = "PARAM_CODE", nullable = false) @ApiParam("参数编码") + @AnnoOutputColumn public String paramCode; - @Column(name = "PARAM_NAME") + @Column(name = "PARAM_NAME", nullable = false) @ApiParam("参数名称") + @AnnoOutputColumn public String paramName; - @Column(name = "PARAM_VALUE_LIST") + @Column(name = "PARAM_VALUE_LIST", columnDefinition = "varchar(225) default ''") @ApiParam("参数可选值列表") public String paramValueList; - @Column(name = "PARAM_TYPE") + @Column(name = "PARAM_TYPE",nullable = false) @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0") + @AnnoOutputColumn public Integer paramType; public int getParamTypeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 265272b..8144c65 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -31,29 +32,33 @@ import javax.persistence.Table; public class WmsActionStep extends BaseBean { private static final long serialVersionUID = 6460096995982059959L; - @Column(name = "AS_NAME_E") + @Column(name = "AS_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型名称") private String asNameE; - @Column(name = "AS_DESC_E") + @Column(name = "AS_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型描述") private String asDescE; - @Column(name = "AS_NAME_C") + @Column(name = "AS_NAME_C", nullable = false) @ApiParam(value = "中文类型名称") + @AnnoOutputColumn private String asNameC; - @Column(name = "AS_DESC_C") + @Column(name = "AS_DESC_C", nullable = false) @ApiParam(value = "中文类型描述") + @AnnoOutputColumn private String asDescC; - @Column(name = "AT_NAME_C_RDD") + @Column(name = "AT_NAME_C_RDD", nullable = false) @ApiParam(value = "步骤类型名称") + @AnnoOutputColumn private String atNameCRdd; - @Column(name = "AT_ID") + @Column(name = "AT_ID", nullable = false) @ApiParam(value = "步骤类型编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long atId; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 4b8388f..c354a66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -33,18 +34,21 @@ import javax.persistence.*; public class WmsActionStepCall extends BaseBean { private static final long serialVersionUID = -6013283534745803464L; - @Column(name = "AS_ID") + @Column(name = "AS_ID",nullable = false) @ApiParam(value = "作业步骤ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long asId; - @Column(name = "SEQ") + @Column(name = "SEQ",nullable = false) @ApiParam(value = "序号", example = "0") + @AnnoOutputColumn public Integer seq; - @Column(name = "AM_ID") + @Column(name = "AM_ID", nullable = false) @ApiParam(value = "处理组件ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long amId; @Transient @@ -55,12 +59,14 @@ public class WmsActionStepCall extends BaseBean { @ApiParam(value = "组件描述") public String amDesc; - @Column(name = "AM_TYPE") - @ApiParam(value = "组件类型", example = "0") + @Column(name = "AM_TYPE",nullable = false) + @ApiParam(value = "组件类型") + @AnnoOutputColumn public Integer amType; - @Column(name = "OK_VALUE") - @ApiParam(value = "成功标志", example = "10") + @Column(name = "OK_VALUE", nullable = false) + @ApiParam(value = "成功标志") + @AnnoOutputColumn public Integer okValue; public int getAmTypeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index ee0b539..41ceb88 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -32,25 +33,29 @@ import javax.persistence.Transient; public class WmsActionStepCallParam extends BaseBean { private static final long serialVersionUID = -2813779192436803301L; - @Column(name = "AGD_ID") + @Column(name = "AGD_ID", nullable = false) @ApiParam(value = "流程明细编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long agdId; - @Column(name = "SEQ") + @Column(name = "SEQ",nullable = false) @ApiParam(value = "序号") + @AnnoOutputColumn private Integer seq; - @Column(name = "AM_ID") + @Column(name = "AM_ID", nullable = false) @ApiParam(value = "处理组件编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long amId; - @Column(name = "PARAM_CODE") + @Column(name = "PARAM_CODE",nullable = false) @ApiParam(value = "参数编码") + @AnnoOutputColumn private String paramCode; - @Column(name = "PARAM_VALUE") + @Column(name = "PARAM_VALUE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "参数值") private String paramValue; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java index 926e108..4f8536b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -21,31 +22,34 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_ACTION_TYPE") +@Table(name = "WMS_ACTION_TYPE") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="作业步骤类型信息",description = "作业步骤类型信息") +@Api(value = "作业步骤类型信息", description = "作业步骤类型信息") public class WmsActionStepType extends BaseBean { private static final long serialVersionUID = -8019644718382990603L; - @Column(name = "AT_NAME_E") + @Column(name = "AT_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型名称") private String atNameE; - @Column(name = "AT_DESC_E") + @Column(name = "AT_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型描述") private String atDescE; - @Column(name = "AT_NAME_C") + @Column(name = "AT_NAME_C", nullable = false) @ApiParam(value = "中文类型名称") + @AnnoOutputColumn private String atNameC; - @Column(name = "AT_DESC_C") + @Column(name = "AT_DESC_C", nullable = false) @ApiParam(value = "中文类型描述") + @AnnoOutputColumn private String atDescC; - @Column(name = "FUN_CALL_NAME") + @Column(name = "FUN_CALL_NAME", nullable = false) @ApiParam(value = "方法调用名称") + @AnnoOutputColumn private String funCallName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index fc098a8..83788f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -179,6 +179,10 @@ public class WmsDocMovementMaster extends BaseBean { @Transient public String title; + @Column(name = "TAG") + @ApiParam(value = "标签") + private String tag; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index a7f54ae..590f11c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -114,8 +114,21 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "加密编码") private String encryptionNo; + @Column(name = "LAST_CS_TIME") + @ApiParam(value = "末次盘点时间") + private String lastCsTime; + + @Transient + @ApiParam(value = "末次盘点开始时间") + private String lastCsTimeStart ; + + @Transient + @ApiParam(value = "末次盘点结束时间") + private String lastCsTimeEnd; + public WmsLocate() { } + public WmsLocate(String locateNo,Integer destBoxQty) { this.locateNo = locateNo; this.destBoxQty = destBoxQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java new file mode 100644 index 0000000..09f05c2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -0,0 +1,157 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : WMS_拉动计划任务明细表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-10 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PULL_TASK_DETAILS") +@Api("WMS_拉动计划任务明细表") +public class WmsPullTaskDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592736L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="ITEM") + @ApiParam(value = "行号", example = "0") + private Integer item = 0; + + @Column(name="TERMINAL_NO") + @ApiParam("工位代码") + private String terminalNo; + + @Column(name="LOCATE_NO") + @ApiParam("库位代码") + private String locateNo; + + @Column(name="LOCATE_CAPACITY") + @ApiParam("库位容量") + private String locateCapacity; + + @Column(name="PART_NO") + @ApiParam("零件编号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("零件名称") + private String partNameRdd; + + @Column(name="PLAN_PACK_COUNT") + @ApiParam(value = "计划容器数", example = "0") + private Integer planPackCount = 0; + + @Column(name="FIRST_BATCH_QTY") + @ApiParam(value = "首批批量", example = "0") + private Integer firstBatchQty = 0; + + @Column(name="FIRST_PACK_COUNT") + @ApiParam(value = "首批容器数", example = "0") + private Integer firstPackCount = 0; + + @Column(name="REQUEST_QTY") + @ApiParam(value = "补货批量", example = "0") + private Integer requestQty = 0; + + @Column(name="REQUEST_PACK_COUNT") + @ApiParam(value = "补货容器数", example = "0") + private Integer requestPackCount = 0; + + @Column(name="REQUEST_LOT_NO") + @ApiParam(value = "补货批次", example = "0") + private Integer requestLotNo = 0; + + @Column(name="REQUEST_TOTAL_COUNT") + @ApiParam(value = "补货累加次数", example = "0") + private Integer requestTotalCount = 0; + + @Column(name="LAST_REQUEST_TIME") + @ApiParam("上一次补货时间") + private String lastRequestTtime; + + @Column(name="BOOT_QTY") + @ApiParam(value = "尾箱批量", example = "0") + private Integer bootQty = 0; + + @Column(name="BOOT_PACK_COUNT") + @ApiParam(value = "尾箱容器数", example = "0") + private Integer bootPackCount = 0; + + @Column(name="BOOT_LOT_NO") + @ApiParam(value = "尾箱批次", example = "0") + private Integer bootLotNo = 0; + + @Column(name="ORDER_STATUS") + @ApiParam(value = "单据状态", example = "0") + private Integer orderStatus = 0; + + public Integer getOrderStatus() { + return orderStatus == null ? 0 : this.orderStatus.intValue(); + } + + public Integer getBootLotNo() { + return bootLotNo == null ? 0 : this.bootLotNo.intValue(); + } + + public Integer getBootPackCount() { + return bootPackCount == null ? 0 : this.bootPackCount.intValue(); + } + + public Integer getBootQty() { + return bootQty == null ? 0 : this.bootQty.intValue(); + } + + public Integer getRequestTotalCount() { + return requestTotalCount == null ? 0 : this.requestTotalCount.intValue(); + } + + public Integer getRequestLotNo() { + return requestLotNo == null ? 0 : this.requestLotNo.intValue(); + } + + public Integer getRequestPackCount() { + return requestPackCount == null ? 0 : this.requestPackCount.intValue(); + } + + public Integer getRequestQty() { + return requestQty == null ? 0 : this.requestQty.intValue(); + } + + public Integer getFirstPackCount() { + return firstPackCount == null ? 0 : this.firstPackCount.intValue(); + } + + public Integer getFirstBatchQty() { + return firstBatchQty == null ? 0 : this.firstBatchQty.intValue(); + } + + public Integer getPlanPackCount() { + return planPackCount == null ? 0 : this.planPackCount.intValue(); + } + + public Integer getItem() { + return item == null ? 0 : this.item.intValue(); + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java new file mode 100644 index 0000000..03a57f9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : WMS_拉动计划任务主表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-09 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PULL_TASK_MASTER") +@Api("WMS_拉动计划任务主表") +public class WmsPullTaskMaster extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592736L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="PDLINE_NO") + @ApiParam("产线代码") + private String pdlineNo; + + @Column(name="PLAN_PRODUCT_TIME") + @ApiParam("生产日期") + private String planProductTime; + + @Column(name="SHIFT_NO") + @ApiParam("班次代码") + private String shitNo; + + @Column(name="START_PRODUCT_TIME") + @ApiParam("开始生产时间") + private String startProductTime; + + @Column(name="END_PRODUCT_TIME") + @ApiParam("结束生产时间") + private String endProductTime; + + @Column(name="ORDER_STATUS") + @ApiParam(value = "单据状态", example = "0") + private Integer orderStatus = 0; + + public Integer getOrderStatus() { + return orderStatus == null ? 0 : this.orderStatus.intValue(); + } + + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index 9a65b4c..1d69271 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.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; /** * @Description : 车辆信息 @@ -71,7 +72,7 @@ public class WmsTmsShippingExt extends BaseBean { @Column(name="ORDER_STATUS") @ApiParam(value ="单据状态") - private String orderStatus; + private Integer orderStatus; @Column(name="CUST_NAME") @ApiParam(value ="客户名称RDD") @@ -97,4 +98,9 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam(value =" 申请部门") private String depart; + + @Transient + @ApiParam("物料编码") + private String partNo; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java new file mode 100644 index 0000000..9bb9b62 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :公共父类入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ +@Data +public class BaseDto { + + +} + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java index 530bdee..49d975d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java @@ -8,44 +8,29 @@ import javax.persistence.Transient; import java.io.Serializable; @Data -public class WmsCarDto implements Serializable { +public class WmsCarDto extends BaseDto implements Serializable { @Column(name="CAR_NO") @ApiParam(value ="车牌号") private String carNo; - @Column(name="CAR_DESC") - @ApiParam(value ="车辆描述") - private String carDesc; - - @Column(name="MAX_CAPACITY") - @ApiParam(value ="载重量(KG)") - private String maxCapacity; @Column(name="DRIVER_NO") @ApiParam(value ="默认驾驶员") private String driverNo; - @Column(name="PHONE") - @ApiParam(value ="车主电话") - private String phone; @Column(name="VENDOR_NO") @ApiParam(value ="所属供应商") private String vendorNo; + @ApiParam("是否删除，默认否") - @Transient - @ApiParam("司机名称") - private String driverNameRdd; + protected Integer isDeleted = 2; - @Transient - @ApiParam(value = "供应商名称") - private String vendorNameRdd; + @ApiParam("是否有效，默认是") + protected Integer isValid = 1; - @ApiParam(value = "是否删除，默认否") - private Integer isDeleted = 2; + protected String organizeCode; - @ApiParam("是否有效，默认是") - private Integer isValid = 1; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java index b4bbd06..ad84be5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java @@ -6,8 +6,15 @@ import lombok.Data; import javax.persistence.Column; import java.io.Serializable; +/** + * @Description :驾驶员入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ @Data -public class WmsTmsDriverDto implements Serializable { +public class WmsTmsDriverDto extends BaseDto implements Serializable { @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") @@ -17,33 +24,15 @@ public class WmsTmsDriverDto implements Serializable { @ApiParam(value ="驾驶员姓名") private String driverName; - @Column(name="SEX") - @ApiParam(value ="驾驶员性别") - private Integer sex; - - @Column(name="AGE") - @ApiParam(value ="驾驶员年龄") - private String age; - - @Column(name="ID_NO") - @ApiParam(value ="驾驶员身份证号") - private String idNo; - - @Column(name="ADRESS") - @ApiParam(value ="驾驶员籍贯") - private String adress; - - @Column(name="PHONE") - @ApiParam(value ="车牌号") - private String phone; - @Column(name="LOGIN_NO") @ApiParam(value =" 登录账号") private String loginNo; @ApiParam("是否删除，默认否") - private Integer isDeleted = 2; + protected Integer isDeleted = 2; @ApiParam("是否有效，默认是") - private Integer isValid = 1; + protected Integer isValid = 1; + + protected String organizeCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java new file mode 100644 index 0000000..add6b54 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description :装车单入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ +@Api("装车单入参") +@Data +public class WmsTmsShipDto extends BaseDto implements Serializable { + + @ApiParam("物料号") + private String partNo; + @ApiParam("运输状态") + private String carriageStatus; + @ApiParam("单据号") + private String orderNo; + + @ApiParam("是否删除，默认否") + protected Integer isDeleted = 2; + + @ApiParam("是否有效，默认是") + protected Integer isValid = 1; + + @ApiParam("工厂代码") + protected String organizeCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java new file mode 100644 index 0000000..9983761 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description :wms拉动计划明细表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-12-11 14:49 + * @Modify: + **/ +@Repository +public interface WmsPullTaskDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java new file mode 100644 index 0000000..563dbb0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullTaskMasterRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description :wms拉动计划主表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-12-11 14:49 + * @Modify: + **/ +@Repository +public interface WmsPullTaskMasterRepository extends BaseRepository { +}