From 6ffad99c5852ede230e329a2067f804bade11f8d Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 10 Sep 2021 15:57:14 +0800 Subject: [PATCH 01/22] =?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/22] =?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/22] =?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/22] =?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/22] =?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/22] =?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/22] =?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/22] =?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/22] =?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/22] =?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 0cfac0aaafc8f8bde7416d225eae4d21d106e997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Fri, 22 Oct 2021 17:49:11 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=90=8C=E6=AD=A5=E6=A0=87=E5=BF=97?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 6d92fb6..3992866 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 @@ -5,8 +5,6 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -41,6 +39,11 @@ import java.util.List; public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus = 2; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; @@ -440,8 +443,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { private Integer ngQty; - - public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } 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 12/22] =?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 + '}'; } } From e97f49d8ee2813ff396f57fe04317a097042c21f Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 26 Oct 2021 09:30:47 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9B=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 7 ++----- .../main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java index a7e3134..69d804f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -46,10 +46,12 @@ public class InsertedOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="REMARK") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 2b079df..8bdaf48 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -56,11 +56,6 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting") private String specifyRouting; - @Column(name="RECALC_COUNT") - @ApiParam(value ="是否重新计算数量") - @FieldAnnotation(defaultValue = "true") - private Boolean recalcCount; - @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; @@ -95,10 +90,12 @@ public class ProductOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="PRODUCT_ROUTING_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java index d1118a1..c16400f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -43,10 +43,12 @@ public class SafeStockOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 88c8cfe..346d1ef 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -77,12 +77,12 @@ public class SalesOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="SERIAL_NUMBER") From 3af6e02e528a8eb1f9c6e48b13b28778be8eb6e7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 26 Oct 2021 13:35:34 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E5=A4=A7=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=89=8D=E6=8F=90=E4=BA=A4=EF=BC=9A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E7=9A=84=E8=AE=A2=E5=8D=95=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=8E=92=E7=A8=8B=E4=B8=8D=E5=BD=B1=E5=93=8D=E4=BA=A4=E6=9C=9F?= =?UTF-8?q?=E6=97=A9=E7=9A=84=E8=AE=A2=E5=8D=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 54aa79b..81bdc50 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -36,8 +36,8 @@ import java.util.List; @Table(name="APS_WORK_PLAN") @Api("工作计划") public class WorkPlan extends BaseAPS { - private static final long serialVersionUID = 5489548115780676195L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") From 5666b5d1209be20436443a207bb1da75a51198f4 Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 26 Oct 2021 13:44:48 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8D=8E=E5=9F=9F=E7=9B=B8=E5=85=B3=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 505bebc..e7c518c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -128,7 +128,7 @@ public class BlockSoftSwitchEnumUtil { // CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"), CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"), - + CLIENT_WEB_SERVICE_HUAYU(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140005,"Client 华域的设置"), /* 数据源 */ CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), From 3270395d94595c69b9e12ed3f9e0d23777c7fcf4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 27 Oct 2021 19:41:07 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E5=AE=89=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/FsmStatusModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmStatusModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmStatusModel.java new file mode 100644 index 0000000..e34907a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmStatusModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/3/30 22:18 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FsmStatusModel { + + private String from; + + private String to; + + private String event; + + private Object context; + + private String status; + +} From 462f5c9d58dfa9078f8b9c446dc6d4cdaf8fde2c Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Oct 2021 13:10:10 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/SerialNumber.java | 4 +++ .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 14 ++++----- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 34 ++-------------------- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 3 +- 4 files changed, 16 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java index bf0944d..0046368 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -52,6 +52,10 @@ public class SerialNumber extends BaseAPS { @ApiParam(value ="插单流水号") private Integer hNumber = 0; + @Column(name="Z_NUMBER") + @ApiParam(value ="补充订单流水号") + private Integer zNumber = 0; + @Column(name="LAST_DATE") @ApiParam(value ="最后生成日期") private Date lastDate; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 607a948..a4a9d20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -102,7 +102,7 @@ public class WorkRelation extends BaseAPS { } public void setWorkInput(WorkInput input) { - this.workInputId = input != null ? input.getId() : 0l; + this.workInputId = input != null ? input.getId() : 0L; BeanRelation.set(this, EWorkRelation.WorkInput, input); } @@ -111,7 +111,7 @@ public class WorkRelation extends BaseAPS { } public void setWorkOutput(WorkOutput output) { - this.workOutputId = output != null ? output.getId() : 0l; + this.workOutputId = output != null ? output.getId() : 0L; BeanRelation.set(this, EWorkRelation.WorkOutput, output); } @@ -120,7 +120,7 @@ public class WorkRelation extends BaseAPS { } public void setPrevWork(Work work) { - this.prevWorkId = work != null ? work.getId() : 0l; + this.prevWorkId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkRelation.PrevWork, work); } @@ -129,7 +129,7 @@ public class WorkRelation extends BaseAPS { } public void setPostWork(Work work) { - this.postWorkId = work != null ? work.getId() : 0l; + this.postWorkId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkRelation.PostWork, work); } @@ -138,7 +138,7 @@ public class WorkRelation extends BaseAPS { } public void setPrevOrder(BaseOrder order) { - this.prevOrderId = order != null ? order.getId() : 0l; + this.prevOrderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EWorkRelation.PrevOrder, order); } @@ -147,7 +147,7 @@ public class WorkRelation extends BaseAPS { } public void setPostOrder(BaseOrder order) { - this.postOrderId = order != null ? order.getId() : 0l; + this.postOrderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EWorkRelation.PostOrder, order); } @@ -156,7 +156,7 @@ public class WorkRelation extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EWorkRelation.Material, material); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 0dc81b8..2198ec8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -23,7 +23,7 @@ public class BeanRelation { } } - private static Map relations = new ConcurrentHashMap<>(); + private static final Map relations = new ConcurrentHashMap<>(); private static BeanRelation get() { Long userId = 0L; BeanRelation relation = relations.get(userId); @@ -214,8 +214,8 @@ public class BeanRelation { return result; } - private final static boolean lastListImpl(List result, BaseBean bean, BaseBean self, Predicate pred, - Enum[] holders, int index) { + private static boolean lastListImpl(List result, BaseBean bean, BaseBean self, Predicate pred, + Enum[] holders, int index) { if (index >= holders.length) { if (self == bean) { return false; @@ -270,10 +270,6 @@ public class BeanRelation { /** * 设值两个对象之间的关联 - * - * @param bean - * @param holder - * @param relaBean */ public static void set(BaseBean bean, Enum holder, BaseBean relaBean) { if (bean == null || holder == null) { @@ -309,11 +305,6 @@ public class BeanRelation { /** * 建立对象之间双向引用实现 - * - * @param bean - * @param holder - * @param relaBean - * @param reverseHolder */ private static void setImpl(BaseBean bean, Enum holder, BaseBean relaBean, Enum reverseHolder) { get(bean).get(holder).add(relaBean); @@ -324,8 +315,6 @@ public class BeanRelation { /** * 移除对象所有关系 - * - * @param bean */ public static void remove(BaseBean bean) { if (bean == null) { @@ -342,9 +331,6 @@ public class BeanRelation { /** * 移除关联 - * - * @param bean - * @param holder */ public static void remove(BaseBean bean, Enum holder) { if (bean == null || holder == null) { @@ -365,10 +351,6 @@ public class BeanRelation { /** * 移除关联的指定对象 - * - * @param bean - * @param holder - * @param relaBean */ public static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { if (bean == null || holder == null) { @@ -384,7 +366,6 @@ public class BeanRelation { /** * 移除关联关系中的对象，并不会移除关联的对象的关系 - * @param bean */ public static void erase(BaseBean bean) { get().caches.get(bean.getClass()).remove(bean.getId()); @@ -392,10 +373,6 @@ public class BeanRelation { /** * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 - * @param bean - * @param fun - * @param holders - * @param */ public static void recursion(BaseBean bean, Predicate fun, Enum... holders) { if (holders.length == 0) { @@ -406,11 +383,6 @@ public class BeanRelation { /** * 按指定路径，递归调用实现。采用广度优先搜索。 - * @param bean - * @param fun - * @param holders - * @param index - * @param */ private final static void recursionImpl(BaseBean bean, Predicate fun, Enum[] holders, int index) { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 5d911a9..57d208b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1148,7 +1148,8 @@ public class ApsEnumUtil { PURCHASE_ORDER("PURCHASE_ORDER", "P", "采购订单"), INVENTORY("INVENTORY", "W", "库存订单"), SAFE_STOCK_ORDER("SAFE_STOCK_ORDER", "Q", "安全库存订单"), - INSERTED_ORDER("INSERTED_ORDER", "I", "插单"); + INSERTED_ORDER("INSERTED_ORDER", "I", "插单"), + SUPPLY_ORDER("SUPPLY_ORDER", "Z", "补充订单"); private final String value; private final String prefix; From 6effb386a3300a42476e22c22ceb585244b5ac24 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Oct 2021 14:15:52 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/bean/AssistResourceSetTime.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/DataLink.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 1 + .../estsh/i3plus/pojo/aps/bean/ExportDetail.java | 4 +- .../estsh/i3plus/pojo/aps/bean/ExportProject.java | 2 +- .../i3plus/pojo/aps/bean/ExpressionRecord.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 2 +- .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 1 + .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 2 +- .../estsh/i3plus/pojo/aps/bean/ImportProject.java | 3 +- .../estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 2 +- .../i3plus/pojo/aps/bean/InterMediateDetail.java | 2 +- .../i3plus/pojo/aps/bean/InterMediateResult.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 1 + .../pojo/aps/bean/MaterialDeliveryPromise.java | 2 +- .../i3plus/pojo/aps/bean/MaterialSetTime.java | 6 +- .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 5 +- .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 5 +- .../estsh/i3plus/pojo/aps/bean/OperResource.java | 5 +- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 4 +- .../estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/OrderTree.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 5 +- .../estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 3 +- .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 3 +- .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 20 ++++-- .../estsh/i3plus/pojo/aps/bean/ShippingTime.java | 8 +-- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 8 +-- .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 6 +- .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 6 +- .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 8 +-- .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 1 + .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 37 +++------- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 6 +- .../i3plus/pojo/aps/common/BeanRelationUtil.java | 83 +++++++++------------- .../pojo/aps/converter/CustomDateDeserializer.java | 2 +- .../estsh/i3plus/pojo/aps/holders/EResource.java | 4 +- .../estsh/i3plus/pojo/aps/tool/APSDoubleTool.java | 3 - .../src/main/resources/relations/Resource.xml | 2 + 46 files changed, 131 insertions(+), 145 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 1d24b39..5371a20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("副资源设置时间") public class AssistResourceSetTime extends BaseAPS { private static final long serialVersionUID = 901172392855536686L; + @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index b22eb80..e0de8b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -36,6 +36,7 @@ import java.util.List; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class BaseOrder extends BaseAPS { private static final long serialVersionUID = -2571085172798608026L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -121,7 +122,7 @@ public class BaseOrder extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EBaseOrder.Material, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index e5ff2f6..f649237 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -25,6 +25,7 @@ import javax.persistence.MappedSuperclass; @ExcludeImportExport public class BaseRule extends BaseAPS { private static final long serialVersionUID = -1818853814377611968L; + @Column(name="CODE") @ApiParam(value ="规则编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 0d537d2..4b402e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("数据集成数据连接信息") public class DataLink extends BaseAPS { private static final long serialVersionUID = 8324774871058505466L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index 8d7733d..710b92c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class DayShift extends BaseAPS { private static final long serialVersionUID = 7964370027924366093L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index 3a905d3..499e986 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -27,8 +27,8 @@ import javax.persistence.Table; @Table(name = "APS_EXPORT_DETAIL") @Api("数据导出明细") public class ExportDetail extends BaseAPS { - private static final long serialVersionUID = -8898414164032180539L; + @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; @@ -62,7 +62,7 @@ public class ExportDetail extends BaseAPS { } public void setProject(ExportProject project) { - this.projectId = project != null ? project.getId() : 0l; + this.projectId = project != null ? project.getId() : 0L; BeanRelation.set(this, EExportDetail.Project, project); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 98bc0d9..d81c7ac 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -51,7 +51,7 @@ public class ExportProject extends BaseAPS { } public void setLink(DataLink link) { - this.linkId = link != null ? link.getId() : 0l; + this.linkId = link != null ? link.getId() : 0L; BeanRelation.set(this, EExportProject.Link, link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java index 7d7c3e8..7abcf74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Api("表达式记录") public class ExpressionRecord extends BaseAPS { private static final long serialVersionUID = 4038954046132896632L; + @Column(name="BEAN_NAME") @ApiParam(value ="表名") private String beanName; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index d7d9033..b8daf9f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -34,6 +34,7 @@ import java.sql.JDBCType; @ExcludeImportExport public class FieldInfo extends BaseAPS { private static final long serialVersionUID = -6195036426929675850L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index 0287a35..f9b13e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -31,8 +31,8 @@ import java.util.List; @Table(name="APS_FURNACE_PLAN") @Api("炉资源计划") public class FurnacePlan extends BaseAPS { - private static final long serialVersionUID = 6816465736285211114L; + @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="已占用的能力") private Double capacity; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 294ec49..a529eb1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("排程运算规则") public class HeuristicRule extends BaseRule { private static final long serialVersionUID = -4856714428377308150L; + @Column(name="WORK_FILTER") @ApiParam(value ="工作筛选") private String workFilter; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index e8f1d60..0e17bda 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -35,7 +35,6 @@ import java.util.List; @Api("数据导入明细") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ImportDetail extends BaseAPS { - private static final long serialVersionUID = 1264030397500660450L; @Column(name="NAME") @@ -125,7 +124,7 @@ public class ImportDetail extends BaseAPS { } public void setProject(ImportProject project) { - this.projectId = project != null ? project.getId() : 0l; + this.projectId = project != null ? project.getId() : 0L; BeanRelation.set(this, EImportDetail.Project, project); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index cb0d6e4..c178867 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -80,7 +80,7 @@ public class ImportField extends BaseAPS { } public void setImportDetail(ImportDetail detail) { - this.importDetailId = detail != null ? detail.getId() : 0l; + this.importDetailId = detail != null ? detail.getId() : 0L; BeanRelation.set(this, EImportField.ImportDetail, detail); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 35aaf50..62dd6ab 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -29,6 +29,7 @@ import java.util.List; @Api("数据导入明细集合") public class ImportProject extends BaseAPS { private static final long serialVersionUID = -1899074765155621438L; + @Column(name="NAME") @ApiParam(value ="标识名") private String name; @@ -49,7 +50,7 @@ public class ImportProject extends BaseAPS { } public void setLink(DataLink link) { - this.linkId = link != null ? link.getId() : 0l; + this.linkId = link != null ? link.getId() : 0L; BeanRelation.set(this, EImportProject.Link, link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java index 69d804f..df30bf1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -63,7 +63,7 @@ public class InsertedOrder extends BaseOrder { } public void setProductRouting(ProductRouting routing) { - this.productRoutingId = routing != null ? routing.getId() : 0l; + this.productRoutingId = routing != null ? routing.getId() : 0L; BeanRelation.set(this, EInsertedOrder.ProductRouting, routing); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java index 2f8136f..62d1a22 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java @@ -44,7 +44,7 @@ public class InterMediateDetail extends BaseAPS { public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); } public void setResult(InterMediateResult result) { - this.resultId = result != null ? result.getId() : 0; + this.resultId = result != null ? result.getId() : 0L; BeanRelation.set(this, EInterMediateDetail.Result, result); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java index 87d59be..95a95d5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java @@ -51,14 +51,14 @@ public class InterMediateResult extends BaseAPS { } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EInterMediateResult.Work, work); } public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); } public void setResource(Resource resource) { - this.resourceId = resource != null ? resource.getId() : 0l; + this.resourceId = resource != null ? resource.getId() : 0L; BeanRelation.set(this, EInterMediateResult.Resource, resource); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index e214454..7f452ee 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Api("物料运算规则") public class MatCalcRule extends BaseRule { private static final long serialVersionUID = 2102986260688118982L; + @Column(name="MATERIAL_FILTER") @ApiParam(value ="物料筛选") private String materialFilter; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index bb8c32d..bd9e959 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -37,6 +37,7 @@ import java.util.List; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Material extends BaseAPS { private static final long serialVersionUID = -7928225487946173108L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java index 7724a6c..0b9b1b5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java @@ -48,7 +48,7 @@ public class MaterialDeliveryPromise extends BaseBean { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EMaterialDeliveryPromise.Material, material); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index d77217c..b199355 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("物料设置时间") public class MaterialSetTime extends BaseAPS { private static final long serialVersionUID = -7996431489447641539L; + @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true, mainkey = true) @@ -45,9 +46,4 @@ public class MaterialSetTime extends BaseAPS { @ApiParam(value ="设置时间") @FieldAnnotation(notEmpty = true) private String time; - -// @Column(name="PRIORITY") -// @ApiParam(value ="优先级") -// @FieldAnnotation(defaultValue = "10", mainkey = true) -// private Integer priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 2d389fa..47937e7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -30,6 +30,7 @@ import java.util.List; @Api("工序输入") public class OperInput extends BaseAPS { private static final long serialVersionUID = 6653235155693766804L; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @@ -75,7 +76,7 @@ public class OperInput extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EOperInput.Operation, oper); } @@ -84,7 +85,7 @@ public class OperInput extends BaseAPS { } public void setInputMaterial(Material material) { - this.inputMaterialId = material != null ? material.getId() : 0l; + this.inputMaterialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EOperInput.InputMaterial, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index e17e69d..1ce057f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -29,6 +29,7 @@ import java.util.List; @Api("工序输出") public class OperOutput extends BaseAPS { private static final long serialVersionUID = 3185682762290147209L; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @@ -59,7 +60,7 @@ public class OperOutput extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EOperOutput.Operation, oper); } @@ -68,7 +69,7 @@ public class OperOutput extends BaseAPS { } public void setOutputMaterial(Material material) { - this.outputMaterialId = material != null ? material.getId() : 0l; + this.outputMaterialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EOperOutput.OutputMaterial, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index e054949..f8f154b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -30,6 +30,7 @@ import java.util.List; @Api("工序资源") public class OperResource extends BaseAPS { private static final long serialVersionUID = -8683889582369342606L; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @@ -88,7 +89,7 @@ public class OperResource extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EOperResource.Operation, oper); } @@ -97,7 +98,7 @@ public class OperResource extends BaseAPS { } public void setResource(Resource res) { - this.resourceId = res != null ? res.getId() : 0l; + this.resourceId = res != null ? res.getId() : 0L; BeanRelation.set(this, EOperResource.Resource, res); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 5ead088..9697136 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -96,7 +96,7 @@ public class Operation extends BaseAPS { } public void setProductRouting(ProductRouting routing) { - this.productRoutingId = routing != null ? routing.getId() : 0l; + this.productRoutingId = routing != null ? routing.getId() : 0L; BeanRelation.set(this, EOperation.ProductRouting, routing); } @@ -120,7 +120,7 @@ public class Operation extends BaseAPS { } public void setStandOperation(StandOperation std) { - this.standOperationId = std != null ? std.getId() : 0l; + this.standOperationId = std != null ? std.getId() : 0L; BeanRelation.set(this, EOperation.StandOperation, std); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index b4cdff2..c42834e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -69,7 +69,7 @@ public class OrderFeedback extends BaseAPS { } public void setOrder(BaseOrder order) { - this.orderId = order != null ? order.getId() : 0l; + this.orderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EOrderFeedback.Order, order); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java index b5dad6b..c93dc74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java @@ -25,6 +25,7 @@ import java.util.Date; @ExcludeImportExport public class OrderTree extends BaseAPS { private static final long serialVersionUID = -7505923374791695738L; + @ApiParam(value ="物料编码") private String material; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index e5ade8e..36954ae 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -33,6 +33,7 @@ import java.util.List; @ExcludeImportExport public class ParentWork extends BaseAPS { private static final long serialVersionUID = 8792781216193806606L; + @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") private Double count; @@ -57,7 +58,7 @@ public class ParentWork extends BaseAPS { } public void setProductOrder(ProductOrder order) { - this.productOrderId = order != null ? order.getId() : 0l; + this.productOrderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EParentWork.ProductOrder, order); } @@ -66,7 +67,7 @@ public class ParentWork extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EParentWork.Operation, oper); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 5ed25cd..8d8922d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -27,7 +27,6 @@ import javax.persistence.Table; @Table(name = "APS_PLAN_FEEDBACK") @Api("工作反馈") public class PlanFeedback extends BaseAPS { - private static final long serialVersionUID = 2520555825093741381L; @Column(name="WORK_ID") @@ -52,7 +51,7 @@ public class PlanFeedback extends BaseAPS { } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EPlanFeedback.Work, work); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 8bdaf48..ce9fff2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -31,6 +31,7 @@ import java.util.List; @Api("生产订单") public class ProductOrder extends BaseOrder { private static final long serialVersionUID = 6900226668783662736L; + @Column(name="EST") @ApiParam(value ="最早开始时间") private Date est; @@ -113,7 +114,7 @@ public class ProductOrder extends BaseOrder { } public void setProductRouting(ProductRouting routing) { - this.productRoutingId = routing != null ? routing.getId() : 0l; + this.productRoutingId = routing != null ? routing.getId() : 0L; BeanRelation.set(this, EProductOrder.ProductRouting, routing); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index a109c6a..dae30aa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -34,6 +34,7 @@ import java.util.List; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ProductRouting extends BaseAPS { private static final long serialVersionUID = 4905294866468216722L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -67,7 +68,7 @@ public class ProductRouting extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EProductRouting.Material, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 63692bd..724f347 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -99,18 +99,28 @@ public class Resource extends BaseAPS { @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer EfficiencyEffect; - @ApiParam(value ="是否存在任务冲突") - @FieldAnnotation(property = false) - @Transient - private boolean hasConflict; + @Column(name="BIND_RESOURCE_ID") + @ApiParam(value ="绑定资源") + @FieldAnnotation(relation = "Order", modify = false) + private Long bindResourceId; public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); } public void setWorkShop(WorkShop workShop) { - this.workShopId = workShop != null ? workShop.getId() : 0l; + this.workShopId = workShop != null ? workShop.getId() : 0L; BeanRelation.set(this, EResource.WorkShop, workShop); } @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } + + public Resource getBindResource() { return BeanRelation.get(this, EResource.BindResource); } + + public void setResource(Resource bindResource) { + this.bindResourceId = bindResource != null ? bindResource.getId() : 0L; + BeanRelation.set(this, EResource.BindResource, bindResource); + } + + @JsonBackReference + public List getSubBindResources() { return BeanRelation.list(this, EResource.SubBindResources); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index bc0ec95..129ab70 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -61,28 +61,28 @@ public class ShippingTime extends BaseAPS { public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } public void setPrevRes(Resource res) { - this.prevResId = res != null ? res.getId() : 0l; + this.prevResId = res != null ? res.getId() : 0L; BeanRelation.set(this, EShippingTime.PrevRes, res); } public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); } public void setPostRes(Resource res) { - this.postResId = res != null ? res.getId() : 0l; + this.postResId = res != null ? res.getId() : 0L; BeanRelation.set(this, EShippingTime.PostRes, res); } public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);} public void setPrevStand(StandOperation stand) { - this.prevStandId = stand != null ? stand.getId() : 0l; + this.prevStandId = stand != null ? stand.getId() : 0L; BeanRelation.set(this, EShippingTime.PrevStand, stand); } public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); } public void setPostStand(StandOperation stand) { - this.postStandId = stand != null ? stand.getId() : 0l; + this.postStandId = stand != null ? stand.getId() : 0L; BeanRelation.set(this, EShippingTime.PostStand, stand); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index c8d64bc..37c68b5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -96,7 +96,7 @@ public class StandOperation extends BaseAPS { public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); } public void setWorkShop(WorkShop workShop) { - this.workShopId = workShop != null ? workShop.getId() : 0l; + this.workShopId = workShop != null ? workShop.getId() : 0L; BeanRelation.set(this, EStandOperation.WorkShop, workShop); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 7aa6f20..5a61846 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -194,7 +194,7 @@ public class Work extends BaseAPS { } public void setOrder(BaseOrder order) { - this.orderId = order != null ? order.getId() : 0l; + this.orderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EWork.Order, order); } @@ -203,7 +203,7 @@ public class Work extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EWork.Operation, oper); } @@ -212,7 +212,7 @@ public class Work extends BaseAPS { } public void setOriginOperation(Operation oper) { - this.originOperationId = oper != null ? oper.getId() : 0l; + this.originOperationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EWork.OriginOperation, oper); } @@ -221,7 +221,7 @@ public class Work extends BaseAPS { } public void setParentWork(ParentWork parentWork) { - this.parentWorkId = parentWork != null ? parentWork.getId() : 0l; + this.parentWorkId = parentWork != null ? parentWork.getId() : 0L; BeanRelation.set(this, EWork.ParentWork, parentWork); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 4390af5..045862a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -65,7 +65,7 @@ public class WorkInput extends BaseAPS { } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkInput.Work, work); } @@ -79,7 +79,7 @@ public class WorkInput extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EWorkInput.Material, material); } @@ -88,7 +88,7 @@ public class WorkInput extends BaseAPS { } public void setOperInput(OperInput input) { - this.operInputId = input != null ? input.getId() : 0l; + this.operInputId = input != null ? input.getId() : 0L; BeanRelation.set(this, EWorkInput.OperInput, input); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 7f04aba..7a2fade 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -67,7 +67,7 @@ public class WorkOutput extends BaseAPS { } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkOutput.Work, work); } @@ -81,7 +81,7 @@ public class WorkOutput extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EWorkOutput.Material, material); } @@ -90,7 +90,7 @@ public class WorkOutput extends BaseAPS { } public void setOperOutput(OperOutput output) { - this.operOutputId = output != null ? output.getId() : 0l; + this.operOutputId = output != null ? output.getId() : 0L; BeanRelation.set(this, EWorkOutput.OperOutput, output); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 7c845e8..c324886 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -102,14 +102,14 @@ public class WorkResource extends BaseAPS { @Column(name="RES_CAPACITY_ID") @ApiParam(value ="设备能力id") @FieldAnnotation(property = false) - private Long resCapacityId = 0l; + private Long resCapacityId = 0L; public Work getWork() { return BeanRelation.get(this, EWorkResource.Work); } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkResource.Work, work); } @@ -118,7 +118,7 @@ public class WorkResource extends BaseAPS { } public void setResource(Resource res) { - this.resourceId = res != null ? res.getId() : 0l; + this.resourceId = res != null ? res.getId() : 0L; BeanRelation.set(this, EWorkResource.Resource, res); } @@ -127,7 +127,7 @@ public class WorkResource extends BaseAPS { } public void setOperResource(OperResource res) { - this.operResourceId = res != null ? res.getId() : 0l; + this.operResourceId = res != null ? res.getId() : 0L; BeanRelation.set(this, EWorkResource.OperResource, res); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index fef2680..2d26e1d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -26,6 +26,7 @@ import java.util.HashMap; @ExcludeImportExport public abstract class BaseAPS extends BaseBean { private static final long serialVersionUID = -8638842158403944318L; + @JsonIgnore @Lob @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index cad44d4..3626a73 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -17,10 +17,10 @@ import java.util.function.Consumer; * @Modify: **/ public class BeanInfo { - private Class cls; + private final Class cls; private BeanInfo superBeanInfo; - private List childsBeanInfos = new ArrayList<>(); - private Map, RelationInfo> relations = new HashMap<>(); + private final List childsBeanInfos = new ArrayList<>(); + private final Map, RelationInfo> relations = new HashMap<>(); public BeanInfo(Class cls) { this.cls = cls; @@ -97,14 +97,6 @@ public class BeanInfo { return (Class)cls; } - public BeanInfo getRelationBeanInfo(Enum holder) { - RelationInfo relaInfo = getRelationInfo(holder); - if (relaInfo != null) { - return relaInfo.getBeanInfo(); - } - return null; - } - public BeanInfo getRelationBeanInfo(String name) { RelationInfo relaInfo = getRelationInfo(name); if (relaInfo != null) { @@ -130,15 +122,6 @@ public class BeanInfo { return RELATION_TYPE.INVALID; } - public RELATION_TYPE getRelationType(String name) { - RelationInfo relaInfo = getRelationInfo(name); - if (relaInfo != null) { - return relaInfo.getType(); - } - - return RELATION_TYPE.INVALID; - } - private void foreach(Consumer fun) { for (Map.Entry, RelationInfo> entry : relations.entrySet()) { fun.accept(entry.getValue()); @@ -150,9 +133,7 @@ public class BeanInfo { public List> getAllHolders() { List> holders = new ArrayList<>(); - foreach((RelationInfo info)->{ - holders.add(info.getHolder()); - }); + foreach((RelationInfo info)-> holders.add(info.getHolder())); return holders; } @@ -176,8 +157,8 @@ public class BeanInfo { return holders; } - private static Map, BeanInfo> beanInfos = new HashMap<>(); - private static Map nameMapBeanInfos = new HashMap<>(); + private static final Map, BeanInfo> beanInfos = new HashMap<>(); + private static final Map nameMapBeanInfos = new HashMap<>(); private static IMainKeyValidatorImpl mainKeyValidator; static { @@ -220,13 +201,11 @@ public class BeanInfo { } public static BeanInfo getBeanInfo(Class cls) { - BeanInfo info = beanInfos.get(cls); - return info; + return beanInfos.get(cls); } public static BeanInfo getBeanInfo(String name) { - BeanInfo info = nameMapBeanInfos.get(name); - return info; + return nameMapBeanInfos.get(name); } public static Class getSuperClass(Class cls) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 2198ec8..63ad8a3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -384,8 +384,8 @@ public class BeanRelation { /** * 按指定路径，递归调用实现。采用广度优先搜索。 */ - private final static void recursionImpl(BaseBean bean, Predicate fun, - Enum[] holders, int index) { + private static void recursionImpl(BaseBean bean, Predicate fun, + Enum[] holders, int index) { if (index >= holders.length) { if (!fun.test((T) bean)) { return; @@ -395,7 +395,7 @@ public class BeanRelation { List relaBeans = list(bean, holders[index]); for (BaseBean relaBean : relaBeans) { - if (relaBean.getId() != bean.getId()) { + if (!relaBean.getId().equals(bean.getId())) { recursionImpl(relaBean, fun, holders, index + 1); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java index 49e3a5f..5d2e8c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java @@ -9,7 +9,6 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import java.io.File; -import java.io.FileFilter; import java.io.IOException; import java.io.InputStream; import java.net.JarURLConnection; @@ -24,11 +23,7 @@ public class BeanRelationUtil { static class XMLReader extends DefaultHandler { private BeanInfo firstInfo = null; - private Enum firstHolder = null; - private BeanInfo secondInfo = null; - private Enum secondHolder = null; - private RELATION_TYPE type = RELATION_TYPE.INVALID; - private boolean owner = false; + public void startElement(String uri, String localName, String nodeName, Attributes attributes) throws SAXException { if (nodeName.equalsIgnoreCase("Class")) { final String name = attributes.getValue("name"); @@ -49,8 +44,8 @@ public class BeanRelationUtil { if (firstSignName == null) { throw new SAXException("Relation节点缺少field属性"); } - this.firstHolder = this.firstInfo.getHolder(firstSignName); - if (this.firstHolder == null) { + Enum firstHolder = this.firstInfo.getHolder(firstSignName); + if (firstHolder == null) { throw new SAXException("未定义枚举标识" + firstSignName); } @@ -58,46 +53,44 @@ public class BeanRelationUtil { if (secondFactoryName == null) { throw new SAXException("Relation节点缺少name属性"); } - this.secondInfo = BeanInfo.getBeanInfo(secondFactoryName); - if (this.secondInfo == null) { + BeanInfo secondInfo = BeanInfo.getBeanInfo(secondFactoryName); + if (secondInfo == null) { throw new SAXException("未找到" + secondFactoryName + "的类定义"); } String secondSignName = attributes.getValue("reverse"); + Enum secondHolder = null; if (secondSignName != null) { - this.secondHolder = this.secondInfo.getHolder(secondSignName); - if (this.secondHolder == null) { + secondHolder = secondInfo.getHolder(secondSignName); + if (secondHolder == null) { throw new SAXException(secondFactoryName + "类未定义枚举标识" + secondSignName); } - } else { - this.secondHolder = null; } String typeName = attributes.getValue("type"); if (typeName == null) { throw new SAXException("Relation节点缺少type属性"); } - this.type = RELATION_TYPE.valueOf(typeName); + RELATION_TYPE type = RELATION_TYPE.valueOf(typeName); String ownerName = attributes.getValue("owner"); - if (ownerName == null) { - this.owner = false; - } else { - this.owner = ownerName.equalsIgnoreCase("true") ? true : false; + boolean owner = false; + if (ownerName != null) { + owner = ownerName.equalsIgnoreCase("true"); } - RelationInfo firstData = this.getSignData(firstInfo, this.firstHolder); - firstData.setBeanInfo(this.secondInfo); - firstData.setType(this.type); - firstData.setOwner(this.owner); - firstData.setReverseHolder(this.secondHolder); + RelationInfo firstData = this.getSignData(firstInfo, firstHolder); + firstData.setBeanInfo(secondInfo); + firstData.setType(type); + firstData.setOwner(owner); + firstData.setReverseHolder(secondHolder); - if (this.secondHolder != null) { - RelationInfo secondData = this.getSignData(secondInfo, this.secondHolder); + if (secondHolder != null) { + RelationInfo secondData = this.getSignData(secondInfo, secondHolder); secondData.setBeanInfo(this.firstInfo); secondData.setOwner(false); - secondData.setReverseHolder(this.firstHolder); - switch (this.type) { + secondData.setReverseHolder(firstHolder); + switch (type) { case MULTI_TO_MULTI: secondData.setType(RELATION_TYPE.MULTI_TO_MULTI); break; @@ -165,8 +158,7 @@ public class BeanRelationUtil { } } } - } catch (IOException e) { - return; + } catch (IOException ignored) { } } @@ -176,13 +168,10 @@ public class BeanRelationUtil { return; } - File[] dirFiles = dir.listFiles(new FileFilter() { - - @Override - public boolean accept(File file) { - return file.isDirectory() || file.getName().endsWith(".xml"); - } - }); + File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".xml")); + if (dirFiles == null) { + return; + } for (File file : dirFiles) { if (file.isDirectory()) { @@ -190,7 +179,7 @@ public class BeanRelationUtil { } else { try { loadXMLConfigure(file.getCanonicalPath()); - } catch (IOException e) { + } catch (IOException ignored) { } } } @@ -215,33 +204,30 @@ public class BeanRelationUtil { /** * 加载本地开发环境中的xml配置文件。 - * @param xmlPath */ private static void loadXMLConfigure(String xmlPath) { SAXParserFactory sf = SAXParserFactory.newInstance(); try { SAXParser sp = sf.newSAXParser(); sp.parse(new InputSource(xmlPath), new XMLReader()); - } catch (ParserConfigurationException | SAXException | IOException e) { + } catch (ParserConfigurationException | SAXException | IOException ignored) { } } /** * 加载jar中的xml配置文件。 - * @param is */ private static void loadXMLConfigure(InputStream is) { SAXParserFactory sf = SAXParserFactory.newInstance(); try { SAXParser sp = sf.newSAXParser(); sp.parse(new InputSource(is), new XMLReader()); - } catch (ParserConfigurationException | SAXException | IOException e) { + } catch (ParserConfigurationException | SAXException | IOException ignored) { } } /** * 将指定包下的类加载到内存中 - * @param packName */ public static List> loadClass(String packName) { List> clses = new ArrayList<>(); @@ -274,13 +260,10 @@ public class BeanRelationUtil { return; } - File[] dirFiles = dir.listFiles(new FileFilter() { - - @Override - public boolean accept(File file) { - return file.isDirectory() || file.getName().endsWith(".class"); - } - }); + File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".class")); + if (dirFiles == null) { + return; + } for (File file : dirFiles) { if (file.isDirectory()) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java index 027f459..74eb03f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -20,7 +20,7 @@ public class CustomDateDeserializer extends JsonDeserializer { if (!StringUtils.isEmpty(text)) { try { return DATETIME_FORMATOR.parse(text); - } catch (ParseException e) { + } catch (ParseException ignored) { } } return null; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index b03a61e..70d4432 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -9,5 +9,7 @@ package cn.estsh.i3plus.pojo.aps.holders; **/ public enum EResource { WorkShop, - WorkPlans + WorkPlans, + BindResource, + SubBindResources, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java index 22a9add..9f3a4e6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java @@ -7,9 +7,6 @@ public class APSDoubleTool { /** * 按指定精度向上取整 - * @param value - * @param pric - * @return */ public static double ceilPric(double value, int pric) { final double digits = Math.pow(10.0, pric); diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml index 889e6c8..285dc24 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -4,4 +4,6 @@ + + \ No newline at end of file From da300c7ccb2cadcc197bc669ecf2a1ede921add8 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Oct 2021 14:31:25 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 724f347..6d31c89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -116,7 +116,7 @@ public class Resource extends BaseAPS { public Resource getBindResource() { return BeanRelation.get(this, EResource.BindResource); } - public void setResource(Resource bindResource) { + public void setBindResource(Resource bindResource) { this.bindResourceId = bindResource != null ? bindResource.getId() : 0L; BeanRelation.set(this, EResource.BindResource, bindResource); } From 72673bfa121bbe0bf2afa400334b015a6710da5b Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 3 Nov 2021 17:33:59 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=85=B3=E8=81=94model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/SysRefUserRoleModel.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java new file mode 100644 index 0000000..a502375 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author ns + * @create 2021/11/3 0003 下午 17:31 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("用户角色关联model") +public class SysRefUserRoleModel implements Serializable { + private SysRefUserRole sysRefUserRole; + private SysUser sysUser; +} From 5b5e00eee7a277e40fd95bcee79b2932b7832139 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 4 Nov 2021 10:50:33 +0800 Subject: [PATCH 21/22] =?UTF-8?q?model=20core=20=E5=A2=9E=E5=8A=A0SysRoleM?= =?UTF-8?q?odel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/{SysRefUserRoleModel.java => SysRoleModel.java} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/{SysRefUserRoleModel.java => SysRoleModel.java} (68%) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java similarity index 68% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java index a502375..1a033dd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.model.platform; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; +import cn.estsh.i3plus.pojo.platform.bean.SysRole; import cn.estsh.i3plus.pojo.platform.bean.SysUser; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; @@ -17,7 +19,7 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Api("用户角色关联model") -public class SysRefUserRoleModel implements Serializable { - private SysRefUserRole sysRefUserRole; - private SysUser sysUser; +public class SysRoleModel implements Serializable { + private SysRole sysRole; + private Pager pager; } From 5a73e89e97ffaf91dd9514b68d49c6d98bf97a58 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 5 Nov 2021 09:34:40 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 0e17bda..2a5a224 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -116,6 +116,10 @@ public class ImportDetail extends BaseAPS { @ApiParam(value ="外部对象筛选") private String outterFilter; + @Column(name="UPDATE_SQL") + @ApiParam(value ="更新外部数据") + private String updateSQL; + @FieldAnnotation(property = false) private transient ImportDataModel model; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index c178867..6b5b511 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -49,6 +49,10 @@ public class ImportField extends BaseAPS { @ApiParam(value = "是否必填", example = "0") private Integer isRequire; + @Column(name="IGNORE_NOT_VALID") + @ApiParam(value = "无效忽略", example = "0") + private Boolean ignoreNotValid; + @Column(name="MAX_LENGTH") @ApiParam(value = "最大长度", example = "0") @FieldAnnotation(defaultValue = "255") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index c42834e..db66293 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -31,7 +31,7 @@ public class OrderFeedback extends BaseAPS { @Column(name="ORDER_ID") @ApiParam(value ="顶层订单号") - @FieldAnnotation(relation = "Order", modify = false) + @FieldAnnotation(mainkey = true, relation = "Order") private Long orderId; @Column(name="ORDER_COUNT") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 8d8922d..1aedf34 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -26,12 +29,13 @@ import javax.persistence.Table; @Entity @Table(name = "APS_PLAN_FEEDBACK") @Api("工作反馈") +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class PlanFeedback extends BaseAPS { private static final long serialVersionUID = 2520555825093741381L; @Column(name="WORK_ID") @ApiParam(value ="工作") - @FieldAnnotation(property = false) + @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work") private Long workId; @Column(name="STATUS") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 81bdc50..97395f8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -136,6 +136,9 @@ public class WorkPlan extends BaseAPS { @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse") private Date resProduceEnd; + @ApiParam(value ="调整时间") + private Date adjustDate; + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) {