From 6ffad99c5852ede230e329a2067f804bade11f8d Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 10 Sep 2021 15:57:14 +0800 Subject: [PATCH 01/11] =?UTF-8?q?bsp=20=E6=97=A5=E5=BF=97=E5=9B=9E?= =?UTF-8?q?=E8=B0=83pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsp/server/bean/model/HandleCallBackParam.java | 28 ++++++++++++ .../pojo/bsp/server/bean/model/RequestModel.java | 2 + .../i3plus/pojo/bsp/server/bean/po/MethodLog.java | 50 ++++++++++++++++++++++ .../bsp/server/bean/vo/DashboardSummaryVo.java | 39 +++++++++++++++++ .../bsp/server/repository/MethodLogRepository.java | 16 +++++++ 5 files changed, 135 insertions(+) create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/HandleCallBackParam.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSummaryVo.java create mode 100644 modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLogRepository.java diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/HandleCallBackParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/HandleCallBackParam.java new file mode 100644 index 0000000..d93afba --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/HandleCallBackParam.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/8 17:41 + * @Modify: + **/ +@Data +@ApiModel("方法回到") +public class HandleCallBackParam implements Serializable { + + private static final long serialVersionUID = 42L; + @ApiModelProperty(name = "日志ID") + private long logId; + @ApiModelProperty(name = "成功失败标志1成功，2失败") + private int handleCode; + @ApiModelProperty(name = "方法执行日志") + private String handleMsg; + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java index 1d3d656..6366ff6 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java @@ -25,4 +25,6 @@ public class RequestModel { private String methodHandlerKey; @ApiModelProperty("方法的入参") private Map jsonParamMap; + @ApiModelProperty("日志id") + private Long logId; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java new file mode 100644 index 0000000..a5f3102 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLog.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.po; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.thoughtworks.xstream.converters.extended.NamedMapConverter; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/8 17:01 + * @Modify: + **/ +@Table(name = "METHOD_LOG") +@Entity +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("方法调用日志") +public class MethodLog extends BaseBean implements Serializable { + + @ApiModelProperty("调用方法名冗余字段") + @Column(name = "METHOD_NAME_RDD") + private String methodNameRdd; + + @ApiModelProperty("方法id") + @Column(name = "METHOD_ID") + private Long methodId; + + @ApiModelProperty("方法参数") + @Column(name = "METHOD_PARAMS") + private String methodParam; + + @ApiModelProperty("方法调用日志信息") + @Column(name = "MESSAGE",columnDefinition = " text ") + private String message; + + @ApiModelProperty("方法是否执行成功") + @Column(name = "SUCCESS") + private Integer success; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSummaryVo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSummaryVo.java new file mode 100644 index 0000000..3758f60 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/DashboardSummaryVo.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description :Dashboard 总方法数、总应用数、总实例数（总数，启用数，禁用数） + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/8 14:44 + * @Modify: + **/ +@ApiModel("Dashboard数据") +@Data +public class DashboardSummaryVo { + + @ApiModelProperty("总方法数") + private Integer totalMethodNum; + @ApiModelProperty("启用方法数") + private Integer enableMethodNum; + @ApiModelProperty("禁用方法数") + private Integer disableMethodNum; + + @ApiModelProperty("总应用数") + private Integer totalAppNum; + @ApiModelProperty("启用应用数") + private Integer enableAppNum; + @ApiModelProperty("禁用方法数") + private Integer disableAppNum; + + @ApiModelProperty("总实例数") + private Integer totalInstanceNum; + @ApiModelProperty("启动实例数") + private Integer enableInstanceNum; + @ApiModelProperty("禁用实例数") + private Integer disableInstanceNum; + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLogRepository.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLogRepository.java new file mode 100644 index 0000000..49f9732 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.MethodLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/8 17:13 + * @Modify: + **/ +@Repository +public interface MethodLogRepository extends BaseRepository { +} From f3190e6bbea29fb8fa4af1c230142d243c8a100c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 24 Sep 2021 18:37:11 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=86=B7=E7=83=AD?= =?UTF-8?q?=E5=88=86=E7=A6=BBpojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/bean/DataSeparatorMessage.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java new file mode 100644 index 0000000..fa93b3b --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description :冷热数据分离消息队列消息 + * @Reference : + * @Author : Castle + * @CreateDate : 2021/9/23 13:59 + * @Modify: + **/ +@Data +@Api(value = "冷热分离消息") +public class DataSeparatorMessage implements Serializable { + + private static final long serialVersionUID = -1; + + private Long id; + + private String refClass; + + +} From a6ed27b90153533159861d7e9511d62756d17d53 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 12 Oct 2021 13:16:05 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java | 13 +++++++------ .../java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 6 +++++- .../cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 13 ++++++------- .../cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java | 4 +++- .../i3plus/pojo/mes/bean/MesLabelTemplateParam.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java | 12 ++++++------ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 13 ++++++------- .../estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java | 15 +++++++++------ .../estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java | 13 +++++++------ .../estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java | 16 +++++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 13 +++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java | 14 +++++++------- .../i3plus/pojo/mes/bean/MesStateMachineStatus.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java | 14 ++++++++------ .../java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java | 14 +++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 14 +++++++------- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 14 +++++++------- 34 files changed, 197 insertions(+), 179 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java index 465d4ee..1ec7de5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -7,16 +7,13 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -33,7 +30,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_AREA") +@Table(name = "MES_AREA", indexes = { + @Index(columnList = "AREA_CODE") +}) @Api("生产区域") public class MesArea extends BaseBean implements Serializable { private static final long serialVersionUID = 4320604250440221043L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java index edad745..dde5707 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -29,7 +27,10 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_CONFIG") +@Table(name = "MES_CONFIG", indexes = { + @Index(columnList = "CFG_CODE"), + @Index(columnList = "CFG_CODE, CFG_KEY") +}) @Api("mes配置表") public class MesConfig extends BaseBean implements Serializable { private static final long serialVersionUID = 2462824203686013806L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java index 58af48c..e5a411d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -23,7 +23,9 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_CONTAINER") +@Table(name = "MES_CONTAINER", indexes = { + @Index(columnList = "CT_NO") +}) @Api("MES_容器类型") public class MesContainer extends BaseBean { private static final long serialVersionUID = -3843389042411645111L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index 9ff2531..4759e03 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -29,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_CUSTOMER") +@Table(name = "MES_CUSTOMER", indexes = { + @Index(columnList = "CUSTOMER_CODE") +}) @Api("客户信息") public class MesCustomer extends BaseBean implements Serializable { private static final long serialVersionUID = 6049359006918853570L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 39b12bc..9a80643 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -26,7 +26,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_CUSTOMER_PART") +@Table(name = "MES_CUSTOMER_PART", indexes = { + @Index(columnList = "CUSTOMER_CODE"), + @Index(columnList = "PART_NO"), + @Index(columnList = "CUSTOMER_PART_NO") +}) @Api("客户零件关系") public class MesCustomerPart extends BaseBean implements Serializable { private static final long serialVersionUID = 2600442373171403668L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index 5f382f0..82e9cf4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -5,16 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -28,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_DATA_OBJECT") +@Table(name = "MES_DATA_OBJECT", indexes = { + @Index(columnList = "OBJECT_CODE") +}) @Api("数据对象") public class MesDataObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index c724e84..dadbc6a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -30,7 +27,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_DEFECT") +@Table(name = "MES_DEFECT", indexes = { + @Index(columnList = "DEFECT_CODE") +}) @Api("缺陷表") public class MesDefect extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java index 4236f7c..53b13c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,7 +26,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_KPSN_RULE") +@Table(name = "MES_KPSN_RULE", indexes = { + @Index(columnList = "PART_NO") +}) @Api("关键件条码校验规则") public class MesKpsnRule extends BaseBean implements Serializable { private static final long serialVersionUID = 2592621267902381297L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index bc9f9f9..4847b67 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -27,7 +27,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_LABEL_TEMPLATE") +@Table(name = "MES_LABEL_TEMPLATE", indexes = { + @Index(columnList = "TEMPLATE_CODE") +}) @Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java index 94828e2..9587392 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -28,7 +28,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_LABEL_TEMPLATE_PARAM") +@Table(name = "MES_LABEL_TEMPLATE_PARAM", indexes = { + @Index(columnList = "TEMPLATE_CODE") +}) @Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index f931891..6ca3271 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -29,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_METHOD") +@Table(name = "MES_METHOD", indexes = { + @Index(columnList = "METHOD_CODE") +}) @Api("系统业务方法") public class MesMethod extends BaseBean implements Serializable { private static final long serialVersionUID = -3254086662292709833L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index 95710bd..06092ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -27,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_NUMBER_RULE") +@Table(name = "MES_NUMBER_RULE", indexes = { + @Index(columnList = "RULE_CODE") +}) @Api("条码生成规则") public class MesNumberRule extends BaseBean implements Serializable { private static final long serialVersionUID = -7547623897602721464L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java index c40c38a..2731ed7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java @@ -5,16 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + 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.Version; import java.io.Serializable; /** @@ -28,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_NUMBER_SERIALNO") +@Table(name = "MES_NUMBER_SERIALNO", indexes = { + @Index(columnList = "CURRENT_NUMBER_PREFIX") +}) @Api("编码序号") public class MesNumberSerialno extends BaseBean implements Serializable { private static final long serialVersionUID = -6004402998083665263L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index 3581c46..2c3bd0a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -5,16 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -28,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_OBJECT_CFG") +@Table(name = "MES_OBJECT_CFG", indexes = { + @Index(columnList = "OBJECT_CODE") +}) @Api("对象结构") public class MesObjectCfg extends BaseBean implements Serializable { private static final long serialVersionUID = 55753384888695913L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java index dbdd627..dcfd1cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -29,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_OBJECT_DAO") +@Table(name = "MES_OBJECT_DAO", indexes = { + @Index(columnList = "OBJECT_CODE") +}) @Api("MES_对象与dao对应关系") public class MesObjectDao extends BaseBean implements Serializable { private static final long serialVersionUID = 2286752362359060L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index cd4b446..c17d955 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -28,7 +26,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PCN") +@Table(name = "MES_PCN", indexes = { + @Index(columnList = "PCN_CODE") +}) @Api("PCN节点") public class MesPcn extends BaseBean implements Serializable { private static final long serialVersionUID = -9150091413555406397L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index f9b7fa0..9c156da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -5,16 +5,13 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -30,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PCN_SYNC_CFG") +@Table(name = "MES_PCN_SYNC_CFG", indexes = { + @Index(columnList = "PCN_CODE, SYNC_TYPE") +}) @Api("MES_PCN_同步配置") public class MesPcnSyncCfg extends BaseBean implements Serializable { private static final long serialVersionUID = 7270930330576127126L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java index b72573b..f07115e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java @@ -6,16 +6,13 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; import java.io.Serializable; /** @@ -31,7 +28,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PCN_SYS_USER_OFFLINE") +@Table(name = "MES_PCN_SYS_USER_OFFLINE", indexes = { + @Index(columnList = "LOGIN_NAME") +}) @Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class MesPcnSysUserOffline extends BaseBean implements Serializable { private static final long serialVersionUID = -7483799830588482021L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java index fcee248..1c1daf6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,7 +26,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PROCESS") +@Table(name = "MES_PROCESS", indexes = { + @Index(columnList = "PROCESS_CODE") +}) @Api("工序") public class MesProcess extends BaseBean implements Serializable { private static final long serialVersionUID = -615476712907856558L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index 89bd66a..7c3dd40 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -27,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PROD_PACK") +@Table(name = "MES_PROD_PACK", indexes = { + @Index(columnList = "PART_NO") +}) @Api("产品包装关系") public class MesProdPack extends BaseBean implements Serializable { private static final long serialVersionUID = -5748484568201154400L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index 9aef4c6..fd8919f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -28,7 +26,12 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PROD_ROUTE_CFG") +@Table(name = "MES_PROD_ROUTE_CFG", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "ROUTE_CODE, WORK_CENTER_CODE"), + @Index(columnList = "WORK_CENTER_CODE, ROUTE_TYPE") +}) @Api("产品类流程配置表") public class MesProdRouteCfg extends BaseBean implements Serializable { private static final long serialVersionUID = -3903152693262813917L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 1e38879..aef69cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -29,7 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PROD_ROUTE_OPT_PARAM", indexes = { @Index(columnList = "ROUTE_CODE"), @Index(columnList = "PROCESS_CODE"), - @Index(columnList = "STEP_CODE") + @Index(columnList = "STEP_CODE"), + @Index(columnList = "PROD_ROUTE_CFG_ID") }) @Api("产品流程配置操作参数表") public class MesProdRouteOptParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index 116e8ba..2023b35 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -26,7 +26,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_ROUTE") +@Table(name = "MES_ROUTE", indexes = { + @Index(columnList = "ROUTE_CODE") +}) @Api("流程表") public class MesRoute extends BaseBean implements Serializable { private static final long serialVersionUID = -3616935751787295145L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index 201b6d7..50aa1d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -28,7 +26,10 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_ROUTE_PROCESS") +@Table(name = "MES_ROUTE_PROCESS", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_CODE, PROCESS_CODE") +}) @Api("流程工序关系") public class MesRouteProcess extends BaseBean implements Serializable { private static final long serialVersionUID = -1248219638779313299L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index 809725a..66b9aed 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,7 +26,12 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_ROUTE_PROCESS_CELL") +@Table(name = "MES_ROUTE_PROCESS_CELL", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_CODE, WORK_CELL_CODE"), + @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE"), + @Index(columnList = "ROUTE_CODE, WORK_CENTER_CODE, WORK_CELL_CODE") +}) @Api("工序工作单元对照") public class MesRouteProcessCell extends BaseBean implements Serializable { private static final long serialVersionUID = 4823057491756814599L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index b83f6cd..2195459 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -5,17 +5,15 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.annotation.Transient; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -31,7 +29,10 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_SHIFT") +@Table(name = "MES_SHIFT", indexes = { + @Index(columnList = "SHIFT_CODE"), + @Index(columnList = "AREA_CODE, WORK_CENTER_CODE, SHIFT_CODE") +}) @Api("班次信息") public class MesShift extends BaseBean implements Serializable { private static final long serialVersionUID = 4001070186534674096L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java index 6362acd..07c61be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; import java.io.Serializable; /** @@ -27,7 +24,10 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STATE_MACHINE") +@Table(name = "MES_STATE_MACHINE", indexes = { + @Index(columnList = "SM_CODE"), + @Index(columnList = "SM_TYPE") +}) @Api("MES状态机") public class MesStateMachine extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index b3600b0..5c49a5b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -22,7 +22,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STATE_MACHINE_STATUS") +@Table(name = "MES_STATE_MACHINE_STATUS", indexes = { + @Index(columnList = "SM_CODE") +}) @Api("MES状态机步骤") public class MesStateMachineStatus extends BaseBean implements Serializable { private static final long serialVersionUID = 6093522587973076640L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java index 613a5bd..7437b6a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.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.io.Serializable; @@ -25,7 +26,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STATE_MACHINE_STEP") +@Table(name = "MES_STATE_MACHINE_STEP", indexes = { + @Index(columnList = "SM_CODE") +}) @Api("状态机工步参数配置表") public class MesStateMachineStep extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index 87ca767..ba596b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,7 +26,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STEP") +@Table(name = "MES_STEP", indexes = { + @Index(columnList = "STEP_CODE") +}) @Api("工步") public class MesStep extends BaseBean implements Serializable { private static final long serialVersionUID = -1106608189453496947L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java index cf5da7a..0e1221f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -26,7 +24,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STEP_GROUP") +@Table(name = "MES_STEP_GROUP", indexes = { + @Index(columnList = "STEP_CODE"), + @Index(columnList = "AMG_ID"), + @Index(columnList = "STEP_CODE, AMG_ID") +}) @Api("工步集") public class MesStepGroup extends BaseBean implements Serializable { private static final long serialVersionUID = 1876053661752102998L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index c9409c9..d98c06e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -31,7 +28,10 @@ import java.util.Map; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STEP_PARAM") +@Table(name = "MES_STEP_PARAM", indexes = { + @Index(columnList = "STEP_CODE"), + @Index(columnList = "STEP_CODE, PARAM_CODE") +}) @Api("工步参数") public class MesStepParam extends BaseBean implements Serializable { private static final long serialVersionUID = 6709455994477993263L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index d257687..d3df26c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -6,17 +6,14 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; 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 java.io.Serializable; import java.util.List; @@ -33,7 +30,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_WORK_CELL") +@Table(name = "MES_WORK_CELL", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE") +}) @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { private static final long serialVersionUID = 8552890090536989486L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 91703ac..7dec04e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -6,16 +6,13 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -32,7 +29,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_WORK_CENTER") +@Table(name = "MES_WORK_CENTER", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "AREA_CODE") +}) @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { private static final long serialVersionUID = 5583253625290231595L; From 49442ab5aa0a29bcce224ea40640f5b8923451aa Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Tue, 12 Oct 2021 13:27:27 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=88=90=E9=83=BD=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=EF=BC=8CwmsCqMaster=E6=96=B0=E5=A2=9E=E6=9E=84?= =?UTF-8?q?=E9=80=A0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 9003e5f..a2a82f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -180,4 +180,18 @@ public class WmsQCMaster extends BaseBean { this.partNameRdd = partNameRdd; this.createDatetime = createDatetime; } + + public WmsQCMaster(String orderNo,String refSrc,String remark,String vendorNo,String vendorDesc,String partNo,String partNameRdd,Double qty,Integer orderStatus,Integer qcStatus,String createDatetime) { + this.orderNo = orderNo; + this.refSrc = refSrc; + this.remark = remark; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + this.partNo = partNo; + this.qty = qty; + this.orderStatus = orderStatus; + this.partNameRdd = partNameRdd; + this.qcStatus = qcStatus; + this.createDatetime = createDatetime; + } } From cedc61b6a898bdf8d9f4fd4cdf7050af5d11c6c2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 13 Oct 2021 11:41:41 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index 2023b35..f9eb211 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ROUTE", indexes = { - @Index(columnList = "ROUTE_CODE") + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_TYPE") }) @Api("流程表") public class MesRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java index 07c61be..f2ca1c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java @@ -25,8 +25,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STATE_MACHINE", indexes = { - @Index(columnList = "SM_CODE"), - @Index(columnList = "SM_TYPE") + @Index(columnList = "SM_CODE") }) @Api("MES状态机") public class MesStateMachine extends BaseBean implements Serializable { From 968708d1b890db024e86bb2c064b5c02afe76553 Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 15 Oct 2021 14:46:07 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84taskNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 4 ++-- .../java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index a1b3a6c..07a496b 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 @@ -102,4 +102,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index d3349da..8801a7a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -131,8 +131,6 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "是否重置") private Integer isReset; - @ApiParam(value = "任务编号") - private String taskNo; public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; From 5acd3270f9e19d23094282eeeb4eb58a9208ba6d Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 15 Oct 2021 14:48:35 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E4=B8=AD=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=BA1.0.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 07a496b..b817206 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 From e390e7fc334f8896d4545befea0fae9d8fb76181 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Sun, 17 Oct 2021 14:31:24 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=88=90=E9=83=BD=EF=BC=9APULL=5FWAY=5FS?= =?UTF-8?q?TATUS=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E=20OVER=5FPULL(80,=20"?= =?UTF-8?q?=E8=BF=87=E7=82=B9=E6=8B=89=E5=8A=A8")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3e95368..2fa95d8 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 @@ -4958,7 +4958,8 @@ public class WmsEnumUtil { PLANNED_PULL(40, "计划拉动"), ANDON_PULL(50, "安灯拉动"), EXTERNAL_PULL(60, "手工拉动"), - WORKORDER_PULL(70, "工单拉动"); + WORKORDER_PULL(70, "工单拉动"), + OVER_PULL(80, "过点拉动"); private int value; private String description; From 93f50a56be2f0eb6918587e5f0b9d02d0e2558c5 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Sun, 17 Oct 2021 14:58:17 +0800 Subject: [PATCH 09/11] =?UTF-8?q?WMS=5F=E4=BA=A7=E5=93=81=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=98=8E=E7=BB=86=E4=BF=A1=E6=81=AF=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E@ApiParam("=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=A2=86=E6=96=99=E5=8D=95")=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 7095697..fc9ff48 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -216,6 +216,9 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "产品条码") private String serialNumber; + @Column(name = "IS_GENERATE_PICKING", columnDefinition = "int default 2") + @ApiParam("是否已经生成领料单") + public Integer isGeneratePicking; From 211d20e8408de1b84c4a850d3c90e5dafa06bdbb Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 21 Oct 2021 09:29:31 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=A4=8D=E6=9D=82=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index b5b3a86..c507260 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -986,7 +986,9 @@ public class CoreHqlPack { // hql拼接 DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); +// DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); + //2021-10-19 修改成模糊查询 + DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateGroupId(), "templateGroupId", ddlPackBean); DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateSoftType(), "templateSoftType", ddlPackBean); @@ -1340,4 +1342,4 @@ public class CoreHqlPack { return ddlPackBean; } -} \ No newline at end of file +} From 77795be8df101f1deb9b3b29fced8bffb175c3df Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 23 Oct 2021 17:52:13 +0800 Subject: [PATCH 11/11] =?UTF-8?q?StationRequestBean=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90class?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 62bf9dd..d8a8973 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -214,6 +214,9 @@ public class StationRequestBean implements Serializable { @ApiParam("密码") private String password; + @ApiParam("缓存来源文件") + private String cacheSourceClass; + public StationRequestBean() { } @@ -252,6 +255,7 @@ public class StationRequestBean implements Serializable { ", finishCount=" + finishCount + ", packageNo=" + packageNo + ", createDatetime=" + createDatetime + + ", cacheSourceClass=" + cacheSourceClass + '}'; } }