diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java index e674f07..0f46e3b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_呼叫原因 @@ -47,5 +48,13 @@ public class AndonAlarmCause extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acName; + @Transient + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Transient + @ApiParam(value = "工作单元") + private String workCellCode; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellAlarmCause.java new file mode 100644 index 0000000..87b497a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellAlarmCause.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : ANDON_工作单元呼叫原因配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:20 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_CELL_ALARM_CAUSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_工作单元呼叫原因配置") +public class AndonCellAlarmCause extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventCause.java new file mode 100644 index 0000000..afef3d0 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventCause.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : ANDON_工作单元事件原因配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:20 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_CELL_EVENT_CAUSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_工作单元事件原因配置") +public class AndonCellEventCause extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + private String ecCode; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventMethod.java new file mode 100644 index 0000000..2553c7c --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventMethod.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : ANDON_工作单元处理方法配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:20 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_CELL_EVENT_METHOD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_工作单元处理方法配置") +public class AndonCellEventMethod extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventPhenomenon.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventPhenomenon.java new file mode 100644 index 0000000..8cfd0b7 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventPhenomenon.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : ANDON_工作单元事件现象 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:20 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_CELL_EVENT_PHENOMENON") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_工作单元事件现象") +public class AndonCellEventPhenomenon extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "EPM_CODE") + @ApiParam(value = "事件现象代码") + private String epmCode; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java index 8e4a816..f5f0469 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_事件原因 @@ -46,4 +47,12 @@ public class AndonEventCause extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; + + @Transient + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Transient + @ApiParam(value = "工作单元") + private String workCellCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java index ad4611d..ccd2315 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_事件处理方法 @@ -46,4 +47,12 @@ public class AndonEventMethod extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; + + @Transient + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Transient + @ApiParam(value = "工作单元") + private String workCellCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java index c0d4d3a..0580ab0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_事件现象 @@ -42,4 +43,12 @@ public class AndonEventPhenoMenon extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; + + @Transient + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Transient + @ApiParam(value = "工作单元") + private String workCellCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellAlarmCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellAlarmCauseRepository.java new file mode 100644 index 0000000..08ab998 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellAlarmCauseRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : ANDON_工作单元呼叫原因配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:07 + * @Modify: + **/ +@Repository +public interface IAndonCellAlarmCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventCauseRepository.java new file mode 100644 index 0000000..c2ea20e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventCauseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : ANDON_工作单元事件原因配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:07 + * @Modify: + **/ +@Repository +public interface IAndonCellEventCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventMethodRetository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventMethodRetository.java new file mode 100644 index 0000000..720dcd5 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventMethodRetository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : ANDON_工作单元处理方法配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:07 + * @Modify: + **/ +@Repository +public interface IAndonCellEventMethodRetository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventPhenomenonRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventPhenomenonRepository.java new file mode 100644 index 0000000..1b0b018 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventPhenomenonRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : ANDON_工作单元事件现象 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:07 + * @Modify: + **/ +@Repository +public interface IAndonCellEventPhenomenonRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 0c9da50..e140fef 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -823,6 +823,7 @@ public class MesEnumUtil { } } + /** * 事件类型枚举 */ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 68e18a9..dc68917 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -83,4 +83,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * PCN 缓存名称 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PCN_CACHE { + + PCH_EHCACHE(10, "PCN_EHCACHE"); + + private int value; + private String description; + + PCN_CACHE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 86d7736..3681eb6 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java new file mode 100644 index 0000000..0d83b74 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/22 5:59 PM + * @Description: + **/ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_NUMBER_RULE") +@Api("条码生成规则") +public class MesNumberRule extends BaseBean { + + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; + + @Column(name = "RULE_DESC") + @ApiParam("规则描述") + private String ruleDesc; + + @Column(name = "PREFIX") + @ApiParam("前缀") + private Integer prefix; + + @Column(name = "NUMBER_RULE") + @ApiParam("编码规则") + private String numberRule; + + @Column(name = "SERIALNO_LENGTH") + @ApiParam("序号长度") + private Integer serialnoLength; + + @Column(name = "SERIALNO_INCREMENT") + @ApiParam("增量") + private Integer serialnoIncrement; + + @Column(name = "IS_CYCLE") + @ApiParam("最大值后循环") + private Integer isCycle; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java new file mode 100644 index 0000000..1abc81c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 9:14 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_NUMBER_SERIALNO") +@Api("编码序号") +public class MesNumberSerialno extends BaseBean { + + @Column(name = "CURRENT_NUMBER_PREFIX") + @ApiParam("当前编号前缀") + private String currentNumberPrefix; + + @Column(name = "CURRENT_SERIALNO") + @ApiParam("当前序号") + private Integer currentSerialno; + + @Column(name = "CURRENT_NUMBER") + @ApiParam("当前编号") + private String currentNumber; +} diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 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 new file mode 100644 index 0000000..ab0ae70 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/22 5:59 PM + * @Description: + **/ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_NUMBER_RULE") +@Api("条码生成规则") +public class MesNumberRule extends BaseBean { + + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; + + @Column(name = "RULE_DESC") + @ApiParam("规则描述") + private String ruleDesc; + + @Column(name = "PREFIX") + @ApiParam("前缀") + private Integer prefix; + + @Column(name = "NUMBER_RULE") + @ApiParam("编码规则") + private String numberRule; + + @Column(name = "SERIALNO_LENGTH") + @ApiParam("序号长度") + private Integer serialnoLength; + + @Column(name = "SERIALNO_INCREMENT") + @ApiParam("增量") + private Integer serialnoIncrement; + + @Column(name = "IS_CYCLE") + @ApiParam("最大值后循环") + private Integer isCycle; +} 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 new file mode 100644 index 0000000..1c68f28 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 9:14 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_NUMBER_SERIALNO") +@Api("编码序号") +public class MesNumberSerialno extends BaseBean { + + @Column(name = "CURRENT_NUMBER_PREFIX") + @ApiParam("当前编号前缀") + private String currentNumberPrefix; + + @Column(name = "CURRENT_SERIALNO") + @ApiParam("当前序号") + private Integer currentSerialno; + + @Column(name = "CURRENT_NUMBER") + @ApiParam("当前编号") + private String currentNumber; +} diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 0798953..39a7704 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SysIotConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SysIotConfig.java new file mode 100644 index 0000000..a0349e9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SysIotConfig.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.wms.bean.iotio; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : IOT 配置表 + * @Reference : + * @Author : Rock.Yu + * @CreateDate : 2019-08-21 18:04 + * @Modify: + **/ +@Data +public class SysIotConfig implements Serializable { + + private static final long serialVersionUID = 2228817197928571545L; + + private Integer ruid; + private String fsbUrl; + private String fsbType; + private String requesterSystem; + private String topicName; + private String publishCode; + private String interfaceCode; + private String tableName; + private String columnName; + private String seq; + private String guid; + private String groupColumn; + private String uniqueColumn; + private String orderColumn; + private String organizeCode; +} diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f220aa1..f355cca 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform