diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index e1e35d5..6614dc3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,6 @@ target *.class .md *.log -*.properties \ No newline at end of file +*.properties +.DS_Store +pom.xml \ No newline at end of file diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java index 979bd4b..7fe53f7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTION_MODULE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("作业组件") public class AndonActionModule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java index 6a3af09..a203e27 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTION_MODULE_GROUP") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("组件集") public class AndonActionModuleGroup extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java index 5364d0b..1f38770 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTION_MODULE_PARAM") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("组件参数") public class AndonActionModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java index c24541f..85e0253 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTION_ROUTE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("作业流程") public class AndonActionRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java index 9e23c15..242b401 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTOR") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR信息") public class AndonActor extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java index 81e2f4b..9001d81 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTOR_RULE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR消息类型配置") public class AndonActorRule extends BaseBean implements Serializable { 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 c8767a5..923a1e7 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,12 +31,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "ANDON_呼叫原因") public class AndonAlarmCause extends BaseBean implements Serializable { private static final long serialVersionUID = 5837347497945981811L; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java index 0594355..1dd3267 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯子类型") public class AndonAlarmDetailType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java index 286fcbc..b190b25 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_呼叫通知配置") public class AndonAlarmResponseCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java index 17279ed..3b1b0c8 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ALARM_ROUTE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯作业流程配置") public class AndonAlarmRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java index 8a9523c..15163b4 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯作业流程组件参数") public class AndonAlarmRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java index 493a665..4d777cc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ALARM_TYPE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯类型") public class AndonAlarmType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java index 84b7e5d..ee0d921 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_AREA_ALARM_TYPE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域安灯类型") public class AndonAreaAlarmType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java index 82bfda2..c4e77a0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java @@ -9,9 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,57 +24,58 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="ANDON_BROADCAST") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "ANDON_BROADCAST") @Api("安灯广播") public class AndonBroadCast extends BaseBean implements Serializable { private static final long serialVersionUID = -5383684820100076411L; - @Column(name="DEVICE_NUM") + @Column(name = "DEVICE_NUM") @ApiParam("广播设备编号") private String targetIds; - @Column(name="GROUP_NO") + @Column(name = "GROUP_NO") @ApiParam("分组号") private String groupNo; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; - @Column(name="DEVICE_DEC") + @Column(name = "DEVICE_DEC") @ApiParam("广播设备名称") private String deviceDec; - @Column(name="DEVICE_IP") + @Column(name = "DEVICE_IP") @ApiParam("广播设备ip") private String deviceIp; - @Column(name="PLAY_INTERVAL") + @Column(name = "PLAY_INTERVAL") @ApiParam("播放间隔") private Integer playInterval = 0; - @Column(name="PLAY_PRIORITY") + @Column(name = "PLAY_PRIORITY") @ApiParam("播放优先级") private Integer playPriority = 500; - @Column(name="VOLUME") + @Column(name = "VOLUME") @ApiParam("播放音量") private Integer volume; - @Column(name="TTS_NAME") + @Column(name = "TTS_NAME") @ApiParam("广播语音引擎") private String voiceEngine; - @Column(name="TEXT_ENCODE") + @Column(name = "TEXT_ENCODE") @ApiParam("广播内容编码格式") private String textEncode = "UTF-8"; - @Column(name="PLAY_SPEED") + @Column(name = "PLAY_SPEED", columnDefinition = "decimal(18,8)") @ApiParam("播放语速") - private Integer playSpeed = 0; + private Double playSpeed = 0d; - @Column(name="PLAY_TIME") + @Column(name = "PLAY_TIME") @ApiParam("播放循环次数") private Integer playTime = 1; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java index 698bebb..9a78d8f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="ANDON_BROADCAST_CFG") @Api("生产区域") public class AndonBroadCastCfg extends BaseBean implements Serializable { 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 index edaab1e..f030511 100644 --- 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工作单元呼叫原因配置") public class AndonCellAlarmCause extends BaseBean implements Serializable { @@ -42,13 +45,13 @@ public class AndonCellAlarmCause extends BaseBean implements Serializable { @ApiParam(value = "工位代码") private String workCellCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") + @ApiParam(value = "安灯类型代码") private String alarmCode; @Column(name = "AC_CODE") - @ApiParam(value = "事件描述") + @ApiParam(value = "事件描述代码") private String acCode; @AnnoOutputColumn(hidden = true) 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 index abf5ff9..b355d85 100644 --- 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工作单元事件原因配置") public class AndonCellEventCause extends BaseBean implements Serializable { @@ -42,19 +45,21 @@ public class AndonCellEventCause extends BaseBean implements Serializable { @ApiParam(value = "工位代码") private String workCellCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") + @ApiParam(value = "安灯类型代码") private String alarmCode; @Column(name = "EC_CODE") - @ApiParam(value = "事件原因") + @ApiParam(value = "事件原因代码") private String ecCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "安灯类型名称") private String alarmCodeName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "事件原因描述") private String ecName; 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 index 23c8d1b..df80c61 100644 --- 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工作单元处理方法配置") public class AndonCellEventMethod extends BaseBean implements Serializable { @@ -42,19 +45,21 @@ public class AndonCellEventMethod extends BaseBean implements Serializable { @ApiParam(value = "工位代码") private String workCellCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") + @ApiParam(value = "安灯类型代码") private String alarmCode; @Column(name = "EM_CODE") - @ApiParam(value = "处理方法") + @ApiParam(value = "处理方法代码") private String emCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "安灯类型名称") private String alarmCodeName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "处理方法描述") private String emName; 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 index ef790dc..76ed01a 100644 --- 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 @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工作单元事件现象") public class AndonCellEventPhenomenon extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java index cd82b84..5f5ae0c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.Interceptor; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工位分组配置") public class AndonCellGroupCfg extends BaseBean implements Serializable { @@ -62,10 +65,12 @@ public class AndonCellGroupCfg extends BaseBean implements Serializable { @ApiParam(value = "纵坐标") private Float verticalAxis; + @AnnoOutputColumn(hidden = true) @Column(name = "ABNORMAL_SRC") @ApiParam(value = "异常图片") private String abnormalSrc; + @AnnoOutputColumn(hidden = true) @Column(name = "NORMAL_SRC") @ApiParam(value = "正常图片") private String normalSrc; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java index a6653c7..c2aa413 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="ANDON_CONFIG") @Api(value="系统配置") public class AndonConfig extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 1db40c9..f0fca4c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_自处理配置") public class AndonDisposalCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java index d2bd2cd..8e5bc58 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("Andon自处理维护配置") public class AndonDisposalMaintenCfg extends BaseBean implements Serializable { 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 91bb41b..a2ecc40 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "ANDON_事件原因") public class AndonEventCause extends BaseBean implements Serializable { @@ -47,7 +50,7 @@ public class AndonEventCause extends BaseBean implements Serializable { @AnnoOutputColumn(hidden = true) private String parentEcCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; 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 c5371c6..dce3e28 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "ANDON_事件处理方法") public class AndonEventMethod extends BaseBean implements Serializable { @@ -47,7 +50,7 @@ public class AndonEventMethod extends BaseBean implements Serializable { @ApiParam(value = "父阶方法代码") private String parentEmCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; 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 52cf481..c6d79c7 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_事件现象") public class AndonEventPhenoMenon extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java index a7dcae8..d75116b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -34,6 +36,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯队列") public class AndonHaltCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java index 4def408..2f01aee 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_停机类型") public class AndonHaltType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java index 6213675..85b99c5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON知识库") public class AndonKnowledgeBase extends BaseManageQueue implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 2c741b0..af127a0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.apache.commons.beanutils.BeanUtils; import org.hibernate.annotations.DynamicInsert; @@ -41,6 +43,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯队列") public class AndonManageQueue extends BaseManageQueue implements Serializable { @@ -286,6 +289,30 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { @ApiParam(value ="安灯类型名称") private String alarmCodeName; + @Transient + @ApiParam(value ="响应时长-分钟") + private Integer downtime; + + @Transient + @ApiParam(value ="故障时长-分钟") + private Integer brokenTime; + + @Transient + @ApiParam(value ="响应时长(分钟)") + private Double sumDowntime; + + @Transient + @ApiParam(value ="故障时长(分钟)") + private Double sumBrokenTime; + + @Transient + @ApiParam(value ="故障字符串") + private String faultStr; + + @Transient + @ApiParam(value ="百分比") + private Integer propagation; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; @@ -309,7 +336,9 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { * @param alarmCode * @param andonCount */ - public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd, String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, String alarmCode, Long andonCount) { + public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd, + String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, + String alarmCode, Long andonCount,String callTime,String resetTime) { this.workCenterCode = workCenterCode; this.workCenterNameRdd = workCenterNameRdd; this.workCellNameRdd = workCellNameRdd; @@ -320,6 +349,8 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { this.shiftNameRdd = shiftNameRdd; this.alarmCode = alarmCode; this.andonCount = andonCount; + this.callTime = callTime; + this.resetTime = resetTime; } /** @@ -409,12 +440,42 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { * @param workCenterNameRdd * @param andonCount */ - public AndonManageQueue(String organizeNameRdd, String workCenterNameRdd, Long andonCount) { + public AndonManageQueue(String organizeNameRdd, String workCenterCode, String workCenterNameRdd, Long andonCount) { this.organizeNameRdd = organizeNameRdd; + this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.andonCount = andonCount; + } + + /** + * 工位统计报表查询 构造函数 + * @param workCenterCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd + * @param equipmentCode + * @param equipmentNameRdd + * @param shiftCode + * @param shiftNameRdd + * @param alarmCode + * @param andonCount + */ + public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellNameRdd,String workCellCode, + String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, + String alarmCode, Long andonCount) { + this.workCenterCode = workCenterCode; this.workCenterNameRdd = workCenterNameRdd; + this.workCellNameRdd = workCellNameRdd; + this.workCellCode = workCellCode; + this.equipmentCode = equipmentCode; + this.equipmentNameRdd = equipmentNameRdd; + this.shiftCode = shiftCode; + this.shiftNameRdd = shiftNameRdd; + this.alarmCode = alarmCode; this.andonCount = andonCount; } + public static void main(String[] args) { try { List ds = new ArrayList(); diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index 3e41a51..8809df0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -36,6 +38,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯记录") public class AndonManageRecord extends BaseManageQueue implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java index e34f15d..f4816a5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("通知记录") public class AndonMessageRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java index 519d5bf..cac7d25 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_MESSAGE_TYPE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("消息类型") public class AndonMessageType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index 385b069..06de9c6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯PLC控制") public class AndonPLC extends BaseBean implements Serializable { @@ -51,6 +54,22 @@ public class AndonPLC extends BaseBean implements Serializable { @ApiParam(value = "IP地址") private String nodeIP; + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + + @Column(name = "OPC_URL") + @ApiParam("OPCUA路径") + private String opcUrl; + + @Column(name = "NAME_SPACE_INDEX") + @ApiParam("空间索引") + private Integer nameSpaceIndex = 2; + @Column(name = "CHANNEL_NAME") @ApiParam(value = "通道名称") private String channelName; @@ -67,6 +86,10 @@ public class AndonPLC extends BaseBean implements Serializable { @ApiParam(value = "标签类型") private String tagType; + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + @Column(name = "GROUP_NO") @ApiParam(value = "分组号") private String groupNo; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java index ee4c926..57e6ba9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -34,6 +36,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯PLC监控记录") public class AndonPLCRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java new file mode 100644 index 0000000..676902f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java @@ -0,0 +1,57 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : 系统参数配置 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-07 09:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="ANDON_PLC_COLOR_CFG") +@Api(value="PLC三色灯控制") +public class AndonPlcColorCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3284234821448131212L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name="RED_PLC_CODE") + @ApiParam(value ="红灯PLC代码") + private String redPlcCode; + + @Column(name="YELLOW_PLC_CODE") + @ApiParam(value ="黄灯PLC代码") + private String yellowPlcCode; + + @Column(name="GREEN_PLC_CODE") + @ApiParam(value ="绿灯PLC代码") + private String greenPlcCode; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index cf92a50..c120c58 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="ANDON_MANAGE_ATTACH") @Api(value="安灯附属表") public class AndonQueueAttach extends BaseBean implements Serializable { @@ -103,4 +106,8 @@ public class AndonQueueAttach extends BaseBean implements Serializable { @ApiParam(value ="生产累计件数") private Integer totalProdNum; + @Column(name="FAULT_STR") + @ApiParam(value ="故障字符串") + private String faultStr; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java index 2a428d1..41ffdec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("通知方式") public class AndonResponse extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java index 7236d3a..0885528 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯通知对象") public class AndonResponseObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java index 882ba39..f022035 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_上升流程配置") public class AndonRiteRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java index b15ee39..55d3f3c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_上升配置明细") public class AndonRiteRouteDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java index fd7db4f..ae11cf7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ROUTE_MODULE_PARAM") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程组件参数") public class AndonRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java index bf2755c..6713197 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ROUTE_STATUS") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态") public class AndonRouteStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java index ceaea06..3842c8d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -22,6 +24,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态异常记录") public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java index 3316350..675642a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java @@ -8,6 +8,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -31,6 +33,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_AREA") @Api("生产区域") public class MesArea extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java index 2761fab..cd85bdd 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java @@ -9,6 +9,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -31,6 +33,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_EQUIPMENT") @Api("生产设备") public class MesEquipment extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java index 9098f6b..3bb41bd 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java index 8bb58e7..913582d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL") @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java index 8cf20a2..b380349 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CENTER") @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 6c046d9..a8890ef 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -74,6 +74,9 @@ public class AndonBoardModel implements Serializable { @ApiParam("图表类型颜色") private String color; + @ApiParam("停线时间比率") + private String downtimeRate; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java index 06230c4..b1ddedc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java @@ -93,6 +93,9 @@ public class AndonMenuInterfaceModel implements Serializable { @ApiParam("当前产线的未解决故障统计") private List pendingSolveBrokenInfoList; + @ApiParam("安灯队列停机时长") + private List andonManageQueueList; + public double getExceptionTimeVal() { return exceptionTime == null ? 0 : exceptionTime; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java new file mode 100644 index 0000000..846bc5d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; + +/** + * @Description : 人员model + * @Reference : + * @Author : wangjie + * @CreateDate : 2018-10-11 11:02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("用户信息model") +public class AndonUserModel extends BaseBean { + + @ApiParam(value ="部门名称") + private String departmentNameRdd; + + @ApiParam(value ="用户名称" , access ="账号名称") + private String userName; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="员工编号") + private String userEmpNo; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java index e35260e..75ffc78 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java @@ -180,4 +180,8 @@ public class BaseManageQueue extends BaseBean implements Serializable { @Column(name = "ALARM_DETAIL_CODE") @ApiParam(value = "安灯子类型代码") public String alarmDetailCode; + + @Column(name = "MEMO") + @ApiParam(value = "备注") + public String memo; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 47588b4..b6ac672 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,7 +32,7 @@ public class CommonMsgModel implements Serializable { private String msgType; @ApiModelProperty("消息数据") - private Map msgData; + private Map msgData = new HashMap<>(); @ApiModelProperty("流程状态集合") private List routeStatusList; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java new file mode 100644 index 0000000..1de89d8 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; +import cn.estsh.i3plus.pojo.andon.bean.AndonPlcColorCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonPlcColorCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 05520d5..0a111a3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -51,6 +51,7 @@ public class AndonHqlPack { public static DdlPackBean getAndonMessageRecord(AndonMessageRecord andonMessageRecord) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean); @@ -1100,4 +1101,17 @@ public class AndonHqlPack { DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean); return packBean; } + + /** + * 安灯 PLC三色灯控制信息查询条件封装 + * @param andonPlcColorCfg + * @return + */ + public static DdlPackBean getAndonPlcColorCfg(AndonPlcColorCfg andonPlcColorCfg) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCellCode(), "workCellCode", result); + getStringBuilderPack(andonPlcColorCfg, result); + return result; + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/CalendarTimeAnntation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/CalendarTimeAnntation.java new file mode 100644 index 0000000..8d09aa2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/CalendarTimeAnntation.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.aps.annotation; + +import cn.estsh.i3plus.pojo.aps.validator.CalendarTimeValidator; + +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @Description : 日历时间校验注解 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-23 + * @Modify: + **/ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy={CalendarTimeValidator.class}) +public @interface CalendarTimeAnntation { + String message() default "日历时间格式错误，示例(多个以逗号分隔)：2020-01-01~2020-02-01"; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java index 7e24878..6b1e36b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java @@ -15,4 +15,6 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface ExcludeImportExport { + boolean excludeImport() default true; + boolean excludeExport() default true; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ShiftTimeAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ShiftTimeAnnotation.java new file mode 100644 index 0000000..bacebdd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ShiftTimeAnnotation.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.aps.annotation; + +import cn.estsh.i3plus.pojo.aps.validator.ShiftTimeValidator; + +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @Description : 班次时间校验注解 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-29 + * @Modify: + **/ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy={ShiftTimeValidator.class}) +public @interface ShiftTimeAnnotation { + String message() default "班次时间格式错误，示例（多个以逗号分隔）：01:00-08:20"; + Class[] groups() default {}; + Class[] payload() default {}; +} 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 e87a86a..3a8b8ff 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; 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 com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -56,10 +57,10 @@ public class BaseOrder extends BaseAPS { @Min(0) private Double count; - @Column(name="PRIORITY") + @Column(name="PRIORITY_ID") @ApiParam(value ="优先级") - @FieldAnnotation(defaultValue = "10") - private Integer priority; + @FieldAnnotation(relation = "Priority") + private Long priorityId; @Column(name="LET") @ApiParam(value ="最晚结束时刻") @@ -93,6 +94,21 @@ public class BaseOrder extends BaseAPS { @ApiParam(value ="专料号") private String specifyMaterialNum; + @Column(name="VALID_ORDER") + @ApiParam(value ="有效订单") + @FieldAnnotation(modify = false) + private Boolean validOrder = true; + + @Column(name="INVALID_REASON") + @ApiParam(value ="无效原因") + @FieldAnnotation(modify = false) + private String invalidReason; + + @Column(name="DELAY_TIME") + @ApiParam(value ="延期时间") + @FieldAnnotation(modify = false) + private Integer delayTime; + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); @@ -116,4 +132,11 @@ public class BaseOrder extends BaseAPS { public List getPostRelations() { return BeanRelation.list(this, EBaseOrder.PostRelations); } + + public PriorityType getPriority() { return BeanRelation.get(this, EBaseOrder.Priority); } + + public void setPriority(PriorityType priority) { + this.priorityId = priority != null ? priority.getId() : 0; + BeanRelation.set(this, EBaseOrder.Priority, priority); + } } 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 c6dc31a..83c965a 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 @@ -2,7 +2,9 @@ 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.annotation.ShiftTimeAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.validator.ImportGroup; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import io.swagger.annotations.Api; @@ -42,5 +44,6 @@ public class DayShift extends BaseAPS { @Column(name="WORK_TIMES") @ApiParam(value ="工作时间") @FieldAnnotation(notEmpty = true) + @ShiftTimeAnnotation(groups = {InsertGroup.class, UpdateGroup.class, ImportGroup.class}) private String workTimes; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index 9a6c5e3..ee8ddc3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java @@ -27,7 +27,7 @@ public class FieldSetRule extends BaseRule { private static final long serialVersionUID = 6880145972942618559L; @Column(name="BEAN") @ApiParam(value ="实体名") - private ApsEnumUtil.FIELD_SET_BEAN bean; + private String bean; @Column(name="FILTER") @ApiParam(value ="筛选") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java index 07513fd..64165e5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java @@ -20,4 +20,5 @@ import javax.persistence.Table; @Table(name = "APS_FLUSH_PLAN_RULE") @Api("刷新计划规则") public class FlushPlanRule extends BaseRule { + private static final long serialVersionUID = 4973034215598612466L; } 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 ed046aa..7aa3c0a 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 @@ -37,6 +37,14 @@ public class FurnacePlan extends BaseAPS { @ApiParam(value ="已占用的能力") private Double capacity; + @Column(name="CAPACITY_LIMIT", columnDefinition = "decimal(18,8)") + @ApiParam(value ="容量限制") + private Double capacityLimit; + + @Column(name="MIN_PRODUCT_BATCH") + @ApiParam(value ="最小加工批量") + private Integer minProductBatch; + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java new file mode 100644 index 0000000..a8db480 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @Description : 排程优化规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-03-24 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_HEURISTIC_OPTIMIZE") +@Api("排程优化规则") +public class HeuristicOptimize extends BaseRule { + private static final long serialVersionUID = -464821596740369199L; + + @Column(name="WORK_FILTER") + @ApiParam(value ="工作筛选") + private String workFilter; + + @Column(name="RES_FILTER") + @ApiParam(value ="资源筛选") + private String resFilter; + + @Lob + @Column(name="RES_SELECT") + @ApiParam(value ="资源选择") + private String resSelect; + + @Column(name="OPTIMIZE_INTERVAL") + @ApiParam(value ="优化间隔") + private String optimizeInterval; +} 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 58997dc..6a96b97 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 @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -29,10 +30,16 @@ public class HeuristicRule extends BaseRule { @ApiParam(value ="工作筛选") private String workFilter; + @Column(name="RES_FILTER") + @ApiParam(value ="资源筛选") + private String resFilter; + + @Lob @Column(name="WORK_SORT") @ApiParam(value ="工作排序") private String workSort; + @Lob @Column(name="RES_SELECT") @ApiParam(value ="资源选择") private String resSelect; 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 ecb13e1..e8f1d60 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 @@ -1,10 +1,15 @@ 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.EImportDetail; +import cn.estsh.i3plus.pojo.aps.model.ImportDataModel; +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 com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,7 +17,9 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; +import java.util.List; /** * @Description :数据导入明细 @@ -26,20 +33,63 @@ import javax.persistence.Table; @Entity @Table(name = "APS_IMPORT_DETAIL") @Api("数据导入明细") +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ImportDetail extends BaseAPS { private static final long serialVersionUID = 1264030397500660450L; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(notEmpty = true, mainkey = true) + private String name; + + @Column(name="GROUP_NAME") + @ApiParam(value ="分组名称") + @FieldAnnotation(notEmpty = true) + private String groupName; + + @Column(name="SUB_GROUP_NAME") + @ApiParam(value ="子分组名称") + @FieldAnnotation(notEmpty = true) + private String subGroupName; + + @Column(name="LINK_TYPE") + @ApiParam(value ="链接类型") + @FieldAnnotation(defaultValue = "EXCEL", notEmpty = true) + private ApsEnumUtil.DATA_LINK_TYPE linkType; + + @Column(name="PATH") + @ApiParam(value ="IP/文件路径") + private String path; + @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; @Column(name="IN_NAME") @ApiParam(value ="内部表名") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.QUERY_LIST, notEmpty = true) private String inName; + @Column(name="PORT") + @ApiParam(value ="端口") + private Integer port; + + @Column(name="DB_NAME") + @ApiParam(value ="数据库名") + private String dbName; + + @Column(name="USER_NAME") + @ApiParam(value ="用户名") + private String userName; + + @Column(name="PASSWORD") + @ApiParam(value ="密码") + private String password; + @Column(name="IMPORT_TYPE") @ApiParam(value ="导入类型") - @FieldAnnotation(defaultValue = "REPLACE") + @FieldAnnotation(defaultValue = "DIFF") private ApsEnumUtil.IMPORT_DETAIL_TYPE importType; @Column(name="SKIP_ROWS") @@ -53,10 +103,23 @@ public class ImportDetail extends BaseAPS { private Integer orderNumber; @Column(name="PROJECT_ID") - @ApiParam(value ="导入项目ID") - @FieldAnnotation(relation = "Project") + @ApiParam(value ="导入项目") + @FieldAnnotation(relation = "Project", property = false) private Long projectId; + @Lob + @Column(name="INNER_FILTER") + @ApiParam(value ="内部对象筛选") + private String innerFilter; + + @Lob + @Column(name="OUTTER_FILTER") + @ApiParam(value ="外部对象筛选") + private String outterFilter; + + @FieldAnnotation(property = false) + private transient ImportDataModel model; + public ImportProject getProject() { return BeanRelation.get(this, EImportDetail.Project); } @@ -65,4 +128,9 @@ public class ImportDetail extends BaseAPS { this.projectId = project != null ? project.getId() : 0l; BeanRelation.set(this, EImportDetail.Project, project); } + + @JsonBackReference + public List getFields() { + return BeanRelation.list(this, EImportDetail.Fields); + } } 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 new file mode 100644 index 0000000..cb0d6e4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; +import cn.estsh.i3plus.pojo.aps.holders.EImportField; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :数据导入明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_IMPORT_FIELD") +@Api("数据导入字段配置") +public class ImportField extends BaseAPS { + + private static final long serialVersionUID = 8848879008582197564L; + @Column(name="FIELD_NAME") + @ApiParam("字段名") + private String fieldName; + + @Column(name="LABEL_NAME") + @ApiParam("标签名称") + private String labelName; + + @Column(name="DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + /** + * 1-是，2-否 + */ + @Column(name="IS_REQUIRE") + @ApiParam(value = "是否必填", example = "0") + private Integer isRequire; + + @Column(name="MAX_LENGTH") + @ApiParam(value = "最大长度", example = "0") + @FieldAnnotation(defaultValue = "255") + private Integer maxLength; + + @Column(name="VALIDATOR") + @ApiParam("校验表达式") + private String validator; + + @Column(name="VALIDATOR_MESSAGE") + @ApiParam("校验表达式报错") + private String validatorMessage; + + @Column(name="RELATION_TABLE") + @ApiParam("关联表名") + private String relationTable; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + @Column(name="IMPORT_DETAIL_ID") + @ApiParam(value ="导入明细ID") + @FieldAnnotation(relation = "ImportDetail", notEmpty = true) + private Long importDetailId; + + public ImportDetail getImportDetail() { + return BeanRelation.get(this, EImportField.ImportDetail); + } + + public void setImportDetail(ImportDetail detail) { + 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/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java new file mode 100644 index 0000000..2b43199 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.aps.holders.EInsertedOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :插单管理 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-03-02 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_INSERTED_ORDER") +@Api("插单管理") +public class InsertedOrder extends BaseOrder { + private static final long serialVersionUID = -5036380772996107234L; + + @Column(name="ORDER_STATUS") + @ApiParam(value ="订单状态") + @FieldAnnotation(defaultValue = "UNCOMMIT") + private ApsEnumUtil.INSERTED_ORDER_STATUS orderStatus = ApsEnumUtil.INSERTED_ORDER_STATUS.UNCOMMIT; + + @Column(name="STAND_OPERATIONS") + @ApiParam("工序") + private String standOperations; + + @Column(name="PRODUCT_ROUTING_ID") + @ApiParam(value ="工艺路线") + @FieldAnnotation(property = false) + private Long productRoutingId; + + @Column(name="FINISH_COUNT") + @ApiParam(value ="完工数") + private Double finishCount; + + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; + + public ProductRouting getProductRouting() { + return BeanRelation.get(this, EInsertedOrder.ProductRouting); + } + + public void setProductRouting(ProductRouting routing) { + this.productRoutingId = routing != null ? routing.getId() : 0l; + BeanRelation.set(this, EInsertedOrder.ProductRouting, routing); + } + + @JsonIgnore + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } +} 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 new file mode 100644 index 0000000..2f8136f --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EInterMediateDetail; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :计算中间结果明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-27 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_INTER_MEDIATE_DETAIL") +@Api("计算中间结果") +public class InterMediateDetail extends BaseAPS { + private static final long serialVersionUID = -2588016171684238811L; + + @Column(name="RESULT_ID") + @ApiParam(value ="中间结果") + @FieldAnnotation(relation = "InterMediateResult") + private Long resultId; + + @Column(name="RULE") + @ApiParam(value ="评估规则") + private String rule; + + @Column(name="EVALUATE_VALUE") + @ApiParam(value ="评估值") + private Double evaluateValue; + + public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); } + + public void setResult(InterMediateResult result) { + this.resultId = result != null ? result.getId() : 0; + 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 new file mode 100644 index 0000000..8368fd4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EInterMediateResult; +import cn.estsh.i3plus.pojo.aps.holders.EWorkInput; +import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; +import com.fasterxml.jackson.annotation.JsonBackReference; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.List; + +/** + * @Description :计算中间结果 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-25 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_INTER_MEDIATE_RESULT") +@Api("计算中间结果") +public class InterMediateResult extends BaseAPS { + private static final long serialVersionUID = -1869359887027950540L; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(relation = "Work") + private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(relation = "Resource") + private Long resourceId; + + @Column(name="EVALUATE_VALUE") + @ApiParam(value ="评估值") + private Double evaluateValue; + + public Work getWork() { + return BeanRelation.get(this, EInterMediateResult.Work); + } + + public void setWork(Work work) { + 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; + BeanRelation.set(this, EInterMediateResult.Resource, resource); + } + + @JsonBackReference + public List getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 8fab6d1..2c0ea75 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -3,6 +3,9 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.aps.holders.EInventory; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -12,6 +15,8 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.Date; +import java.util.List; /** * @Description :库存 @@ -27,6 +32,7 @@ import javax.persistence.Table; @Api("库存") public class Inventory extends BaseOrder { private static final long serialVersionUID = 2378846162007550439L; + @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; @@ -45,8 +51,27 @@ public class Inventory extends BaseOrder { @FieldAnnotation(modify = false) private Double excessCount; + @Column(name="SINGLE_SUPPLY_COUNT", columnDefinition = "decimal(18,8)") + @ApiParam(value ="单次补充数量") + private Double singleSupplyCount; + + @Column(name="SAFE_COUNT", columnDefinition = "decimal(18,8)") + @ApiParam(value ="安全库存数量") + private Double safeCount; + + @Column(name="SUPPLY_INTERVAL") + @ApiParam(value ="补充间隔（天）") + private Integer supplyInterval; + + @Column(name="LAST_SUPPLY") + @ApiParam(value ="最后补充时间") + private Date lastSupply; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); } + + @JsonBackReference + public List getSafeStockOrders() { return BeanRelation.list(this, EInventory.SafeStockOrders); } } 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 a8a491e..626de94 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 @@ -29,6 +29,10 @@ public class MatCalcRule extends BaseRule { @ApiParam(value ="物料筛选") private String materialFilter; + @Column(name="ROUTING_FILTER") + @ApiParam(value ="工艺路线筛选") + private String routingFilter; + @Column(name="INPUT_FILTER") @ApiParam(value ="输入筛选") private String inputFilter; @@ -37,6 +41,14 @@ public class MatCalcRule extends BaseRule { @ApiParam(value ="输出筛选") private String outputFilter; + @Column(name="INPUT_MATCH") + @ApiParam(value ="输入匹配") + private String inputMatch; + + @Column(name="OUTPUT_MATCH") + @ApiParam(value ="输出匹配") + private String outputMatch; + @Column(name="DEL_AUTO") @ApiParam(value ="自动删除补充订单") @FieldAnnotation(defaultValue = "1") 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 0b1ec28..e00c22a 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 @@ -5,7 +5,9 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.holders.EMaterial; +import cn.estsh.i3plus.pojo.aps.holders.EResource; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; @@ -60,6 +62,11 @@ public class Material extends BaseAPS { @FieldAnnotation(defaultValue = "ONEBYONE") private ApsEnumUtil.REPLENISHMENT_TYPE replType; + @Column(name="GROUP_ID") + @ApiParam(value ="物料组") + @FieldAnnotation(relation = "Material") + private Long groupId; + @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -151,6 +158,23 @@ public class Material extends BaseAPS { @ApiParam(value ="标签颜色") private String labelColor; + @Column(name="WORK_SHOP_ID") + @ApiParam(value ="车间代码") + @FieldAnnotation(relation = "WorkShop") + private Long workShopId; + + public Material getGroup() { + return BeanRelation.get(this, EMaterial.Group); + } + + public void setGroup(Material material) { + this.groupId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EMaterial.Group, material); + } + + @JsonBackReference + public List getChilds() { return BeanRelation.list(this, EMaterial.Childs); } + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); @@ -205,4 +229,11 @@ public class Material extends BaseAPS { public List getProductOrders() { return BeanRelation.listByClass(this, ProductOrder.class, EMaterial.Orders); } + + public WorkShop getWorkShop() { return BeanRelation.get(this, EMaterial.WorkShop); } + + public void setWorkShop(WorkShop workShop) { + this.workShopId = workShop != null ? workShop.getId() : 0l; + BeanRelation.set(this, EMaterial.WorkShop, workShop); + } } 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 dcb7f0b..1e7ca3b 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 @@ -26,8 +26,9 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_MATERIAL_DELIVERY_PROMISE") -@Api("物料") +@Api("物料交期承诺") public class MaterialDeliveryPromise extends BaseBean { + private static final long serialVersionUID = 831759543772896829L; @Column(name="QTY") @ApiParam(value ="到货数量") private Double count; 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 779b527..d77217c 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 @@ -28,17 +28,17 @@ 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) + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true, mainkey = true) private String resCode; @Column(name="PREV_MATERIAL") - @ApiParam(value ="前物料") - @FieldAnnotation(notEmpty = true) + @ApiParam(value ="前物料编码") + @FieldAnnotation(notEmpty = true, mainkey = true) private String prevMaterial; @Column(name="POST_MATERIAL") - @ApiParam(value ="后物料") - @FieldAnnotation(notEmpty = true) + @ApiParam(value ="后物料编码") + @FieldAnnotation(notEmpty = true, mainkey = true) private String postMaterial; @Column(name="TIME") @@ -46,8 +46,8 @@ public class MaterialSetTime extends BaseAPS { @FieldAnnotation(notEmpty = true) private String time; - @Column(name="PRIORITY") - @ApiParam(value ="优先级") - @FieldAnnotation(defaultValue = "10") - private int priority; +// @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/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java new file mode 100644 index 0000000..d5533c2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EOrderFeedback; +import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :订单反馈 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-19 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_ORDER_FEEDBACK") +@Api("订单反馈") +public class OrderFeedback extends BaseAPS { + private static final long serialVersionUID = 7822380202121225936L; + + @Column(name="ORDER_ID") + @ApiParam(value ="顶层订单号") + @FieldAnnotation(relation = "Order", modify = false) + private Long orderId; + + @Column(name="DELIVER_RATE") + @ApiParam(value ="发货百分比") + private Double deliverRate; + + @Column(name="QUALIFIED_RATE") + @ApiParam(value ="成品合格百分比") + private Double qualifiedRate; + + @Column(name="INVENTORY_COUNT") + @ApiParam(value ="库存扣减数量") + private Double inventoryCount; + + @Column(name="LAST_OPERATION_COUNT") + @ApiParam(value ="硫化报工数量") + private Double lastOperationCount; + + @Column(name="UNQUALIFIED_COUNT") + @ApiParam(value ="不良数量") + private Double unqualifiedCount; + + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="成品合格数量") + private Double qualifiedCount; + + @Column(name="ADD_UNQUALIFIED_COUNT") + @ApiParam(value ="累加不良数量") + @FieldAnnotation(display = false) + private Double addUnqualifiedCount; + + @Column(name="ADD_QUALIFIED_COUNT") + @ApiParam(value ="累加合格数量") + @FieldAnnotation(display = false) + private Double addQualifiedCount; + + public BaseOrder getOrder() { + return BeanRelation.get(this, EOrderFeedback.Order); + } + + public void setOrder(BaseOrder order) { + 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/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 6fbd9d1..e5ade8e 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 @@ -37,6 +37,11 @@ public class ParentWork extends BaseAPS { @ApiParam(value ="数量") private Double count; + @Column(name="SERIAL_NUMBER") + @ApiParam(value ="拆分工作流水号") + @FieldAnnotation(property = false) + private Integer serialNumber = 0; + @Column(name="PRODUCT_ORDER_ID") @ApiParam(value ="订单") @FieldAnnotation(property = false) 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 8855d00..5ed25cd 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; 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.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,11 +29,24 @@ import javax.persistence.Table; public class PlanFeedback extends BaseAPS { private static final long serialVersionUID = 2520555825093741381L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(property = false) private Long workId; + @Column(name="STATUS") + @ApiParam(value ="状态") + private ApsEnumUtil.FEED_BACK_STATUS status; + + @Column(name="ACTUAL_COUNT") + @ApiParam(value ="实际完成数量") + private Double actualCount; + + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; + public Work getWork() { return BeanRelation.get(this, EPlanFeedback.Work); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java new file mode 100644 index 0000000..f9e9ffa --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :优先级 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-08 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_PRIORITY_TYPE") +@Api("优先级") +public class PriorityType extends BaseAPS { + private static final long serialVersionUID = 445577901076659576L; + + @Column(name="CODE") + @ApiParam(value ="标识") + @FieldAnnotation(mainkey = true, popSearch = true) + private String code; + + @Column(name="VALUE") + @ApiParam(value ="值") + @FieldAnnotation(notEmpty = true, popSearch = true) + private Integer value; +} 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 dee531b..14bb66a 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 @@ -95,14 +95,23 @@ public class ProductOrder extends BaseOrder { @Column(name="AUTO_SUPPLY") @ApiParam(value ="物料计算时自动补充") - @FieldAnnotation(defaultValue = "true") + @FieldAnnotation(defaultValue = "false", display = false) private Boolean autoSupply; + @Column(name="FINISH_COUNT") + @ApiParam(value ="完工数") + private Double finishCount; + @Column(name="PRODUCT_ROUTING_ID") @ApiParam(value ="工艺路线") @FieldAnnotation(property = false) private Long productRoutingId; + @Column(name="SRC_INSERTED_ORDER") + @ApiParam(value ="需求单为插单") + @FieldAnnotation(property = false) + private Long srcInsertedOrder; + public ProductRouting getProductRouting() { return BeanRelation.get(this, EProductOrder.ProductRouting); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index d37f81a..e6af6a5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -1,9 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.CalendarTimeAnntation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EResCalendar; +import cn.estsh.i3plus.pojo.aps.validator.ImportGroup; +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 com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -13,6 +17,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.util.List; @@ -30,6 +35,7 @@ import java.util.List; @Api("日历") public class ResCalendar extends BaseAPS { private static final long serialVersionUID = 8338930205816433211L; + @Lob @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) @@ -42,6 +48,7 @@ public class ResCalendar extends BaseAPS { @Column(name="DATES") @ApiParam(value ="时间") + @CalendarTimeAnntation(groups = {InsertGroup.class, UpdateGroup.class, ImportGroup.class}) private String dates; @Column(name="SHIFT_CODES") 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 8f2d668..c54dc54 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 @@ -60,6 +60,11 @@ public class Resource extends BaseAPS { @FieldAnnotation(defaultValue = "1.0", notEmpty = true) private Double efficiency; + @Column(name="WORK_SHOP_ID") + @ApiParam(value ="车间代码") + @FieldAnnotation(relation = "WorkShop") + private Long workShopId; + @Column(name="PREV_BUFFER") @ApiParam(value ="前缓冲时间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -117,21 +122,18 @@ public class Resource extends BaseAPS { @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer timeTailRound; - @Column(name="LOCK_TYPE") - @ApiParam(value ="锁定类型") - @FieldAnnotation(defaultValue = "NONE") - private ApsEnumUtil.RESOURCE_LOCK_TYPE lockType; - - @Column(name="LOCK_TIME") - @ApiParam(value ="锁定时间长度") - @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private String lockTime; - @ApiParam(value ="是否存在任务冲突") @FieldAnnotation(property = false) @Transient private boolean hasConflict; + public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); } + + public void setWorkShop(WorkShop workShop) { + this.workShopId = workShop != null ? workShop.getId() : 0l; + BeanRelation.set(this, EResource.WorkShop, workShop); + } + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index 31fb91b..282ae40 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -33,7 +33,7 @@ public class RuleDetail extends BaseAPS { private static final long serialVersionUID = -6433950357039396107L; @Column(name="TYPE") @ApiParam(value ="规则类型") - private ApsEnumUtil.RULE_TYPE type; + private String type; @Column(name="ORDER_NUMBER") @ApiParam(value ="序号") 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 new file mode 100644 index 0000000..0e9fa45 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.aps.holders.ESafeStockOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :安全库存订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-02-23 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_SAFE_STOCK_ORDER") +@Api("安全库存订单") +public class SafeStockOrder extends BaseOrder { + + private static final long serialVersionUID = 5944067344390531794L; + + @Column(name="ORDER_STATUS") + @ApiParam(value ="订单状态") + @FieldAnnotation(defaultValue = "UNCOMMIT") + private ApsEnumUtil.SAFE_STOCK_ORDER_STATUS orderStatus = ApsEnumUtil.SAFE_STOCK_ORDER_STATUS.UNCOMMIT; + + @Column(name="INVENTORY_ID") + @ApiParam(value ="库存") + @FieldAnnotation(relation = "Inventory", notEmpty = true) + private Long inventoryId; + + @Column(name="FINISH_COUNT") + @ApiParam(value ="完工数") + private Double finishCount; + + @JsonIgnore + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } + + public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); } + + public void setInventory(Inventory inventory) { + this.inventoryId = inventory != null ? inventory.getId() : 0; + BeanRelation.set(this, ESafeStockOrder.Inventory, inventory); + } +} 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 bd8679a..82607d8 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 @@ -56,6 +56,19 @@ public class SalesOrder extends BaseOrder { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String allowDelayTime; + @Column(name="ORDER_STATUS") + @ApiParam(value ="订单状态") + @FieldAnnotation(defaultValue = "WAITING") + private ApsEnumUtil.SALES_ORDER_STATUS orderStatus; + + @Column(name="DELIVER_RATE") + @ApiParam(value ="发货百分比") + private Double deliverRate; + + @Column(name="FINISH_COUNT") + @ApiParam(value ="完工数") + private Double finishCount; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); 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 6d0f976..bf0944d 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 @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.Date; /** * @Description :流水号，补充生产订单和采购订单时自动生成编码 @@ -27,7 +28,31 @@ import javax.persistence.Table; public class SerialNumber extends BaseAPS { private static final long serialVersionUID = 312483211086701109L; - @Column(name="NUMBER") - @ApiParam(value ="流水号") - private Integer number; + @Column(name="S_NUMBER") + @ApiParam(value ="销售订单流水号") + private Integer sNumber = 0; + + @Column(name="M_NUMBER") + @ApiParam(value ="生产订单流水号") + private Integer mNumber = 0; + + @Column(name="P_NUMBER") + @ApiParam(value ="采购订单流水号") + private Integer pNumber = 0; + + @Column(name="W_NUMBER") + @ApiParam(value ="库存订单流水号") + private Integer wNumber = 0; + + @Column(name="Q_NUMBER") + @ApiParam(value ="安全库存订单流水号") + private Integer qNumber = 0; + + @Column(name="H_NUMBER") + @ApiParam(value ="插单流水号") + private Integer hNumber = 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/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 9fab094..be15e07 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 @@ -3,6 +3,8 @@ 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.EStandOperation; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; @@ -66,8 +68,19 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") private ApsEnumUtil.RES_COMB_TIME_TYPE combType; - @Column(name="LOCK_TYPE") - @ApiParam(value ="锁定组合方式") - @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") - private ApsEnumUtil.RES_COMB_LOCK_TYPE lockType; + @Column(name="WORK_SHOP_ID") + @ApiParam(value ="车间代码") + @FieldAnnotation(relation = "WorkShop") + private Long workShopId; + + @Column(name="TYPE") + @ApiParam(value ="工序类型") + private ApsEnumUtil.SANLUX_OPERATION_TYPE type = ApsEnumUtil.SANLUX_OPERATION_TYPE.NORMAL; + + public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); } + + public void setWorkShop(WorkShop workShop) { + 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/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 669df55..a754400 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -45,4 +45,12 @@ public class SysParam extends BaseAPS { @ApiParam(value ="规则组id") @FieldAnnotation(display = false) private Long ruleGroupId; + + @Column(name="INVENTORY_RATE") + @ApiParam(value ="库存误差百分比") + private Double inventoryRate; + + @Column(name="RECORD_RESULT") + @ApiParam(value ="记录资源评估结果") + private Boolean recordResult; } 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 619bbf8..c7693dd 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 @@ -5,6 +5,7 @@ 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.EWork; +import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; @@ -47,7 +48,7 @@ public class Work extends BaseAPS { @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") - @FieldAnnotation(property = false) + @FieldAnnotation(display = false) private ApsEnumUtil.WORK_TYPE workType; @Column(name="count", columnDefinition = "decimal(18,8)") @@ -159,6 +160,15 @@ public class Work extends BaseAPS { @FieldAnnotation(property = false) private Long mainPlanId; + @Column(name="ORIGIN_WORK_ID") + @ApiParam(value ="动态拆分工作ID") + private Long originWorkId; + + // 排程时，找插入位置的评估值 + private transient double evaluateValue = 0; + + private transient boolean hasOptimized = false; + public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } @@ -212,10 +222,11 @@ public class Work extends BaseAPS { } @JsonBackReference - public List getPlanFeedbacks() { - return BeanRelation.list(this, EWork.PlanFeedbacks); + public PlanFeedback getPlanFeedback() { + return BeanRelation.get(this, EWork.PlanFeedback); } + @JsonBackReference public WorkPlan getMainPlan() { return BeanRelation.get(this, EWork.MainPlan); } public void setMainPlan(WorkPlan plan) { @@ -234,4 +245,23 @@ public class Work extends BaseAPS { this.specifyResourceId = resource != null ? resource.getId() : 0; BeanRelation.set(this, EWork.SpecifyResource, resource); } + + public double getWorkCount() { + if (!APSDoubleTool.isZero(getSpecifyCount())) { + return getSpecifyCount(); + } + return getCount(); + } + + @JsonBackReference + public List getDynSplitWorks() { return BeanRelation.list(this, EWork.DynSplitWorks); } + + public Work getOriginWork() { + return BeanRelation.get(this, EWork.OriginWork); + } + + public void setOriginWork(Work work) { + this.originWorkId = work != null ? work.getId() : 0; + BeanRelation.set(this, EWork.OriginWork, work); + } } 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 53c1be7..decabfa 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 @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,8 +17,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; -import java.util.List; /** * @Description :工作计划 @@ -76,6 +77,8 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_END") @ApiParam(value ="生产结束时间") @FieldAnnotation(modify = false) + @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd", + "PostPlan.produceEnd"}, method = "calcReverse") private Date produceEnd; @Column(name="PRODUCE_TIME") @@ -98,27 +101,6 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer postSetTime; - @Column(name="LOCK_BEGIN") - @ApiParam(value ="锁定开始时间") - @FieldAnnotation(modify = false) - @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") - private Date lockBegin; - - @Column(name="LOCK_END") - @ApiParam(value ="锁定结束时间") - @FieldAnnotation(modify = false) - private Date lockEnd; - - @Column(name="LOCK_TIME") - @ApiParam(value ="锁定时间") - @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private Integer lockTime; - - @Column(name="FORCE_POST_SET_ZERO") - @ApiParam(value ="是否将后设置时间强制设置成0") - @FieldAnnotation(property = false) - private Boolean forcePostSetZero; - @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") @FieldAnnotation(property = false) @@ -129,6 +111,18 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(property = false) private Long furnacePlanId; + @Column(name="PRINTED") + @ApiParam(value ="已打印") + private Boolean printed = false; + + @Column(name="PRINT_TIME") + @ApiParam(value ="打印时间") + private Date printTime; + + @Transient + @FieldAnnotation(property = false) + private boolean hasCominbed = false; + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { @@ -157,6 +151,7 @@ public class WorkPlan extends BaseAPS { BeanRelation.set(this, EWorkPlan.FurnacePlan, plan); } + @JsonBackReference public Work getMainWork() { return BeanRelation.get(this, EWorkPlan.MainWork); } 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 727c9a2..7c845e8 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 @@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.validation.constraints.Min; /** * @Description :工作资源 @@ -89,6 +90,20 @@ public class WorkResource extends BaseAPS { @FieldAnnotation(property = false) private Long operResourceId; + @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") + @ApiParam(value ="容量限制") + @Min(0) + private Double capacity; + + @Column(name="MIN_PRODUCT_BATCH") + @ApiParam(value ="最小加工批量") + private Integer minProductBatch; + + @Column(name="RES_CAPACITY_ID") + @ApiParam(value ="设备能力id") + @FieldAnnotation(property = false) + private Long resCapacityId = 0l; + public Work getWork() { return BeanRelation.get(this, EWorkResource.Work); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java new file mode 100644 index 0000000..273641d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :车间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-03-22 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_WORK_SHOP") +@Api("车间") +public class WorkShop extends BaseAPS { + private static final long serialVersionUID = 5627016086816721284L; + + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true, notEmpty = true) + private String name; + + +} 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 9c98bdb..367390d 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 @@ -37,6 +37,9 @@ public abstract class BaseAPS extends BaseBean { @Transient private String key; + @FieldAnnotation(property = false) + private transient Long updateId = 0l; + public Object getCustomField(String code) { return customFields.get(code); } @@ -44,4 +47,40 @@ public abstract class BaseAPS extends BaseBean { public void setCustomField(String code, Object value) { customFields.put(code, value); } + + public String getCustomString(String code) { + Object value = customFields.get(code); + if (value == null) { + return ""; + } + return value.toString(); + } + + public Integer getCustomInteger(String code) { + Object value = customFields.get(code); + if (value == null) { + return null; + } + + if (value.getClass() == String.class) { + return Integer.valueOf((String) value); + } else if(value.getClass() == Integer.class) { + return (Integer)value; + } + return null; + } + + public Boolean getCustomBoolean(String code) { + Object value = customFields.get(code); + if (value == null) { + return null; + } + + if (value.getClass() == Boolean.class) { + return (Boolean) value; + } else if(value.getClass() == Integer.class) { + return (Integer)value == 1; + } + return null; + } } 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 e0786d8..cad44d4 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 @@ -271,6 +271,8 @@ public class BeanInfo { type = ApsEnumUtil.FIELD_TYPE.ENUM; } else if (BaseBean.class.isAssignableFrom(cls)) { type = ApsEnumUtil.FIELD_TYPE.OBJECT; + } else if (List.class.isAssignableFrom(cls)) { + type = ApsEnumUtil.FIELD_TYPE.LIST; } return type; } 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 a440ae8..74dfeaf 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 @@ -48,7 +48,7 @@ public class BeanRelation { return result; } for (Enum holder : beanInfo.getAllHolders()) { - result.put(holder, new LinkedList<>()); + result.put(holder, new ArrayList<>()); } return result; } @@ -313,6 +313,24 @@ public class BeanRelation { } /** + * 移除对象所有关系 + * + * @param bean + */ + public static void remove(BaseBean bean) { + if (bean == null) { + return; + } + BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); + if (beanInfo != null) { + List> holders = beanInfo.getAllHolders(); + for (Enum holder :holders) { + remove(bean, holder); + } + } + } + + /** * 移除关联 * * @param bean diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index 28e4b51..d6720fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -5,4 +5,5 @@ public enum EBaseOrder { Material, PrevRelations, PostRelations, + Priority, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java index f78c6ac..50772bb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EImportDetail { - Project + Project, + Fields } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java new file mode 100644 index 0000000..eeff1ef --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EImportField { + ImportDetail +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java new file mode 100644 index 0000000..c8a6248 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EInsertedOrder { + ProductRouting +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java new file mode 100644 index 0000000..0683e8f --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EInterMediateDetail { + Result +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java new file mode 100644 index 0000000..0465f7d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EInterMediateResult { + Work, + Resource, + Details +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java new file mode 100644 index 0000000..9c0719a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EInventory { + SafeStockOrders +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index 65cc748..16f5f77 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -1,11 +1,14 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EMaterial { + Group, + Childs, ProductRoutings, OperInputs, OperOutputs, WorkInputs, WorkOutputs, WorkRelations, - Orders + Orders, + WorkShop } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java new file mode 100644 index 0000000..5719df5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EOrderFeedback { + Order +} 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 c72c61e..ded90db 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResource { + WorkShop, WorkPlans } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java new file mode 100644 index 0000000..bec040c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum ESafeStockOrder { + Inventory +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java index 08ae7b4..6e9ac1b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java @@ -1,4 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EStandOperation { + WorkShop } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index c9befe8..70d265e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -9,8 +9,10 @@ public enum EWork { PrevRelations, // 前关联 PostRelations, // 后关联 Operation, // 工序 - PlanFeedbacks, // 工作计划反馈 + PlanFeedback, // 工作计划反馈 MainPlan, // 关联的为主资源的计划 WorkPlans, // 关联的工作计划 SpecifyResource, // 指定资源 + DynSplitWorks, // 动态拆分后的工作 + OriginWork, // 动态拆分前的工作 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java new file mode 100644 index 0000000..9774f5e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 表格导出查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-02-25 + * @Modify: + **/ +@Data +@Api("表格导出查询参数") +public class ExportModelRequest { + private String filter; + private List sorts; + private String tableName; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportDataModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportDataModel.java new file mode 100644 index 0000000..6237d5b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportDataModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 进度条显示信息。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-01 + * @Modify: + **/ +@Data +public class ImportDataModel { + @ApiParam(value ="当前执行进度") + private Integer curProcess = 0; + + @ApiParam(value ="总行数") + private Integer totalSize = 0; + + @ApiParam(value ="进度消息") + private String processMsg = ""; + + private Boolean finish = false; + + @ApiParam(value ="异常消息") + private String exception = ""; + + private ImportErrorInfo errorInfo; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java new file mode 100644 index 0000000..c81550d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : 导入校验错误信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-02-25 + * @Modify: + **/ +@Data +@Api("导入校验错误信息") +public class ImportErrorInfo { + private List headers = new ArrayList<>(); + private List> errorData = new ArrayList<>(100); + + public boolean hasErrorData() { + return !errorData.isEmpty(); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java new file mode 100644 index 0000000..eb35e2c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan; +import cn.estsh.i3plus.pojo.aps.bean.Resource; +import cn.estsh.i3plus.pojo.aps.bean.WorkPlan; +import lombok.Data; + +/** + * @Description : 计划记录 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ +@Data +public class PlanRecord { + /** + * 需要插入的工作计划 + */ + private WorkPlan plan; + /** + * 插入到目标资源 + */ + private Resource resource; + /** + * 插入到目标工作计划前面 + */ + private WorkPlan postPlan; + + /** + * 插入到指定炉资源上 + */ + private FurnacePlan furnacePlan; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java index 7116296..788b585 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java @@ -28,4 +28,5 @@ public class ReportPager extends APSPager { private Date end; // 统计结束时间 private ApsEnumUtil.MATERIAL_REPORT_TYPE type; private ApsEnumUtil.REPORT_TIME_SPAN span; // 统计时间间隔 + private String shiftCode; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java new file mode 100644 index 0000000..eb94010 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.Work; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : 工作排程记录 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ +@Data +public class WorkRecord { + private Work work; + private Work splitWork; + private PlanRecord mainPlan; + private List assPlans = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java new file mode 100644 index 0000000..fe72851 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.HeuristicOptimize; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface HeuristicOptimizeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IOrderFeedbackRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IOrderFeedbackRepository.java new file mode 100644 index 0000000..9382b9b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IOrderFeedbackRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.OrderFeedback; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface IOrderFeedbackRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java new file mode 100644 index 0000000..395975c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ImportField; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ImportFieldRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InsertedOrderRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InsertedOrderRepository.java new file mode 100644 index 0000000..f68eb71 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InsertedOrderRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.InsertedOrder; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface InsertedOrderRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java new file mode 100644 index 0000000..4fa95d3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.PriorityType; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface PriorityTypeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java new file mode 100644 index 0000000..ff0c5ee --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.SafeStockOrder; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface SafeStockOrderRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkShopRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkShopRepository.java new file mode 100644 index 0000000..4c8b98d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkShopRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.WorkShop; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface WorkShopRepository extends CrudRepository { +} 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 new file mode 100644 index 0000000..6c4e2ba --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.tool; + +public class APSDoubleTool { + public static boolean isZero(Double value) { + return (value == null) || (value > -0.000001 && value < 0.000001); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java new file mode 100644 index 0000000..a7bcaf2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.aps.validator; + +import cn.estsh.i3plus.pojo.aps.annotation.CalendarTimeAnntation; +import cn.estsh.i3plus.pojo.aps.model.TimeBlock; +import cn.estsh.i3plus.pojo.base.util.StringUtil; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; +import java.text.ParseException; +import java.text.SimpleDateFormat; + +public class CalendarTimeValidator implements ConstraintValidator { + SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd"); + + @Override + public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) { + for (String strTime : s.split(",")) { + if (StringUtil.isEmpty(strTime)) { + continue; + } + + String[] times = strTime.split("~"); + if (times.length == 1) { + try { + timeFormat.parse(times[0]); + } catch (ParseException e) { + return false; + } + } else if (times.length == 2) { + try { + TimeBlock timeBlock = new TimeBlock(); + timeBlock.setBegin(timeFormat.parse(times[0])); + timeBlock.setEnd(timeFormat.parse(times[1])); + } catch (ParseException e) { + return false; + } + } else { + return false; + } + } + return true; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ImportGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ImportGroup.java new file mode 100644 index 0000000..a47cf56 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ImportGroup.java @@ -0,0 +1,4 @@ +package cn.estsh.i3plus.pojo.aps.validator; + +public interface ImportGroup { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java new file mode 100644 index 0000000..c5bcd46 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.aps.validator; + +import cn.estsh.i3plus.pojo.aps.annotation.ShiftTimeAnnotation; +import cn.estsh.i3plus.pojo.aps.model.TimeBlock; +import cn.estsh.i3plus.pojo.base.util.StringUtil; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; +import java.text.ParseException; +import java.text.SimpleDateFormat; + +public class ShiftTimeValidator implements ConstraintValidator { + SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm"); + + @Override + public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) { + if (StringUtil.isEmpty(s)) { + return false; + } + for (String strTime : s.split(",")) { + String[] times = strTime.split("-"); + if (times.length != 2) { + return false; + } + + try { + TimeBlock timeBlock = new TimeBlock(); + timeBlock.setBegin(timeFormat.parse(times[0])); + timeBlock.setEnd(timeFormat.parse(times[1])); + } catch (ParseException e) { + return false; + } + } + return true; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml index e1e512a..75f82e5 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml @@ -8,4 +8,6 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml new file mode 100644 index 0000000..56372fd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/InsertedOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/InsertedOrder.xml new file mode 100644 index 0000000..19e8ca9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/InsertedOrder.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml new file mode 100644 index 0000000..6b7a99d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Inventory.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Inventory.xml new file mode 100644 index 0000000..4fcb3cc --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Inventory.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index 51da8ba..6ce3798 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -1,5 +1,9 @@ - - + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OrderFeedback.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OrderFeedback.xml new file mode 100644 index 0000000..1ff56e1 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OrderFeedback.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml deleted file mode 100644 index c0988ef..0000000 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file 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 c2123bc..889e6c8 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -1,5 +1,7 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml index ead1a31..538cede 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml @@ -1,3 +1,5 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 5c26770..da892ce 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -16,8 +16,10 @@ - + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..b2dbbd1 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -31,10 +31,6 @@ fastjson - com.alibaba - fastjson - - com.thoughtworks.xstream xstream diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index d537b55..518f691 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -10,8 +10,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.GenericGenerator; -import org.springframework.data.mongodb.core.index.IndexDirection; -import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; @@ -25,6 +23,7 @@ import java.io.Serializable; **/ @Data @MappedSuperclass +@EntityListeners(BaseBeanListener.class) //对象状态监听 //@Entity //以子类table为准 //@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) @@ -64,18 +63,18 @@ public abstract class BaseBean implements Serializable { this.id = id; } - @Column(name="ORGANIZE_CODE", nullable = false) + @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") // @AnnoOutputColumn(hidden = true) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) public String organizeCode; - @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) + @Column(name="IS_VALID", columnDefinition = "int default 1") @ApiParam(value = "有效性",example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; - @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) + @Column(name="IS_DELETED", columnDefinition = "int default 2") @ApiParam(value = "是否已删除",example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 @@ -88,7 +87,6 @@ public abstract class BaseBean implements Serializable { searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") public String createUser; - @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) @@ -142,13 +140,18 @@ public abstract class BaseBean implements Serializable { public transient Integer ascOrDesc = 1; public int getIsValidVal() { - return this.isValid == null ? 0 : this.isValid.intValue(); + return this.isValid == null ? 0 : this.isValid; } public int getIsDeletedVal() { - return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + return this.isDeleted == null ? 0 : this.isDeleted; } +// @Transient +// @ApiParam(value = "多列排序") +// @AnnoOutputColumn(hidden = true) +// public LinkedHashMap sortParamMap; + //排序方式 public String orderBy(){ String result = ""; @@ -162,4 +165,5 @@ public abstract class BaseBean implements Serializable { } return result; } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBeanListener.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBeanListener.java new file mode 100644 index 0000000..95889dc --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBeanListener.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import org.apache.commons.lang3.StringUtils; + +import javax.persistence.PrePersist; +import javax.persistence.PreUpdate; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @Description : 实体对象监听 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2020-08-24 22:28 + * @Modify: + **/ +public class BaseBeanListener { + + //实体保存前 + @PrePersist + public void prePersist(BaseBean baseBean) { + // 创建用户 + if (StringUtils.isBlank(baseBean.getCreateUser())) { + if(StringUtils.isNotBlank(BaseThreadLocal.getThreadEmpName())) { + baseBean.setCreateUser(BaseThreadLocal.getThreadEmpName()); + baseBean.setModifyUser(BaseThreadLocal.getThreadEmpName()); + } + } + //组织代码 + if (StringUtils.isBlank(baseBean.getOrganizeCode())) { + if(StringUtils.isNotBlank(BaseThreadLocal.getThreadOrganizeCode())) { + baseBean.setOrganizeCode(BaseThreadLocal.getThreadOrganizeCode()); + } + } + // 创建时间 + if (StringUtils.isBlank(baseBean.getCreateDatetime())){ + baseBean.setCreateDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date())); + baseBean.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date())); + } + //有效性 + if(baseBean.getIsValid() == null || + (baseBean.getIsValid() != CommonEnumUtil.IS_VAILD.VAILD.getValue() && baseBean.getIsValid() != CommonEnumUtil.IS_VAILD.INVAILD.getValue())){ + baseBean.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue()); //有效 + } + //是否删除 + if(baseBean.getIsDeleted() == null || + (baseBean.getIsDeleted() != CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && baseBean.getIsDeleted() != CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue())){ + baseBean.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); //未删除 + } + } + + //实体对象保存之后 + /*@PostPersist + public void afterPersist(){ + }*/ + + //实体对象修改之前 + @PreUpdate + public void preUpdate(BaseBean baseBean) { + // 修改用户 + if (StringUtils.isBlank(baseBean.getModifyUser())) { + if(StringUtils.isNotBlank(BaseThreadLocal.getThreadEmpName())) { + baseBean.setModifyUser(BaseThreadLocal.getThreadEmpName()); + } + } + + // 修改时间 + if (StringUtils.isEmpty(baseBean.getModifyDatetime())){ + baseBean.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date())); + } + + //组织代码 + if (StringUtils.isBlank(baseBean.getOrganizeCode())) { + if(StringUtils.isNotBlank(BaseThreadLocal.getThreadOrganizeCode())) { + baseBean.setOrganizeCode(BaseThreadLocal.getThreadOrganizeCode()); + } + } + //有效性 + if(baseBean.getIsValid() == null || + (baseBean.getIsValid() != CommonEnumUtil.IS_VAILD.VAILD.getValue() && baseBean.getIsValid() != CommonEnumUtil.IS_VAILD.INVAILD.getValue())){ + baseBean.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue()); //有效 + } + //是否删除 + if(baseBean.getIsDeleted() == null || + (baseBean.getIsDeleted() != CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && baseBean.getIsDeleted() != CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue())){ + baseBean.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); //未删除 + } + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index 83c5994..b234ae3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.Map; @@ -16,37 +16,37 @@ import java.util.Map; **/ public class BaseResultBean { - @ApiParam("是否成功") + @ApiModelProperty("是否成功") public boolean success; - @ApiParam("信息代码-国际化") + @ApiModelProperty("信息代码-国际化") public String code; - @ApiParam("操作消息") + @ApiModelProperty("操作消息") public String msg; - @ApiParam("错误消息") + @ApiModelProperty("错误消息") public String errorMsg; - @ApiParam("http路径") + @ApiModelProperty("http路径") public String url; - @ApiParam("List结果集") + @ApiModelProperty("List结果集") public List resultList; - @ApiParam("单个结果") + @ApiModelProperty("单个结果") public Obj resultObject; - @ApiParam("翻页和结果集") + @ApiModelProperty("翻页和结果集") public ListPager listPager; - @ApiParam("Map结果集") + @ApiModelProperty("Map结果集") public Map resultMap; - @ApiParam("翻页操作") + @ApiModelProperty("翻页操作") public Pager pager; - @ApiParam("总记录数") + @ApiModelProperty("总记录数") public int totalCount; public boolean isSuccess() { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java new file mode 100644 index 0000000..55c6e7a --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java @@ -0,0 +1,158 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; + +/** + * @Description : 本地线程，用于保存用户临时数据（按线程生命周期保存） + * 需要在线程结束的地方调用removeThreadLocal（），防止内存泄漏 + * @Reference : 生命周期：一次controller请求 + * @Author : alwaysfrin + * @CreateDate : 2020-08-24 20:49 + * @Modify: + **/ +public class BaseThreadLocal { + public static final Logger LOGGER = LoggerFactory.getLogger(BaseThreadLocal.class); + + /*private static final ThreadLocal> dataThredLocal = new ThreadLocal(){ + @Override + protected HashMap initialValue() { + //每个线程初始化map + return new HashMap(); + } + };*/ + private static final ThreadLocal> DATA_THREAD_LOCAL = ThreadLocal.withInitial(() -> new HashMap<>()); + + public static Object getData(String key) { + if (DATA_THREAD_LOCAL.get() != null) { + return DATA_THREAD_LOCAL.get().get(key); + } else { + return null; + } + } + + public static String getDataStr(String key) { + Object data = getData(key); + if (data != null) { + return data.toString(); + } else { + return null; + } + } + + public static int getDataInt(String key) { + Object data = getData(key); + if (data != null) { + return Integer.parseInt(data.toString()); + } else { + return 0; + } + } + + public static long getDataLong(String key) { + Object data = getData(key); + if (data != null) { + return Long.parseLong(data.toString()); + } else { + return 0L; + } + } + + public static double getDataDouble(String key) { + Object data = getData(key); + if (data != null) { + return Double.parseDouble(data.toString()); + } else { + return 0.0; + } + } + + public static void setData(String name, Object value) { + //不需要主数据源开始，则自动切换 + DATA_THREAD_LOCAL.get().put(name, value); + } + + /** + * 手动再次清除线程变量 + * 需要在方法后调用，或者通过ascept拦截后进行清空 + */ + public static void removeThreadLocal() { + if (DATA_THREAD_LOCAL != null) { + if (DATA_THREAD_LOCAL.get() != null) { + //清空数据 + DATA_THREAD_LOCAL.get().clear(); + } + //移除当前线程信息 + DATA_THREAD_LOCAL.remove(); + } + } + + public static String getInfo() { + Thread thread = Thread.currentThread(); + return "thead-id:" + thread.getId() + ",thread:" + thread; + } + + public static void printDetail() { + LOGGER.info("========本地线程临时数据======="); + LOGGER.info("数据数量：{}", DATA_THREAD_LOCAL.get().size()); + for (String key : DATA_THREAD_LOCAL.get().keySet()) { + LOGGER.info("key:{},value:{}", key, DATA_THREAD_LOCAL.get().get(key)); + } + } + + /********* 用户信息 **********/ + public static final String INIT_INFO = "INIT_INFO"; //初始化数据 + public static final String EMP_NAME = "USER_NAME"; //用户名 + public static final String ORGANIZE_CODE = "ORGANIZE_CODE"; //组织代码 + public static final String LANGUAGE_CODE = "LANGUAGE_CODE"; //语言代码 + /** + * 单点登录标志 + */ + public static final String OSS_LOGIN = "OSS_LOGIN"; + + public static boolean isInit() { + Object data = getData(INIT_INFO); + if (data != null) { + return Boolean.parseBoolean(data.toString()); + } else { + return false; + } + } + + //初始化用户数据 + public static void initSessionUserThreadLocal(String empName, String organizeCode, String languageCode) { + setData(BaseThreadLocal.EMP_NAME, empName); + setData(BaseThreadLocal.ORGANIZE_CODE, organizeCode); + setData(BaseThreadLocal.LANGUAGE_CODE, languageCode); + setData(BaseThreadLocal.INIT_INFO, true); + } + + //获取线程中的人员姓名 + public static String getThreadEmpName() { + String empName = getDataStr(EMP_NAME); + if (empName == null) { + empName = "系统"; + } + return empName; + } + + //获取线程中的组织代码 + public static String getThreadOrganizeCode() { + String organizeCode = getDataStr(ORGANIZE_CODE); + if (organizeCode == null) { + organizeCode = "-1"; + } + return organizeCode; + } + + //获取线程中的语言代码 + public static String getThreadLanguageCode() { + String organizeCode = getDataStr(LANGUAGE_CODE); + if (organizeCode == null) { + organizeCode = "CN/zh"; + } + return organizeCode; + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 0a90b00..ffa8853 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -114,7 +114,7 @@ public class Pager { } public int getCurrentPage() { - return currentPage; + return currentPage < 1 ? 1 : currentPage; } public void setCurrentPage(int currentPage) { @@ -137,10 +137,10 @@ public class Pager { public int getStartRow() { if(pageSize > 0){ - if(currentPage >= 1){ - return currentPage * pageSize - pageSize; - }else { - return 0; + if (currentPage >= 1) { + startRow = currentPage * pageSize - pageSize; + } else { + startRow = 0; } } return startRow; @@ -159,13 +159,6 @@ public class Pager { } public int getEndRow() { - if(pageSize > 0){ - if(currentPage > 1){ - return currentPage * pageSize; - }else { - return pageSize; - } - } return endRow; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 54dacc8..80a2fb7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -80,4 +80,30 @@ public class PagerHelper { Pager newPager = getPager(oldPager.getPageSize(), oldPager.getCurrentPage(), rowCount); return newPager; } + + public static void refreshPager(Pager pager,int rowCount){ + pager.setPageSize(pager.getPageSize() == 0 ? 10 : pager.getPageSize()); + pager.setTotalRows(rowCount); + + int totalPages = rowCount / pager.getPageSize(); + int mod = rowCount % pager.getPageSize(); + if (mod > 0) { + totalPages++; + } + pager.setTotalPages(totalPages); + if(pager.getCurrentPage() > totalPages) { + pager.setCurrentPage(totalPages); + } + + int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize(); + pager.setStartRow(startRow); + + int endRow; + if (startRow + pager.getPageSize() <= rowCount) { + endRow = startRow + pager.getPageSize() - 1; + } else { + endRow = rowCount; + } + pager.setEndRow(endRow); + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 91b8cd0..7488292 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 8775387..5e86d59 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -80,16 +80,18 @@ public class AndonEnumUtil { /** - * 状态点界面编号 + * 状态点界面编号--此部分枚举后续要创建一个表存储。 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ROUTE_STATUS_INTERFACE_NO { + DEFAULT_ALARM_CALL("DEFAULT_ALARM_CALL", "默认呼叫无界面"), EQUMENT_ALARM_CALL("EQUMENT_ALARM_CALL", "设备呼叫弹框界面"), QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"), PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"), ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"), - OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"), + OTHER_ALARM_CALL("OTHER_ALARM_CALL", "工装呼叫弹框界面"), FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"), + MODULE_ALARM_CALL("MODULE_ALARM_CALL", "模具呼叫弹框界面"), ALARM_SIGN("ALARM_SIGN", "响应弹框界面"), ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"), ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面"); @@ -457,7 +459,8 @@ public class AndonEnumUtil { ALARM_DETAIL("{H}","alarmDetailCode","安灯子类型"), ALARM_DETAIL_NAME("{L}","alarmDetailNameRdd","安灯子类型名称"), AC_CODE("{J}","acCode","事件描述代码"), - AC_NAME("{K}","acNameRdd","事件描述名称"); + AC_NAME("{K}","acNameRdd","事件描述名称"), + MEMO("{M}","MEMO","备注"); private String value; private String code; @@ -902,6 +905,7 @@ public class AndonEnumUtil { /** * 按灯业务状态 * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80 + * 20201027 增加安灯状态 90 =优先级, 10 =故障字符串 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ @@ -912,7 +916,9 @@ public class AndonEnumUtil { DETAIL_TYPE("50", "安灯子类型"), AC_CODE("60", "原因代码"), PROD_INFO("70", "产品信息"), - LINE_INFO("80", "产量信息"); + LINE_INFO("80", "产量信息"), + PRIORITY_LEVEL("90", "优先级"), + FAULT_STR("100", "故障字符串"); private String value; private String description; @@ -1061,7 +1067,8 @@ public class AndonEnumUtil { public enum ALARM_PRIORITY{ FIRST(10,"一级"), SECOND(20,"二级"), - THIRD(30,"三级"); + THIRD(30,"三级"), + FOUR(40,"四级"); private int value; private String description; @@ -1211,8 +1218,9 @@ public class AndonEnumUtil { QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"), PART("PART_ALARM", 110060104, "物料", "#24BDBA"), PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"), - CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"), - FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"); + CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"), + FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"), + MOULD("MOULD_ALARM", 160060111, "模具", "#0A8BEE"); private String value; private Integer code; 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 99a8d8f..0d7160b 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 @@ -81,6 +81,31 @@ public class ApsEnumUtil { } /** + * 物料类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_VALID_TYPE { + VALID("VALID", "有效"), + INVALID("INVALID", "无效"); + + private String value; + private String description; + + ORDER_VALID_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 物料报表统计类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -406,11 +431,15 @@ public class ApsEnumUtil { } } + public interface IRESOURCE_RULE { + String getValue(); + String getDescription(); + } /** * 预置的资源选择规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RESOURCE_CHOISE_RULE { + public enum RESOURCE_CHOISE_RULE implements IRESOURCE_RULE { PREV_SET_TIME("PREV_SET_TIME", "前设置时间"), PRODUCE_TIME("PRODUCE_TIME", "生产时间"), POST_SET_TIME("POST_SET_TIME", "后设置时间"), @@ -433,10 +462,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -471,32 +502,6 @@ public class ApsEnumUtil { } /** - * 锁定时间计算方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RES_COMB_LOCK_TYPE { - KEEP_ORIGIN("KEEP_ORIGIN", "各自锁定"), - MAIN_LOCK("MAIN_LOCK", "主资源锁定"), - MAX_ALL_RESOURCE("MAX_ALL_RESOURCE", "最大锁定时间"); - - private String value; - private String description; - - RES_COMB_LOCK_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 生产时间计算方法 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -664,14 +669,14 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_SORT_RULE { - NONE("NONE", "非内置"), - ORDER_LET("ORDER_LET", "订单交货期"), + ORDER_LET("ORDER_LET", "订单最晚结束时刻计算值"), ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"), ORDER_EST("ORDER_EST", "订单最早开始时刻"), ORDER_COUNT("ORDER_COUNT", "订单数量"), ORDER_RECEIVE_DATE("ORDER_RECEIVE_DATE", "订单接单日期"), ORDER_LET_SUB_EST("ORDER_LET_SUB_EST", "订单交货期与订单最早开始时刻之差"), ORDER_SURPLUS("ORDER_SURPLUS", "订单余裕度"), + ORDER_CODE("ORDER_CODE", "订单编码"), NOPLAN_OPERATION_SIZE("NOPLAN_OPERATION_SIZE", "残留工序数"), REMAIN_PRODUCE_TIME("REMAIN_PRODUCE_TIME", "残留生产时间"), MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"), @@ -681,8 +686,9 @@ public class ApsEnumUtil { HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"), WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"), TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"), - TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单代码"), - TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"); + TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单编码"), + TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"), + CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); private String value; private String description; @@ -736,9 +742,9 @@ public class ApsEnumUtil { public enum WORK_STATUS { NOPLAN("NOPLAN", "未计划"), PLANDONE("PLANDONE", "计划完毕"), - INDICATIONDONE("INDICATIONDONE", "指示完毕"), - CONFIRM("CONFIRM", "确认"), - STARTPRODUCT("STARTPRODUCT", "开始生产"), + INDICATIONDONE("INDICATIONDONE", "锁定"), + CONFIRM("CONFIRM", "下发"), + STARTPRODUCT("STARTPRODUCT", "生产中"), FINISH("FINISH", "完成"); private String value; @@ -763,7 +769,11 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_TYPE { + // 工作不参与排程 FICTITIOUS("FICTITIOUS", "虚拟工作"), + // 动态虚拟工作为不计算生产时间。 + DYNAMIC_FICTITIOUS("DYNAMIC_FICTITIOUS", "动态虚拟工作"), + // 此工作参与排程 NORMAL("NORMAL", "普通工作"); private String value; @@ -958,8 +968,7 @@ public class ApsEnumUtil { public enum PLAN_TYPE { PREV_SET("", "前设置"), PRODUCE("", "生产"), - POST_SET("", "后设置"), - LOCK("", "锁定"); + POST_SET("", "后设置"); private String value; private String description; @@ -1026,7 +1035,8 @@ public class ApsEnumUtil { STRING("STRING", "字符串，文本框编辑"), OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), LIST("LIST", "对象集合，不可编辑。"), - MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"); + MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"), + QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"); private String value; private String description; @@ -1143,4 +1153,160 @@ public class ApsEnumUtil { return description; } } + + /** + * 销售订单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SALES_ORDER_STATUS { + WAITING("WAITING", "待处理"), + CHANGE("CHANGE", "改带"), + COMMIT("COMMIT", "确认"); + + private String value; + private String description; + + SALES_ORDER_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 库存订单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SAFE_STOCK_ORDER_STATUS { + UNCOMMIT("UNCOMMIT", "待处理"), + COMMIT("COMMIT", "确认"); + + private String value; + private String description; + + SAFE_STOCK_ORDER_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 插单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INSERTED_ORDER_STATUS { + UNCOMMIT("UNCOMMIT", "待处理"), + COMMIT("COMMIT", "确认"); + + private String value; + private String description; + + INSERTED_ORDER_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 插单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FEED_BACK_STATUS { + UNCOMMIT("UNCOMMIT", "未提交"), + COMMIT("COMMIT", "提交"); + + private String value; + private String description; + + FEED_BACK_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 订单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum APS_ORDER_TYPE { + SALES_ORDER("S", "销售订单"), + PRODUCT_ORDER("M", "生产订单"), + PURCHASE_ORDER("P", "采购订单"), + INVENTORY("W", "库存订单"), + SAFE_STOCK_ORDER("Q", "安全库存订单"), + INSERTED_ORDER("I", "插单"); + + private String value; + private String description; + + APS_ORDER_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工序类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SANLUX_OPERATION_TYPE { + NORMAL("NORMAL", "正常工序"), + FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), + FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"); + + private String value; + private String description; + + SANLUX_OPERATION_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 14ef7d8..b53e93c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Objects; + /** * @Description : 模块表单枚举类 * @Reference : @@ -17,7 +19,8 @@ public class BlockFormEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FORM_TABLE_TYPE { TABLE(1, "TABLE", "表"), - VIEW(2, "VIEW", "视图"); + VIEW(2, "VIEW", "视图"), + PROCEDURE(3, "PROCEDURE", "存储过程"); private int value; private String code; @@ -334,6 +337,7 @@ public class BlockFormEnumUtil { return tmp; } } + /** * 元素属性显示状态信息 */ @@ -985,7 +989,6 @@ public class BlockFormEnumUtil { } - /** * 元素组织隔离 */ @@ -1206,19 +1209,19 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROPERTY_VIRTUAL_OPERATE_TYPE { - STRING_SPLICE(10, "SPLICE", "字符串拼接",String.class), - NUM_ADD(20, "ADD", "加法计算",Double.class), - NUM_LESS(30, "MIN", "减法计算",Double.class), - NUM_MAKE(40, "MUL", "乘法计算",Double.class), - NUM_DIVISION(50, "DIVISION", "除法计算",Double.class), - JOIN_TABLE(60, "JOIN_TABLE", "连表查询",String.class); + STRING_SPLICE(10, "SPLICE", "字符串拼接", String.class), + NUM_ADD(20, "ADD", "加法计算", Double.class), + NUM_LESS(30, "MIN", "减法计算", Double.class), + NUM_MAKE(40, "MUL", "乘法计算", Double.class), + NUM_DIVISION(50, "DIVISION", "除法计算", Double.class), + JOIN_TABLE(60, "JOIN_TABLE", "连表查询", String.class); private int value; private String code; private String description; private Class clzFullName; - private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description,Class clzFullName) { + private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description, Class clzFullName) { this.value = value; this.code = code; this.description = description; @@ -1295,23 +1298,23 @@ public class BlockFormEnumUtil { return tmp; } - public Object getPropertyVirtual(Object ... objs){ - if(this.getValue() == STRING_SPLICE.getValue()){ + public Object getPropertyVirtual(Object... objs) { + if (this.getValue() == STRING_SPLICE.getValue()) { return getPropertyVirtualString(objs); - }else if(this.getValue() == NUM_ADD.getValue()){ + } else if (this.getValue() == NUM_ADD.getValue()) { return getPropertyVirtualDoubleAdd(objs); - }else if(this.getValue() == NUM_LESS.getValue()){ + } else if (this.getValue() == NUM_LESS.getValue()) { return getPropertyVirtualDoubleLess(objs); - }else if(this.getValue() == NUM_MAKE.getValue()){ + } else if (this.getValue() == NUM_MAKE.getValue()) { return getPropertyVirtualDoubleMake(objs); - }else if(this.getValue() == NUM_DIVISION.getValue()){ + } else if (this.getValue() == NUM_DIVISION.getValue()) { return getPropertyVirtualDoubleDivision(objs); } return objs; } - private String getPropertyVirtualString(Object ... objs){ - if(objs != null && objs.length > 0){ + private String getPropertyVirtualString(Object... objs) { + if (objs != null && objs.length > 0) { StringBuffer result = new StringBuffer(); for (Object o : objs) { result.append(o == null ? "" : o.toString()); @@ -1321,15 +1324,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleAdd(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleAdd(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result += Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1338,15 +1341,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleLess(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleLess(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result -= Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1355,15 +1358,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleMake(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleMake(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result *= Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1372,15 +1375,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleDivision(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleDivision(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result /= Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1391,7 +1394,6 @@ public class BlockFormEnumUtil { } - /** * 执行类型信息 */ @@ -1748,8 +1750,8 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRIGGER_EVENT { - CLICK(10, "CLICK", "单击"); -// DB_LCLICK(20, "DB_LCLICK", "双击"), + CLICK(10, "CLICK", "单击"), + DOUBLE_CLICK(20, "DOUBLE_CLICK", "双击"); // MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"), // MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入"); @@ -1827,6 +1829,88 @@ public class BlockFormEnumUtil { } /** + * 触发反应枚举 + * 功能明细管理中，关联属性的操作， 可以通过事件刷新其他元素，或者通过事件打开另一个功能明细 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_ACTION { + REFRESH(10, "REFRESH", "刷新元素"), + SHOW_METHOD(20, "SHOW_METHOD", "展示其他功能明细"); + + private int value; + private String code; + private String description; + + private TRIGGER_ACTION(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static TRIGGER_ACTION valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 表单功能明细 触发效果信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1985,8 +2069,8 @@ public class BlockFormEnumUtil { /** * 数据状态 - * 1 启用 - * 2 禁用 + * 1 启用 + * 2 禁用 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { @@ -2102,7 +2186,7 @@ public class BlockFormEnumUtil { private String code; private String description; - private ELEMENT_TREE_DIRECTION (int value, String code, String description) { + private ELEMENT_TREE_DIRECTION(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -2150,7 +2234,7 @@ public class BlockFormEnumUtil { return tmp; } - public static ELEMENT_TREE_DIRECTION valueOf(int val) { + public static ELEMENT_TREE_DIRECTION valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -2182,7 +2266,7 @@ public class BlockFormEnumUtil { private String code; private String description; - private DATA_SOURCE_STATUS (int value, String code, String description) { + private DATA_SOURCE_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -2201,7 +2285,6 @@ public class BlockFormEnumUtil { } - public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2258,14 +2341,14 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ELEMENT_CONSTRAINT_TYPE { - UNIQUE(10, "唯一约束"); + UNIQUE(10, "唯一约束"); // 后续扩展联合主键 // PRIMARY_KEY(20, "主键约束") private int value; private String description; - private ELEMENT_CONSTRAINT_TYPE (int value, String description) { + private ELEMENT_CONSTRAINT_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -2300,19 +2383,18 @@ public class BlockFormEnumUtil { } } - /** * 操作触发来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FORM_TRIGGER_SOURCE { - INTERCEPTOR(10, "拦截器"), - BUTTON(20, "按钮"); + INTERCEPTOR(10, "拦截器"), + BUTTON(20, "按钮"); private int value; private String description; - private FORM_TRIGGER_SOURCE (int value, String description) { + private FORM_TRIGGER_SOURCE(int value, String description) { this.value = value; this.description = description; } @@ -2347,4 +2429,123 @@ public class BlockFormEnumUtil { } } + /** + * 存储过程列类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROCEDURE_COL_TYPE { + IN_PARAM(1, "入参"), + INOUT_PARAM(2, "出入参"), + // ?(3, "按钮"), + OUT_PARAM(4, "出参"), + RETURN_PARAM(5, "返回值"); + + private int value; + private String description; + + private PROCEDURE_COL_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static PROCEDURE_COL_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** + * 对象原始属性类型 + * TABLE_COL（10）：表格列-表，视图与存储过程查询结果的显示列 + * PROCEDURE_IN_PARAM（20）：入参-存储过程的入参 + * PROCEDURE_INOUT_PARAM（30）：入参-存储过程的出入参（sqlserver没有出参，都算出入参） + * PROCEDURE_OUT_PARAM（40）：入参-存储过程，函数的出参 + * PROCEDURE_RETURN（50）：入参-存储过程，函数的返回值（mysql存储过程没有返回值，sqlserver有） + */ + public enum ORIGIN_PROPERTY_TYPE { + NORMAL_PROPERTY(10, "正常属性"), + PROCEDURE_IN_PARAM(20, "入参"), + PROCEDURE_INOUT_PARAM(30, "出入参"), + PROCEDURE_OUT_PARAM(40, "出参"), + PROCEDURE_RETURN(50, "返回值"); + + private final int value; + private final String description; + + private ORIGIN_PROPERTY_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static ORIGIN_PROPERTY_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static ORIGIN_PROPERTY_TYPE procColTypeValOf(int procColTypeVal) { + ORIGIN_PROPERTY_TYPE result = NORMAL_PROPERTY; + switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))) { + case IN_PARAM: + result = PROCEDURE_IN_PARAM; + break; + case INOUT_PARAM: + result = PROCEDURE_INOUT_PARAM; + break; + case OUT_PARAM: + result = PROCEDURE_OUT_PARAM; + break; + case RETURN_PARAM: + result = PROCEDURE_RETURN; + break; + } + return result; + } + } } 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 dd4bd75..505bebc 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 @@ -26,7 +26,8 @@ public class BlockSoftSwitchEnumUtil { WEB_SERVICE(40,"WebService套件"), MQ(50,"消息队列套件"), WEB_SOCKET(60,"WebSocket套件"), - FTP(70,"FTP套件"); + FTP(70,"FTP套件"), + SAP(80,"SAP套件"); private int value; private String description; @@ -98,6 +99,15 @@ public class BlockSoftSwitchEnumUtil { } return tmp; } + + public static SUIT_MODE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** @@ -136,7 +146,10 @@ public class BlockSoftSwitchEnumUtil { /* FTP */ CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"), - SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"); + SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"), + + /* SAP */ + CLIENT_SAP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.SAP,170001,"Client FTP客户端适配器"); private int value; private String description; @@ -219,10 +232,11 @@ public class BlockSoftSwitchEnumUtil { SCHEDULE(2,"定时调度"), RABBITMQ(3,"MQ 调用"), HTTP(4,"接口调用"), - CLOUD(5,"Cloud调用"), + CLOUD(5,"微服务调用"), REST(6,"REST调用"), WEB_SERVICE(7,"WebService"), - SOCKET(8,"socket"); + SOCKET(8,"socket"), + RETRY(9,"重试"); private int value; private String description; @@ -830,7 +844,8 @@ public class BlockSoftSwitchEnumUtil { public enum SUIT_PROCESS_STATUS { UNPROCESSED(10, "未处理"), PROCESSING(20, "处理中"), - PROCESS(30, "已处理"); + PROCESS(30, "已处理"), + PROCESS_FAIL(40, "处理失败"); private int value; private String description; @@ -878,7 +893,8 @@ public class BlockSoftSwitchEnumUtil { REQUEST_ORGIN_PARAM(20, "请求原始参数"), ORIGINAL_MESSAGE(30, "原始报文"), CONVERTED_MESSAGE(40, "转换报文"), - SUIT_SEND_MESSAGE(50, "适配发送报文"); + SUIT_SEND_MESSAGE(50, "适配发送报文"), + PROCESS_RESULT(60, "处理结果"); private int value; private String description; @@ -918,4 +934,323 @@ public class BlockSoftSwitchEnumUtil { } + /** + * ftp连接模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FTP_CONNECTION_MODE { + LOCAL_ACTIVE_MODE(10, "本地主动模式"), + LOCAL_PASSIVE_MODE(20, "本地被动模式"); +// REMOTE_ACTIVE_MODE(30, "远程主动模式"), +// REMOTE_PASSIVE_MODE(40, "远程被动模式"); + + private final int value; + private final String description; + + FTP_CONNECTION_MODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static FTP_CONNECTION_MODE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return FTP_CONNECTION_MODE.LOCAL_ACTIVE_MODE; + } + } + + /** + * 脚本类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_TYPE { + MESSAGE_PROCESS(10, "报文处理","可用参数:transData,orginData"); + + private int value; + private String description; + private String scriptRule; + + private BS_SCRIPT_TYPE (int value, String description,String scriptRule) { + this.value = value; + this.description = description; + this.scriptRule = scriptRule; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + public String getScriptRule() { + return scriptRule; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_SCRIPT_TYPE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 脚本语言 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_LANGUAGE { +// SPEL(10, "Spring表达式语言(SpEL)"), + JAVASCRIPT(20, "JavaScript(JS)"); + + private int value; + private String description; + + private BS_SCRIPT_LANGUAGE (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_SCRIPT_LANGUAGE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 脚本执行方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_EXECUTE_METHOD { + EXECUTE_SCRIPT(10, "执行脚本"), + EXECUTE_METHOD(20, "执行方法"), + EXECUTE_OBJECT_METHOD(30, "执行对象方法"); + + private int value; + private String description; + + private BS_SCRIPT_EXECUTE_METHOD (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 适配重试方法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SUIT_RETRY_METHOD { + RESET_MESSAGE_STATE(10, "重置报文状态"), + RE_EXECUTE(20, "重新执行"); + + private int value; + private String description; + + private BS_SUIT_RETRY_METHOD (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_SUIT_RETRY_METHOD valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 适配重试方法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SUIT_RETRY_STATUS { + NOT_RETRY(10, "未重试"), + RETRY(20, "已重试"); + + private int value; + private String description; + + private BS_SUIT_RETRY_STATUS (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_SUIT_RETRY_STATUS valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * REST重试策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_REST_RETRY_STRATEGY { + HTTP_STATUS_CODE(10, "http状态码"); + + private int value; + private String description; + + private BS_REST_RETRY_STRATEGY (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_REST_RETRY_STRATEGY valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9162a1f..a8f259c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; +import java.sql.Timestamp; /** * @Description : @@ -19,20 +20,28 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFT_TYPE { - /** WMS 服务 */ + /** + * WMS 服务 + */ WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"), SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"), QMS(5, 0, 0, 0, "i3qms", "质量管理软件"), - /** Mes 服务 */ + /** + * Mes 服务 + */ MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"), MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"), - /** PTL 服务 */ + /** + * PTL 服务 + */ PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"), PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"), - /** Block 服务 */ + /** + * Block 服务 + */ FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"), REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"), WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"), @@ -40,42 +49,67 @@ public class CommonEnumUtil { SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"), HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"), - /** LAC 服务 */ + /** + * LAC 服务 + */ LAC(26, 8600, 13, 150000000L, "lac", "连接适配器"), - /** 安灯服务 */ + /** + * 安灯服务 + */ ANDON(27, 8500, 14, 110000000L, "andon", "安灯"), - /** 计划排产服务 */ + /** + * 计划排产服务 + */ APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"), SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), - /** 基础服务 */ + /** + * 基础服务 + */ IMPP(1, 0, 0, 100000000L, "impp-platform", "IMPP平台"), CONSOLE(95, 8010, 0, 0, "impp-console", "服务监控台"), GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"), CLOUD(97, 0, 0, 0, "i3cloud", "微服务"), CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"), + SCREEN(100, 8110, 23, 0, "i3screen", "通用界面"), - /** 平台服务 */ + /** + * 平台服务 + */ CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"), MDM(29, 8150, 22, 0, "i3mdm", "数据中心MDM"), - /** 调试服务 */ + /** + * 调试服务 + */ DEV(9999, 0000, 0, 120000000L, "Development", "系统调试"); - /** 产品ID */ + /** + * 产品ID + */ private int value; - /** 应用默认端口 */ + /** + * 应用默认端口 + */ private int port; - /** 应用默认雪花DataBaseId(0-31)共32 个存储区 */ + /** + * 应用默认雪花DataBaseId(0-31)共32 个存储区 + */ private int snowflakeId; - /** 产品代码 */ + /** + * 产品代码 + */ private String code; - /** 顶级菜单代码 */ + /** + * 顶级菜单代码 + */ private long menuRootId; - /** 产品描述 */ + /** + * 产品描述 + */ private String description; SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) { @@ -176,6 +210,7 @@ public class CommonEnumUtil { } return null; } + public synchronized static int descriptionOfValue(String desc) { int tmp = IMPP.value; for (int i = 0; i < values().length; i++) { @@ -186,6 +221,7 @@ public class CommonEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = IMPP.value; for (int i = 0; i < values().length; i++) { @@ -244,15 +280,15 @@ public class CommonEnumUtil { return tmp; } - public static int descOf(boolean desc) { - return desc ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); + public static int boolOfOfVal(boolean boolVal) { + return boolVal ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } - public static int descOf(int desc) { - return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); + public static int intOfVal(int boolIntVal) { + return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } - public static TRUE_OR_FALSE valueOfEnum(int value){ + public static TRUE_OR_FALSE valueOfEnum(int value) { for (int i = 0; i < values().length; i++) { if (values()[i].value == value) { return values()[i]; @@ -261,13 +297,18 @@ public class CommonEnumUtil { return null; } - public static String valueOfDescription(int val) {return valueOf(val);} - public static int descriptionOfValue(String desc) {return descOf(desc);} + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } public static boolean valueOfBoolean(int val) { - if(val == TRUE.value){ + if (val == TRUE.value) { return true; - }else { + } else { return false; } } @@ -347,6 +388,7 @@ public class CommonEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = COMMON.value; for (int i = 0; i < values().length; i++) { @@ -356,9 +398,11 @@ public class CommonEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { return valueOf(val); } + public static int descriptionOfValue(String val) { return descOf(val); } @@ -452,7 +496,7 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_STATUS { -// EMPTY(1, "fa fa-success cell-fa fa-check", "正常"), + // EMPTY(1, "fa fa-success cell-fa fa-check", "正常"), // FREEZE(2, "冻结", "冻结_FREEZE"), // ABERRANT(3, "异常", "异常_ABERRANT"), // RESIGNATION(4, "离职", "离职_RESIGNATION"), @@ -493,6 +537,10 @@ public class CommonEnumUtil { return tmp; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -503,6 +551,7 @@ public class CommonEnumUtil { return tmp; } } + /** * 数据类型 * 1库存移动数据 @@ -564,6 +613,7 @@ public class CommonEnumUtil { return tmp; } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_INFO_STATUS { INCUMBENT(1, "正常", "正常_NORMAL"), @@ -614,9 +664,9 @@ public class CommonEnumUtil { /** * 数据状态 - * 1 启用 - * 2 禁用 - * 3 锁定 + * 1 启用 + * 2 禁用 + * 3 锁定 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { @@ -706,7 +756,7 @@ public class CommonEnumUtil { return tmp; } - public static METHOD_LEVEL get(int id){ + public static METHOD_LEVEL get(int id) { for (int i = 0; i < values().length; i++) { if (values()[i].value == id) { return values()[i]; @@ -800,9 +850,9 @@ public class CommonEnumUtil { /** * 父节点配置 */ - public enum PARENT{ + public enum PARENT { - DEFAULT(-1L,"根节点"); + DEFAULT(-1L, "根节点"); private Long value = -1L; private String description = null; @@ -871,9 +921,9 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CLOUD_APP_STATUS { - UP(1,"UP" ,"在线"), - DOWN(2, "DOWN","断线"), - RESTRICTED(3,"RESTRICTED" ,"受限"); + UP(1, "UP", "在线"), + DOWN(2, "DOWN", "断线"), + RESTRICTED(3, "RESTRICTED", "受限"); private int value; private String code; @@ -986,6 +1036,7 @@ public class CommonEnumUtil { /** * -1 未识别操作系统 + * * @param desc * @return */ @@ -1047,6 +1098,10 @@ public class CommonEnumUtil { return tmp; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + public static int descOf(String desc) { int tmp = -1; for (int i = 0; i < values().length; i++) { @@ -1084,6 +1139,7 @@ public class CommonEnumUtil { this.value = value; this.description = description; } + public static CONTENT_TYPE valueOfContenType(String val) { CONTENT_TYPE tmp = null; for (int i = 0; i < values().length; i++) { @@ -1120,10 +1176,10 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HTTP_METHOD_TYPE { - GET(1,"GET" ,"GET"), - POST(2, "POST","POST"), - DELETE(3, "DELETE","DELETE"), - PUT(4, "PUT","PUT"); + GET(1, "GET", "GET"), + POST(2, "POST", "POST"), + DELETE(3, "DELETE", "DELETE"), + PUT(4, "PUT", "PUT"); private int value; private String code; @@ -1202,13 +1258,13 @@ public class CommonEnumUtil { * 变量类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum BASIS_TYPE { + public enum BASIS_TYPE { INT(1, "int"), DOUBLE(2, "double"), LONG(3, "long"), FLOAT(4, "float"), CHAR(5, "char"), - BOOLEAN(6,"boolean"), + BOOLEAN(6, "boolean"), BYTE(7, "byte"), SHORT(8, "short"); @@ -1321,13 +1377,14 @@ public class CommonEnumUtil { TEXT(200, "TEXT", "文本"), NUMBER(210, "NUMBER", "数字"), PASSWORD(230, "PASSWORD", "密码"), - DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN), + DATE_TIME(300, "DATE", "日期", SQL_WHERE.BETWEEN), // DATE(300, "DATE", "日期(yyyy-MM-dd)"), // DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), // ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), CASCADE(900, "CASCADE", "级联"), - PICK_UP(1000, "PICK_UP", "拾取"); + PICK_UP(1000, "PICK_UP", "拾取"), + INTERVAL(1100, "INTERVAL", "区间", SQL_WHERE.INTERVAL); //FILE(400, "file", "文件"), //IMAGE(410, "image", "image"), //OFF(500, "color", "颜色"), @@ -1431,12 +1488,13 @@ public class CommonEnumUtil { MORE(20, " > ", "大于"), LESS(30, " < ", "小于"), MORE_OR_EQUAL(21, " >= ", "大于等于"), - LESS_OR_EQUAL (31, " <= ", "小于等于"), + LESS_OR_EQUAL(31, " <= ", "小于等于"), LIKE(40, " LIKE ", "全模糊"), START_LIKE(41, " LIKE ", "前模糊"), END_LIKE(52, " LIKE ", "后模糊"), IN(50, " IN ", " in "), - BETWEEN(60, " BETWEEN ", "区间查询(逗号区分)"),; + BETWEEN(60, " BETWEEN ", "(between)区间查询(逗号区分)"), + INTERVAL(70, ">=And=< ", "(>= =<)区间查询(逗号区分)"); private int value; private String code; @@ -1521,7 +1579,7 @@ public class CommonEnumUtil { private int value; private String description; - private MiSS_RESOURCE_SOURCE(int value, String description) { + private MiSS_RESOURCE_SOURCE(int value, String description) { this.value = value; this.description = description; } @@ -1573,7 +1631,7 @@ public class CommonEnumUtil { BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class, PROPERTY_CONTROL_TYPE.RADIO, SQL_WHERE.EQUAL, null), BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, null), - DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); + DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", Timestamp.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); /** * 属性类型值 @@ -1596,7 +1654,7 @@ public class CommonEnumUtil { */ private Class clzFullName; /** - * 属性类型 对应的 控件类型 + * 属性类型 对应的 控件类型 */ private PROPERTY_CONTROL_TYPE controlType; /** @@ -1612,8 +1670,8 @@ public class CommonEnumUtil { */ private String defaultValue; - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { + private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName, + PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere) { this.value = value; this.code = code; this.description = description; @@ -1623,8 +1681,8 @@ public class CommonEnumUtil { this.defaultWhere = defaultWhere; } - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { + private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName, + PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere, String defaultValue) { this.value = value; this.code = code; this.description = description; @@ -1636,8 +1694,8 @@ public class CommonEnumUtil { this.defaultFormat = defaultFormat; } - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) { + private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName, + PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere, String defaultValue, String defaultFormat) { this.value = value; this.code = code; this.description = description; @@ -1803,10 +1861,11 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { - SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), - SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), - SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), - SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); + SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), + SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), + SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null), + SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"), + SOURCE_SAP_HANA(500, "SapHana", "SapHana", "com.sap.db.jdbc.Driver", 39015, null); private int value; private String code; @@ -1815,7 +1874,7 @@ public class CommonEnumUtil { private int defaultPort; private String defaultSchemaPattern; - private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { + private DATA_SOURCE_TYPE(int value, String code, String description, String driverClassName, int port, String defaultSchemaPattern) { this.value = value; this.code = code; this.description = description; @@ -1898,48 +1957,125 @@ public class CommonEnumUtil { return tmp; } - public String getJDBCUrl(String database,String host,Integer port){ - if(this.getValue() == SOURCE_MARIA_DB.getValue()){ - return getJDBCUrlMySQL(database,host,port); - }else if(this.getValue() == SOURCE_ORACLE.getValue()){ - return getJDBCUrlOracle(database,host,port); - }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ - return getJDBCUrlPostgreSQL(database,host,port); - }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ - return getJDBCUrlSQLServer(database,host,port); + public String getSchemaPattern(String schema) { + if (this.equals(SOURCE_SAP_HANA)) { + return schema; + } + return defaultSchemaPattern; + } + + public String getJDBCUrl(String database, String host, Integer port) { + if (this.getValue() == SOURCE_MARIA_DB.getValue()) { + return getJDBCUrlMySQL(database, host, port); + } else if (this.getValue() == SOURCE_ORACLE.getValue()) { + return getJDBCUrlOracle(database, host, port); + } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) { + return getJDBCUrlPostgreSQL(database, host, port); + } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) { + return getJDBCUrlSQLServer(database, host, port); + } else if (this.getValue() == SOURCE_SAP_HANA.getValue()) { + return getJDBCUrlSapHana(database, host, port); + } + return null; + } + + public String getJDBCUrlToMysql(String database, String host, Integer port) { + if (this.getValue() == SOURCE_MARIA_DB.getValue()) { + return getJDBCUrlMySQLBy8x(database, host, port); + } else if (this.getValue() == SOURCE_ORACLE.getValue()) { + return getJDBCUrlOracle(database, host, port); + } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) { + return getJDBCUrlPostgreSQL(database, host, port); + } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) { + return getJDBCUrlSQLServer(database, host, port); + } else if (this.getValue() == SOURCE_SAP_HANA.getValue()) { + return getJDBCUrlSapHana(database, host, port); + } + return null; + } + + public String getJDBCUrl(String database, String host, Integer port, String instanceName) { + if (this.getValue() == SOURCE_MARIA_DB.getValue()) { + return getJDBCUrlMySQL(database, host, port); + } else if (this.getValue() == SOURCE_ORACLE.getValue()) { + return getJDBCUrlOracle(database, host, port); + } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) { + return getJDBCUrlPostgreSQL(database, host, port); + } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) { + return getJDBCUrlSQLServer(database, host, port, instanceName); } return null; } - public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ - if(StringUtils.isNotBlank(databaseProductName)){ - if(databaseProductName.indexOf(":mysql:") != -1){ + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName) { + if (StringUtils.isNotBlank(databaseProductName)) { + if (databaseProductName.indexOf(":mysql:") != -1) { return SOURCE_MARIA_DB; - }else if(databaseProductName.indexOf(":oracle:") != -1){ + } else if (databaseProductName.indexOf(":oracle:") != -1) { return SOURCE_ORACLE; - }else if(databaseProductName.indexOf(":postgresql:") != -1){ + } else if (databaseProductName.indexOf(":postgresql:") != -1) { return SOURCE_POSTGRE_SQL; - }else if(databaseProductName.indexOf(":sqlserver:") != -1){ + } else if (databaseProductName.indexOf(":sqlserver:") != -1) { return SOURCE_SQL_SERVER; + } else if (databaseProductName.indexOf(":sap:") != -1) { + return SOURCE_SAP_HANA; } } return null; } - private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + + // cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest + private String getJDBCUrlMySQL(String database, String host, Integer port) { + // 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST + return "jdbc:mysql://" + host + ":" + port + "/" + database + + "?autoReconnect=true" + + "&useSSL=false" + + "&characterEncoding=utf-8" + + "&allowPublicKeyRetrieval=true" + + "&serverTimezone=Asia/Shanghai"; + } + + //MySQL8.x时区设置 + private String getJDBCUrlMySQLBy8x(String database, String host, Integer port) { + return "jdbc:mysql://" + host + ":" + port + "/" + database + + "?autoReconnect=true" + + "&useSSL=false" + + "&characterEncoding=utf-8" + + "&allowPublicKeyRetrieval=true" + + "&serverTimezone=Asia/Shanghai"; + } + + private String getJDBCUrlOracle(String database, String host, Integer port) { + return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database; } - private String getJDBCUrlOracle(String database,String host,Integer port){ - return "jdbc:oracle:thin:@"+host+":"+port+":"+database; + private String getJDBCUrlPostgreSQL(String database, String host, Integer port) { + return "jdbc:postgresql://" + host + ":" + port + "/" + database; } - private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ - return "jdbc:postgresql://"+host+":"+port+"/"+database; + private String getJDBCUrlSQLServer(String database, String host, Integer port) { + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database + ";autoReconnect=true"; } - private String getJDBCUrlSQLServer(String database,String host,Integer port){ - return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; + private String getJDBCUrlSapHana(String database, String host, Integer port) { + return "jdbc:sap://" + host + ":" + port + "?reconnect=true"; + } + + private String getJDBCUrlSQLServer(String database, String host, Integer port, String instanceName) { + StringBuffer sb = new StringBuffer(); + sb.append("jdbc:sqlserver://").append(host); + // 实例 + if (StringUtils.isNotBlank(instanceName)) { + sb.append("\\").append(instanceName); + } + // 端口 + sb.append(":").append(port); + // 数据库 + sb.append(";database=").append(database); + // 自动重连 + sb.append(";autoReconnect=true"); + return sb.toString(); } } @@ -1947,7 +2083,7 @@ public class CommonEnumUtil { * 变量类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LICENSE_SOURCE { + public enum LICENSE_SOURCE { LOCAL_SYSTEM_FILE(1, "本地文件"), NETWORK_ESTSH(2, "网络-官方授权"), SENSE_HARDWARE_USB_LOCK(3, "硬件锁"), @@ -2039,8 +2175,8 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ACTUATOR_ENV_PATH { - PID(1,"/PID" ,"PID"), - JAVA_VERSION(2, "/java.version","jdk版本"); + PID(1, "/PID", "PID"), + JAVA_VERSION(2, "/java.version", "jdk版本"); private int value; private String path; @@ -2139,7 +2275,7 @@ public class CommonEnumUtil { this.description = description; } - private ACTUATOR_METRICS_INFO(int value, String path, String tag, String description) { + private ACTUATOR_METRICS_INFO(int value, String path, String tag, String description) { this.value = value; this.path = path; this.tag = tag; @@ -2153,6 +2289,7 @@ public class CommonEnumUtil { public String getPath() { return path; } + public String getTag() { return tag; } @@ -2213,7 +2350,7 @@ public class CommonEnumUtil { private String code; private String description; - private DATA_SOURCE_STATUS (int value, String code, String description) { + private DATA_SOURCE_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -2232,7 +2369,6 @@ public class CommonEnumUtil { } - public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2403,7 +2539,6 @@ public class CommonEnumUtil { } - /** * 业务表：库存条码质检状态 */ @@ -2526,6 +2661,102 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DYNAMIC_DATA_SOURCE_TYPE { - MASTER,NODE + MASTER, NODE + } + + /** + * 会话模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SESSION_MODE { + DEFAULT(10, "默认"), + OVERWRITE(20, "覆盖"), + SEIZE(30, "抢占"); + + private int value; + private String description; + + SESSION_MODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } + + /** + * 条码解析校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BARCODE_CHECK_MODE { + SEPARATOR_NUM(10, "分割数"), + ANALYTIC_NUM(20, "解析数"), + WEAK(30, "弱校验"); + + private int value; + private String description; + + BARCODE_CHECK_MODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index f6eb1ae..c5f6fd4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -19,6 +19,7 @@ public class ImppEnumUtil { public enum ORGANIZE_YTPE { TYPE_GROUP(1, "集团", "集团"), + TYPE_DIVISION(4, "事业部", "事业部"), TYPE_COMPANY(2, "公司", "公司"), TYPE_FACTORY(3, "工厂", "工厂"); @@ -445,7 +446,7 @@ public class ImppEnumUtil { MESSAGE_SEND_STATUS() { } - MESSAGE_SEND_STATUS(int value, String description) { + MESSAGE_SEND_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -483,7 +484,8 @@ public class ImppEnumUtil { MAIL(1, "邮件", "邮件"), LETTER(2, "站内信", "站内信"), SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), - SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"), + WORK_WECHAT_TASK_CARD(5, "企业微信任务卡片", "企业微信任务卡片"); private int value; private String name; @@ -1031,10 +1033,10 @@ public class ImppEnumUtil { REF_OBJECT(3, "对象"), REF_DICT(4, "字典"); - private int value; - private String description; + private final int value; + private final String description; - private COL_REF_TYPE(int value, String description) { + COL_REF_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -1079,10 +1081,14 @@ public class ImppEnumUtil { CONTACT(4, "联系人"), BASIS(5, "基础"), CONFIG(6, "系统配置"), - LOG(7, "日志配置"); + LOG(7, "日志配置"), + WORK_WECHAT(8, "企业微信配置"), + SMS(9, "短信配置"), + SSO(10, "单点登录配置"), + DINGTALK_REDIRECT(12, "钉钉授权跳转"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1092,7 +1098,7 @@ public class ImppEnumUtil { return description; } - private SYS_CONFIG_GROUP(int value, String description) { + SYS_CONFIG_GROUP(int value, String description) { this.value = value; this.description = description; } @@ -1115,8 +1121,8 @@ public class ImppEnumUtil { EXTERNAL(2, "外部人员"), URGENT(3, "紧急联系人"), SUPPLIER(4, "供应商"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1126,7 +1132,7 @@ public class ImppEnumUtil { return description; } - private MESSAGE_RECEIVER_TYPE(int value, String description) { + MESSAGE_RECEIVER_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -1219,8 +1225,8 @@ public class ImppEnumUtil { public enum DICTIONARY_GROUP { SYSTEM(1, "系统字典"), EXTERNAL(2, "业务字典"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1230,7 +1236,7 @@ public class ImppEnumUtil { return description; } - private DICTIONARY_GROUP(int value, String description) { + DICTIONARY_GROUP(int value, String description) { this.value = value; this.description = description; } @@ -1251,10 +1257,10 @@ public class ImppEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOG_STORAGE { - MONGO(1, "MongoDB"), + // MONGO(1, "MongoDB"), ELASTICSEARCH(2, "Elasticsearch"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1264,7 +1270,7 @@ public class ImppEnumUtil { return description; } - private LOG_STORAGE(int value, String description) { + LOG_STORAGE(int value, String description) { this.value = value; this.description = description; } @@ -1296,8 +1302,8 @@ public class ImppEnumUtil { public enum CHECK_TEXT { PASSWORD_VERIFY(1, "保存策略"), PASSWORD_LOGIN(2, "登录策略"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1307,7 +1313,7 @@ public class ImppEnumUtil { return description; } - private CHECK_TEXT(int value, String description) { + CHECK_TEXT(int value, String description) { this.value = value; this.description = description; } @@ -1331,4 +1337,341 @@ public class ImppEnumUtil { return null; } } + + /** + * 用户定制化配置类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_CUSTOMIZE_CONFIG_TYPE { + WEB_TABLE_SHOW_COL(10, "前端表格显示列"); + + private final int value; + private final String description; + + USER_CUSTOMIZE_CONFIG_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 用户外部关系 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_EXTERNAL_REF { + WORK_WECHAT(10, "企业微信"); + + private final int value; + private final String description; + + USER_EXTERNAL_REF(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 用户绑定属性 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_BIND_PROPERTY { + USER_LOGIN_NAME("userId", "登录名称"), + USER_NAME("userName", "用户名称"), + EMAIL("email", "邮箱"), + USER_PHONE("phone", "手机号"), + USER_EMP_NO("empNo", "工号"), + USER_WECHAT_NO("userWeChatNo", "微信号"); + + private final String value; + private final String description; + + USER_BIND_PROPERTY(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static USER_BIND_PROPERTY valueOfEnum(String val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + return values()[i]; + } + } + return null; + } + } + + /** + * 短信供应商 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SMS_SUPPLIER { + + ALI_CLOUD(1, "阿里云"); + + private int value; + private String description; + + SMS_SUPPLIER() { + } + + SMS_SUPPLIER(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static SMS_SUPPLIER valueOf(int val) { + SMS_SUPPLIER tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + } + + /** + * 短信模板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SMS_TEMPLATE_STATUS { + UNDER_REVIEW(10, "审核中"), + PASS(20, "审核通过"), + FAIL(30, "审核失败"); + + private int value; + private String description; + + SMS_TEMPLATE_STATUS() { + } + + SMS_TEMPLATE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 短信模板类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SMS_TEMPLATE_TYPE { + VER_CODE(10, "验证码"), + NOTICE_SMS(20, "短信通知"), + PROMOTE_SMS(30, "推广短信"), + INTL_SMS(40, "国际/港澳台消息"); + + private int value; + private String description; + + SMS_TEMPLATE_TYPE() { + } + + SMS_TEMPLATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 短信发送状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SMS_SEND_STATUS { + WAIT_RECEIPT(10, "等待回执"), + FAIL(20, "发送失败"), + SUCCESS(30, "发送成功"); + + private int value; + private String description; + + SMS_SEND_STATUS() { + } + + SMS_SEND_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTH_LOGIN_STRATEGY { + ACCOUNT(10, "Default", "defaultLoginStrategy", "账户密码登录"), + E9(20, "E9", "e9LoginStrategy", "泛微单点登录策略"), + NAME(30, "Name", "nameLoginStrategy", "用户名登录"); + + private final int value; + private final String code; + private final String strategyName; + private final String description; + + AUTH_LOGIN_STRATEGY(int value, String code, String strategyName, String description) { + this.value = value; + this.code = code; + this.strategyName = strategyName; + this.description = description; + } + + public String getCode() { + return code; + } + + public static String codeOfStrategyName(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].strategyName; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java index 84e7427..c40e09d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java @@ -16,8 +16,8 @@ public class MdmEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MDM_OPERATE_TYPE { - INSERT(1, "新增"), - UPDATE(2, "修改"); + INSERT(1, "新增"), + UPDATE(2, "修改"); private int value; private String description; @@ -120,10 +120,10 @@ public class MdmEnumUtil { /** * mdm */ - public enum MDM_SYNC_TYPE{ - INSERT(1, "新增"), - UPDATE(2, "修改"), - DELETE(3, "删除"); + public enum MDM_SYNC_TYPE { + INSERT(1, "新增"), + UPDATE(2, "修改"), + DELETE(3, "删除"); private int value; private String description; @@ -162,4 +162,51 @@ public class MdmEnumUtil { } } + /** + * MDM 同步应用类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MDM_SYNC_APP_TYPE { + INTERNAL(1, "内部系统"), + EXTERNAL(2, "外部系统"); + + private int value; + private String description; + + private MDM_SYNC_APP_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static MdmEnumUtil.MDM_SYNC_APP_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + } 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 7f802e0..f4df909 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 @@ -13,6 +13,81 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_IS_SEALED { + + UNSEALED(1, "未封箱"), + SEALED(2, "已封箱"); + + private int value; + private String description; + + PACKAGE_IS_SEALED(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; + } + } + + /** + * MES_SPC关键数据 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPC_KEY_DATA_OBJECT_TYPE { + POJO_OBJECT(10, "实体对象（单表）"), + DYNAMIC(20, "动态对象（生产数据表）"); + + private Integer value; + private String description; + + SPC_KEY_DATA_OBJECT_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDesc(String val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + return values()[i].description; + } + } + return null; + } + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_EXPRESSION { GT(">", ">", "大于"), LT("<", "<", "小于"), @@ -69,16 +144,21 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { - MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(20, "展示组件"), - BUTTON_MODULE(30, "按钮组件"), - TIMING_MODULE(40, "定时组件"); + MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"), + REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"), + BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"), + TIMING_MODULE(40, "TIMING_MODULE", "定时组件"), + PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"), + PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"), + ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件"); private int value; + private String data; private String description; - WORK_MODULE_TYPE(int value, String description) { + WORK_MODULE_TYPE(int value, String data, String description) { this.value = value; + this.data = data; this.description = description; } @@ -86,6 +166,10 @@ public class MesEnumUtil { return value; } + public String getData() { + return data; + } + public String getDescription() { return description; } @@ -102,6 +186,38 @@ public class MesEnumUtil { } /** + * 启用还是禁用 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_VALID { + YES(1, "启用"), + NO(2, "禁用"); + private Integer isValid; + private String description; + + IS_VALID(int isValid, String description) { + this.isValid = isValid; + this.description = description; + } + + public int getIsValid() { + return isValid; + } + + public void setIsValid(int isValid) { + this.isValid = isValid; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + } + + /** * 排序方式 */ public enum ASC_OR_DESC { @@ -248,7 +364,8 @@ public class MesEnumUtil { PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), - ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"), + NO_CHECK_SN(50, "NO_CHECK_SN", "不校验条码"); private int value; private String code; @@ -698,6 +815,8 @@ public class MesEnumUtil { public enum MES_TYPE_CFG { DEFECT("DEFECT", "缺陷"), + POLISHING("POLISHING", "抛光"), + DISASSEMBLE("DISASSEMBLE", "拆解"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), @@ -707,7 +826,8 @@ public class MesEnumUtil { EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"), - BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"); + BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"), + WO_TYPE("WO_TYPE", "客户JIT队列工单类型"); private String value; private String description; @@ -1936,7 +2056,7 @@ public class MesEnumUtil { MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"), MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"), MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"), - MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"), + MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表，支持编辑"), MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"), MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"), MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"), @@ -1966,7 +2086,22 @@ public class MesEnumUtil { SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"), MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"), - BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"); + BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"), + BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"), + MES_PROD_WORK_CENTER(530, "prodWorkCenterExcelService", "产品工作中心配置导入"), + MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"), + MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"), + MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), + MES_LOCATION(570, "locationExcelService", "库位信息导入"), + MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), + MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"), + MES_MODEL_GRADE(600, "modelGradeExcelService", "车型等级导入"), + MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"), + MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), + MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), + MES_JISA(640, "jisaExcelService", "JISA导入"), + MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), + MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"); private int value; private String service; @@ -2337,7 +2472,9 @@ public class MesEnumUtil { public enum MES_WORK_CELL_TYPE { NORMAL(10, "正常"), - REWORK(20, "返修"); + REWORK(20, "返修"), + ON_LINE(30, "上线工位"), + QUALITY_CHECK(40, "质检工位"); private int value; private String description; @@ -2677,6 +2814,15 @@ public class MesEnumUtil { } return tmp; } + + public static MES_QC_CHECK_TYPE getByValue(int value) { + for (MES_QC_CHECK_TYPE type : values()) { + if (type.getValue() == value) { + return type; + } + } + return null; + } } /** @@ -2991,6 +3137,41 @@ public class MesEnumUtil { } /** + * 工步参数 是否必填 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STEP_PARAM_IS_NEED { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + MES_STEP_PARAM_IS_NEED(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; + } + } + + /** * mes工作单元参数类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -3182,8 +3363,8 @@ public class MesEnumUtil { EXEC(10, "执行方法"), COMPLETE(20, "完成方法"), - HNC_ISSUED(30,"队列自动下达"), - LABEL_PROPERTIES(40,"标签属性查询方法"); + HNC_ISSUED(30, "队列自动下达"), + LABEL_PROPERTIES(40, "标签属性查询方法"); private int value; private String description; @@ -3313,8 +3494,12 @@ public class MesEnumUtil { EMERGENCY_ORDER(80, "紧急插单"), FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), - REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); + REPRODUCTION_RMS(110, "重新生产-报工"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), + REVERSE_SPRAY_ORDER(130, "反喷工单"), + SPARE_RETURN_REPAIR(140, "客退备件返修"), + SEIZE_SEAT_ORDER(150, "占位工单"), + SAMPLE_ORDER(160, "样件工单"); private int value; private String description; @@ -3479,11 +3664,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_STATUS { + WAIT_LANDED(5, "待下达"), NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); private int value; private String description; @@ -3519,7 +3704,9 @@ public class MesEnumUtil { public enum QUEUE_ORDER_DETAIL_STATUS { NORMAL(10, "正常"), - CLOSE(20, "关闭"); + CLOSE(20, "关闭"), + FINISH(30, "完成"), + OFF_LINE_REWORK(40, "线下返修"); private int value; private String description; @@ -3561,8 +3748,7 @@ public class MesEnumUtil { INSTOCKED(40, "入库"), SHIPING(50, "发运"), REDO(60, "重做"), - CLOSE(90, "关闭"), - ; + CLOSE(90, "关闭"); private int value; private String description; @@ -3591,6 +3777,39 @@ public class MesEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PRINT_STATUS { + + UNPRINTED(10, "未打印"), + PRINTED(20, "已打印"); + + private int value; + private String description; + + WORK_ORDER_PRINT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * MesProduceSn实体对应的printStatus值 条码表条码打印状态 */ @@ -3708,11 +3927,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCE_SN_QC_STATUS { + PRE_CHECK(5, "待检测"), QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), SCRAPED(30, "报废"), - DISMANTLED(40, "已拆解"), - PRE_CHECK(50, "待检测"); + DISMANTLED(40, "已拆解"); private int value; private String description; @@ -3783,16 +4002,30 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATION_BUSI_TYPE { + GUIDE("guide", "引导信息"), MESSAGE("message", "返回信息"), STEP_LIST("stepList", "工步列表"), + STATE_LIST("stateList", "状态列表"), STEP_CONTENT("stepContent", "工步内容"), - MODULE_CONTENT("moduleContent", "组件内容"), + MODULE_CONTENT("moduleContent", "展示组件内容"), + MODULE_HEAD("moduleHead", "展示组件头"), + GUIDE_CONTENT("guideContent", "指导内容"), + ASSISTANT_CONTENT("assistantContent", "辅助展示组件"), CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), STOP_PCS_CTL("stopPcsCtl", "停止监控"), - RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); + RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), + PROCESS_CONTENT("processContent", "过程组件内容"), + TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), + TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), + TIME_MODULE_START("timeModuleStart", "定时组件开始"), + ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"), + ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"), + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), + MESSAGE_POOL("messagePool", "消息池"), + FORCE_LOGOUT("forceLogout", "websocket强制下线"); private String value; @@ -4036,7 +4269,8 @@ public class MesEnumUtil { PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), - PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), + PCN_IMAGE_NGINX(220, "PCN_IMAGE_NGINX", "PCN_IMAGE_NGINX"); private int value; private String code; @@ -4248,7 +4482,8 @@ public class MesEnumUtil { public enum ROUTE_TYPE { SCAN(10, "扫描流程"), - MONITOR(20, "监控流程"); + MONITOR(20, "监控流程"), + MACHINE(30, "状态机流程"); private int value; private String description; @@ -4275,7 +4510,88 @@ public class MesEnumUtil { } return tmp; } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FSM_EVENT { + TRIGGER(10, "trigger", "触发"), + ENTRY(20, "entry", "进入"), + EXIT(30, "exit", "离开"); + + private int value; + private String code; + private String description; + + private FSM_EVENT(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return this.value; + } + + public String getCode() { + return this.code; + } + + public String getDescription() { + return this.description; + } + + public static FSM_EVENT getByValue(int value) { + for (FSM_EVENT fsmEvent : values()) { + if (fsmEvent.getValue() == value) { + return fsmEvent; + } + } + return null; + } + + public static String valueOfDescription(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 状态机状态点类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"), + BACK(99, "BACK", "回退状态"); + + private int value; + private String code; + private String description; + + STATUS_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + public String getDescription() { + return description; + } } /** @@ -4475,7 +4791,10 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_STATUS { CREATE(10, "创建"), LANDED(20, "下达"), - CANCEL(30, "取消"); + CANCEL(30, "取消"), + OFFLINE(40, "下线"), + SHIPMENT(50, "发运"), + SPECIAL(60, "特殊标识"); private int value; private String description; @@ -4510,7 +4829,9 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), - EMPTYING(20, "放空"); + EMPTYING(20, "放空"), + ERR_PERCH(30, "异常占位"), + PERCH_HANDLE(40, "占位处理"); private int value; private String description; @@ -4762,7 +5083,8 @@ public class MesEnumUtil { public enum WORK_CELL_MONITOR_TYPE { MONITOR(10, "监听组件"), SHOW(20, "展示组件"), - BUTTON(30, "按钮组件"); + BUTTON(30, "按钮组件"), + PROCESS_MONITOR(40, "工序监听组件"); private int value; private String description; @@ -5165,7 +5487,12 @@ public class MesEnumUtil { BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), - BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"); + BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), + BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), + BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"), + BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"), + BOARD_MGN_BJ_MAIN_SCREEN("BOARD_MGN_BJ_MAIN_SCREEN", "北京麦格纳总屏幕看板"), + BOARD_MGN_BJ_EQU_REPAIR("BOARD_MGN_BJ_EQU_REPAIR", "北京麦格纳设备维修看板"); private String code; private String description; @@ -5398,6 +5725,7 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VALUE_TYPE { + MANUAL_ASSIGNMENT("10", "手工赋值"), SPEL_EXPRESSION("20", "spel表达式"), FUNCTION_ASSIGNMENT("30", "函数赋值"), @@ -5563,14 +5891,15 @@ public class MesEnumUtil { /** - * 运算对象代码 + * 运算对象代码 Period capacity */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OPERATE_OBJECT_CODE { ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"), ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"), WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"), - EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"); + EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"), + PERIOD_CAPACITY("PERIOD_CAPACITY", "时段产能"); private String value; private String description; @@ -5816,9 +6145,9 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLC_DATA_TYPE { STRING("10", "String", "字符串"), - BOOLEAN("20","Boolean", "布尔"), + BOOLEAN("20", "Boolean", "布尔"), WORD("30", "Word", "整形-Word"), - DWORD("40","Dword", "整形-DWord"), + DWORD("40", "Dword", "整形-DWord"), LONG("50", "Long", "长整形-Long"), SHORT("60", "Short", "UShort"), DOUBLE("70", "Double", "双精度-Double"), @@ -5835,7 +6164,7 @@ public class MesEnumUtil { private String code; private String description; - PLC_DATA_TYPE(String value, String code,String description) { + PLC_DATA_TYPE(String value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -5858,6 +6187,7 @@ public class MesEnumUtil { } return tmp; } + public static String codeOfValue(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -5916,52 +6246,6 @@ public class MesEnumUtil { } /** - * MES_车型散件配置清单 选配类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_OPTION_TYPE { - - OPTION_PART(1, "选配件"), - BOM_DISASSEMBLY(2, "BOM拆解"); - - private int value; - private String description; - - MES_OPTION_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static Integer descriptionOfValue(String description) { - Integer tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 数据格式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -6337,41 +6621,6 @@ public class MesEnumUtil { } /** - * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码) - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum YELLOW_GUN_RULE { - COLLECT_TORQUE(10, "继续采集扭矩"), - SEND_NEXT_GROUP_CODE(20, "发送下一个组合码"); - - private int value; - private String description; - - YELLOW_GUN_RULE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** * 停机类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -6690,10 +6939,10 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QAD_DATA_OBJECT { - BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom","BOM"), - CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem","getCustomerPartList", "MesCustomerPart","客户物料号"), - CUSTOMER("soapenv#Envelope#SyncCustomer","getCustomerList", "MesCustomer","客户信息"), - PART("soapenv#Envelope#SyncItem","getPartList", "MesPart","物料信息"); + BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom", "BOM"), + CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem", "getCustomerPartList", "MesCustomerPart", "客户物料号"), + CUSTOMER("soapenv#Envelope#SyncCustomer", "getCustomerList", "MesCustomer", "客户信息"), + PART("soapenv#Envelope#SyncItem", "getPartList", "MesPart", "物料信息"); private String code; private String method; @@ -6751,4 +7000,1436 @@ public class MesEnumUtil { return null; } } + + /** + * 工位BOM 绑定物料类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BIND_PART_TYPE { + POSITIVE(10, "半成品"), + REVERSE_SIDE(20, "原材料"); + + private Integer value; + private String description; + + BIND_PART_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 工作中心 工位监控模式 10=工单作业，20=标准作业 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CENTER_MONITOR_TYPE { + + ORDER_WORK(10, "工单作业"), + STANDARD_WORK(20, "标准作业"); + + private int value; + private String description; + + WORK_CENTER_MONITOR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 工位等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CELL_GRADE { + + COMMON(10, "普通工位"), + MONITOR(20, "监控工位"); + + private int value; + private String description; + + WORK_CELL_GRADE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 样本类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SAMPLE_TYPE { + + NORMAL(10, "正常"), + FIRST_ARTICLE(20, "首件"), + MEDIUM_SIZED(30, "中件"), + LAST_PIECE(40, "末件"); + + private int value; + private String description; + + SAMPLE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_CATEGORY { + + FL("FL", "DOOR_FRONT_LEFT"), + FR("FR", "DOOR_FRONT_RIGHT"), + RL("RL", "DOOR_REAR_LEFT"), + RR("RR", "DOOR_REAR_RIGHT"); + + private String description; + private String value; + + PRODUCE_CATEGORY(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 取值对象类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXTRACT_OBJECT_TYPE { + MODEL(10, "实体对象（单表）"), + PRODUCT_DATA(20, "动态对象（生产数据表）"); + + private Integer value; + private String description; + + EXTRACT_OBJECT_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 系数类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COEFFICIENT_TYPE { + CONTROL(10, "控制限系数"), + CENTER(20, "中心线系数"); + + private Integer value; + private String description; + + COEFFICIENT_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 工单启动池状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_START_CACHE_STATUS { + + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + WORK_START_CACHE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * 涂装导入--反喷标识（Y-正常；F-反喷） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REVERSE_SPRAY_MARK { + REVERSE_SPRAY("F", "反喷"), + NORMAL("Y", "正常"); + + private String value; + private String description; + + REVERSE_SPRAY_MARK(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MES_出入库事务表--事务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TRANS_TYPE { + + OUTSTOCK(10, "出库"), + INSTOCK(20, "入库"), + GOBACK(30, "退回"); + + private int value; + private String description; + + PACKAGE_TRANS_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 通知标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NOTICE_SIGN { + + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + NOTICE_SIGN(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * 触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_TYPE { + INTERNAL_TRIGGER(10, "内部触发"), + EXTERNAL_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 客户JIT队列明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_DETAIL_STATUS { + NORMAL(10, "正常"), + WASHED_MATERIAL(20, "已冲料"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_DETAIL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIS_BACKFLUSH_STATUS { + BACKFLUSH("BACKFLUSH", "正常回冲扣减"), + REPAIR("REPAIR", "返修冲料"); + + private String value; + private String description; + + JIS_BACKFLUSH_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 质检单审批处理意见 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_ORDER_APPROVAL_CHOICE { + + STOP_LINE(10, "停线"), + RELEASE(20, "放行"); + + private int value; + private String description; + + QC_ORDER_APPROVAL_CHOICE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 整体检测结果状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_RESULT { + + PASS(10, "通过"), + NON_PASS(20, "不通过"), + CONCESSION_PRODUCTION(30, "让步生产"); + + private int value; + private String description; + + CHECK_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 整体检测结果状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_ORDER_APPROVAL_TYPE { + + STOP_LINE(10, "停线"), + RELEASE(20, "放行"); + + private int value; + private String description; + + QC_ORDER_APPROVAL_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 检测单明细的检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_ORDER_DETAIL_CHECK_RESULT { + + OK(10, "OK"), + NG(20, "NG"); + + private int value; + private String description; + + QC_ORDER_DETAIL_CHECK_RESULT(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; + } + } + + /** + * mes 看板展示类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_TYPE { + + PICTURE(10, "图片"), + VIDEO(20, "视频"); + + private int value; + private String description; + + SHOW_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * mes 数据来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_DATA_SOURCE { + MANUAL_INPUT(10, "10", "人工输入"), + DB(30, "30", "数据库"), + PLC(20, "20", "PLC"); + + private int value; + private String description; + private String code; + + QC_CHECK_DATA_SOURCE(int value, String code, String description) { + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static QC_CHECK_DATA_SOURCE getByValue(int value) { + for (QC_CHECK_DATA_SOURCE type : values()) { + if (type.getValue() == value) { + return type; + } + } + return null; + } + } + + /** + * mes 检验值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_TYPE { + STRING(10, "字符串"), + INTEGER(20, "数值"); + + private int value; + private String description; + + QC_CHECK_VALUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 控制计划审核状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONTROL_PLAN_AUDIT_TYPE { + WAIT_AUDIT(10, "待审核"), + AUDIT_PASS(20, "审核通过"), + AUDIT_NON_PASS(30, "审核驳回"); + + private int value; + private String description; + + CONTROL_PLAN_AUDIT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * edi解析方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EDI_PARSE_TYPE { + JOB(10, "定时任务解析文件"), + SPARE_PARTS(20, "备件excel上传"); + + private int value; + private String description; + + EDI_PARSE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * edi解析方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EDI_REPORT_TYPE { + JSP(1, "jsp解析"), + JSA(2, "jsa解析"); + + private int value; + private String description; + + EDI_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 功能模块 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_MENU_CODE { + + STATION_MONITOR("STATION_MONITOR", "工位监控"); + + private String value; + private String description; + + SRC_MENU_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 缺陷类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DEFECT_TYPE_CODE { + SCRAPPED("SCRAPPED", "报废"), + BACK_SPRAY("BACK_SPRAY", "返喷"), + POLISHING("POLISHING", " 抛光"), + DETERMIND("DETERMIND", " 待定"); + + private String value; + private String description; + + DEFECT_TYPE_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + + /** + * 物料 物料类型1 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CATEGORY1 { + RAW_PART(10, "原材料"), + SEMI_FINISHED_PRODUCT(20, "半成品"), + FINISHED_PRODUCT(30, "成品"); + + private int value; + private String description; + + PART_CATEGORY1(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 查询周期 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUERY_GAP_TYPE { + MINUTE("MINUTE", "分钟"), + HOUR("HOUR", "小时"), + DAY("DAY", " 日"), + WEEK("WEEK", " 周"), + MONTH("MONTH", " 月"); + + private String value; + private String description; + + QUERY_GAP_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 看板-安灯监控状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_QUEUE_STATUS { + CALL(10, "呼叫"), + RESPONSE(20, "响应"), + SOLVE(30, "解决"); + + private int value; + private String description; + + ANDON_QUEUE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 不良品处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BAD_HANDLE_TYPE { + BACK_SPRAY(10, "BACK_SPRAY", "返喷"), + SCRAPPED(20, "SCRAPPED", "报废"), + POLISHING(30, "POLISHING", "抛光"), + DETERMIND(40, "DETERMIND", "待定"); + + private int value; + private String code; + private String description; + + BAD_HANDLE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 展示供应商代码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_SUPPLIER_CODE { + MGN(10, "麦格纳"), + OTHER(20, "其他"), + ALL(99, "全部"); + + private int value; + private String description; + + SHOW_SUPPLIER_CODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static MesEnumUtil.SHOW_SUPPLIER_CODE getByValue(Integer value) { + for (MesEnumUtil.SHOW_SUPPLIER_CODE showSupplierCode : values()) { + if (showSupplierCode.getValue() == value) { + return showSupplierCode; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_PROCESS_CHECK_RESULT_TYPE { + YELLOW(5, "进行中"), + GREEN(10, "合格"), + RED(20, "不合格"); + + private int value; + private String description; + + PRODUCT_PROCESS_CHECK_RESULT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE getByValue(Integer value) { + for (MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE showSupplierCode : values()) { + if (showSupplierCode.getValue() == value) { + return showSupplierCode; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DELIVER_ORDER_MOVE_TYPE { + SHIPING(10, "发运"), + ALLOCATION(20, "发运&调拨"); + + private int value; + private String description; + + DELIVER_ORDER_MOVE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public static MesEnumUtil.DELIVER_ORDER_MOVE_TYPE getByValue(Integer value) { + for (MesEnumUtil.DELIVER_ORDER_MOVE_TYPE showSupplierCode : values()) { + if (showSupplierCode.getValue() == value) { + return showSupplierCode; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_PATTERN_PARAMS { + + MATCH_WORK_ORDER(10, "匹配工单"), + API_WORK_ORDER(20, "读取接口工单"), + SN_WORK_ORDER(30, "获取条码对应工单"); + + private int value; + private String description; + + PRODUCT_PATTERN_PARAMS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_CATEGORY_NAME { + + FL("FL", "前左"), + FR("FR", "前右"), + RL("RL", "后左"), + RR("RR", "后右"); + + private String description; + private String value; + + PRODUCE_CATEGORY_NAME(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 38a7634..b2a2d97 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 @@ -13,22 +13,93 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 物料校验项数据查询类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CHECK_DATA_TYPE { + ALL_DATA(1, "所有数据"), + LAST_DATA(2, "最后一条数据"), + ALL_DATA_AND_LAST_DATA(3, "所有数据且最后一条数据必须合格"); + + private int value; + private String description; + + PART_CHECK_DATA_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + + public String getDescription() { + return description; + } + } + + /** + * 注塑生产操作模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IPC_ACTION_TYPE { + HAND_WORK(10, "10", "手工录入模式"), + PLC_WORK(20, "20", "PLC监听模式"); + + private int value; + private String code; + private String description; + + IPC_ACTION_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 作业程序组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { - MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(20, "展示组件"), - BUTTON_MODULE(30, "按钮组件"), - TIMING_MODULE(40, "定时组件"), - PCS_BACK_MODULE(50, "工序后台组件"), - PLC_CALLBACK_MODULE(60, "PLC回调工位参数"); + MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"), + REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"), + BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"), + TIMING_MODULE(40, "TIMING_MODULE", "定时组件"), + PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"), + PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"), + ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件"); private int value; + private String data; private String description; - WORK_MODULE_TYPE(int value, String description) { + WORK_MODULE_TYPE(int value, String data, String description) { this.value = value; + this.data = data; this.description = description; } @@ -36,6 +107,10 @@ public class MesPcnEnumUtil { return value; } + public String getData() { + return data; + } + public String getDescription() { return description; } @@ -165,7 +240,9 @@ public class MesPcnEnumUtil { public enum METHOD_TYPE { EXEC(10, "执行方法"), - COMPLETE(20, "完成方法"); + COMPLETE(20, "完成方法"), + HNC_ISSUED(30, "队列自动下达"), + LABEL_PROPERTIES(40, "标签属性查询方法"); private int value; private String description; @@ -278,8 +355,9 @@ public class MesPcnEnumUtil { PCN_LOGOUT(190, "PCN_LOGOUT", ""), UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), - PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), - PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"); + PCN_SYS_ALL_LANGUAGE_URL(220, "PCN_SYS_ALL_LANGUAGE_URL", "PCN_SYS_ALL_LANGUAGE_URL"), + PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"), + SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes"); private int value; private String code; @@ -368,6 +446,8 @@ public class MesPcnEnumUtil { public enum MES_TYPE_CFG { DEFECT("DEFECT", "缺陷"), + POLISHING("POLISHING", "抛光"), + DISASSEMBLE("DISASSEMBLE", "拆解"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), @@ -377,7 +457,8 @@ public class MesPcnEnumUtil { EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"), - BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"); + BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"), + SCAN_CT_NO_TYPE("SCAN_CT_NO_TYPE", "料架号扫描校验类型值"); private String value; private String description; @@ -756,7 +837,8 @@ public class MesPcnEnumUtil { public enum MES_WORK_CELL_TYPE { NORMAL(10, "正常"), - REWORK(20, "返修"); + REWORK(20, "返修"), + ON_LINE(30, "上线工位"); private int value; private String description; @@ -1102,7 +1184,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_TYPE { - GET_MES_DATA(1, "pcn获取mes数据"), + GET_MES_DATA(1, "pcn拉取mes数据"), DATA_TO_MES(2, "pcn推送数据至mes"); private int value; @@ -1377,7 +1459,9 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { MATERIAL(10, "MATERIAL", "物料"), - ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"); + ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"), + WORK_ORDER(30, "WORK_ORDER", "工单信息"), + CLOSE(40, "CLOSE", "关闭开线检查"); private int value; private String code; @@ -1835,8 +1919,11 @@ public class MesPcnEnumUtil { EMERGENCY_ORDER(80, "紧急插单"), FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), - REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); + REPRODUCTION_RMS(110, "重新生产-报工"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), + REVERSE_SPRAY_ORDER(130, "反喷工单"), + SPARE_RETURN_REPAIR(140, "客退备件返修"), + SEIZE_SEAT_ORDER(150, "占位工单"); private int value; private String description; @@ -1866,6 +1953,43 @@ public class MesPcnEnumUtil { } /** + * 工单启动池状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_START_CACHE_STATUS { + + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + WORK_START_CACHE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * MesPlanOrder实体对应的planType值 计划类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1991,11 +2115,11 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_STATUS { + WAIT_LANDED(5, "待下达"), NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); private int value; private String description; @@ -2085,6 +2209,16 @@ public class MesPcnEnumUtil { 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; + } } /** @@ -2246,13 +2380,59 @@ public class MesPcnEnumUtil { } /** + * 工步参数类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STEP_PARAM_TYPE { + + QUALIFIED(10, "number", "数字"), + DEFECTED(20, "text", "字符串"), + SCRAPED(30, "select", "可选值"), + BUTTON(40, "button", "按钮"), + WINDOW(50, "window", "开窗"); + + private int value; + private String code; + private String description; + + STEP_PARAM_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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; + } + } + + /** * MesRoute 流程的类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_TYPE { SCAN(10, "扫描流程"), - MONITOR(20, "监控流程"); + MONITOR(20, "监控流程"), + MACHINE(30, "状态机流程"); private int value; private String description; @@ -2465,7 +2645,8 @@ public class MesPcnEnumUtil { public enum PACKAGE_OP_TYPE { PACK(10, "打包"), - UNPACK(20, "拆包"); + UNPACK(20, "拆包"), + STOP_OVER(30, "过站"); private int value; private String description; @@ -2495,6 +2676,39 @@ public class MesPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PRINT_STATUS { + + UNPRINTED(10, "未打印"), + PRINTED(20, "已打印"); + + private int value; + private String description; + + WORK_ORDER_PRINT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PACKAGE_PRINT_STATUS { UNPRINTED(10, "未打印"), @@ -2532,11 +2746,15 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATION_BUSI_TYPE { + GUIDE("guide", "引导信息"), MESSAGE("message", "返回信息"), STEP_LIST("stepList", "工步列表"), STATE_LIST("stateList", "状态列表"), STEP_CONTENT("stepContent", "工步内容"), - MODULE_CONTENT("moduleContent", "组件内容"), + MODULE_CONTENT("moduleContent", "展示组件内容"), + MODULE_HEAD("moduleHead", "展示组件头"), + GUIDE_CONTENT("guideContent", "指导内容"), + ASSISTANT_CONTENT("assistantContent", "辅助展示组件"), CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), @@ -2545,8 +2763,13 @@ public class MesPcnEnumUtil { RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), PROCESS_CONTENT("processContent", "过程组件内容"), TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), + TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), TIME_MODULE_START("timeModuleStart", "定时组件开始"), - TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); + ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"), + ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"), + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), + MESSAGE_POOL("messagePool", "消息池"), + FORCE_LOGOUT("forceLogout", "websocket强制下线"); private String value; private String description; @@ -2592,7 +2815,10 @@ public class MesPcnEnumUtil { FORM("form", "文本按钮"), SPEC_TEXT("spec_text", "工步弹框文本"), IMAGE_LIST("image_list", "图片列表"), - SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"); + MODULE_HEAD("module_head", "展示组件头部"), + MODULE_GUIDE("module_guide", "展示组件知道内容"), + SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"), + BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字"); private String value; private String description; @@ -3395,8 +3621,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FSM_EVENT { TRIGGER(10, "trigger", "触发"), - ENTRY(20, "entry", "进入状态"), - EXIT(30, "exit", "离开状态"); + ENTRY(20, "entry", "进入"), + EXIT(30, "exit", "离开"); private int value; private String code; @@ -3419,47 +3645,119 @@ public class MesPcnEnumUtil { public String getDescription() { return this.description; } + + public static FSM_EVENT getByValue(int value) { + for (FSM_EVENT fsmEvent : values()) { + if (fsmEvent.getValue() == value) { + return fsmEvent; + } + } + return null; + } + + public static String valueOfDescription(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FSM_STATE_TYPE { - BEGIN(10, "begin", "开始状态点"), - BACK(20, "back", "回退状态点"), - END(40, "end", "结束状态点"); + public enum ACTOR_RECEIVE_STRATEGY { + WS_CMD_INIT_MODULE(10, "initModule", "actorReceiveStrategyInitService", "展示组件初始化"), + WS_CMD_DO_SCAN(20, "doScan", "actorReceiveStrategyScanService", "执行扫描"), + WS_CMD_DO_MODULE(30, "doModule", "actorReceiveStrategyModuleService", "展示组件执行方法"), + WS_CMD_DO_FUNCTION(30, "doFunction", "actorReceiveStrategyFunctionService", "展示组件业务功能方法"), + WS_CMD_JUMP_PROCESS(40, "jumpProcess", "actorReceiveStrategyJumpProcessService", "跳过工序"), + WS_CMD_STOP_CELL_MONITOR(50, "stopCellMonitor", "actorReceiveStrategyStopCellMonitorService", "停止执行监听组件"); private int value; private String code; + private String clazz; private String description; - private FSM_STATE_TYPE(int value, String code, String description) { + ACTOR_RECEIVE_STRATEGY(int value, String code, String clazz, String description) { this.value = value; this.code = code; + this.clazz = clazz; this.description = description; } + public static ACTOR_RECEIVE_STRATEGY getByCode(String code) { + for (ACTOR_RECEIVE_STRATEGY strategy : values()) { + if (strategy.getCode().equals(code)) { + return strategy; + } + } + return null; + } + public int getValue() { - return this.value; + return value; } public String getCode() { - return this.code; + return code; + } + + public String getClazz() { + return clazz; } public String getDescription() { - return this.description; + return description; + } + + public static String codeOfClazz(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].clazz; + } + } + return tmp; } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TRIGGER_TYPE { - INNER_TRIGGER(10, "内部触发"), - OUTER_TRIGGER(20, "外部触发"); + public enum STATION_REQUEST_BEAN_CMD { + JUMP_STATE(10, "JUMP_STATE", "跳过状态点"), + FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点"), + FORCE_JUMP_PROCESS(30, "FORCE_JUMP_PROCESS", "通过DOSCAN强制跳过工序"); private int value; + private String code; private String description; - TRIGGER_TYPE(int value, String description) { + STATION_REQUEST_BEAN_CMD(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -3467,21 +3765,28 @@ public class MesPcnEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum STATION_REQUEST_BEAN_CMD { - JUMP_STATE(10, "JUMP_STATE", "跳过状态点"), - FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点"); + public enum STEP_RESULT_CMD { + JUMP_STEP(10, "JUMP_STEP", "跳过工步"), + REDO_PROCESS(20, "REDO_PROCESS", "重做工序"), + JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"), + NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"), + CLEAR_CACHE(50, "CLEAR_CACHE", "工步已清空缓存，执行完工步之后无需放入StationRequestBean"); private int value; private String code; private String description; - STATION_REQUEST_BEAN_CMD(int value, String code, String description) { + STEP_RESULT_CMD(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -3589,7 +3894,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOAD_FSM_ROUTE_TYPE { - BY_PART("0", "通过物料号加载"), + BY_PART("0", "外部加载"), BY_AUTO("1", "自动加载"); private String value; @@ -3620,7 +3925,7 @@ public class MesPcnEnumUtil { } /** - * 组件状态类型 + * 状态机状态点类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATUS_TYPE { @@ -3691,19 +3996,19 @@ public class MesPcnEnumUtil { } /** - * 整体检测结果状态 + * 产线管控-过程检验状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CHECK_REULST { - - PASS(10, "通过"), - NON_PASS(20, "不通过"), - CONCESSION_PRODUCTION(30, "让步生产"); + public enum PROCESS_INSPECTION { + NOT_CREATE(10, "未创建"), + CREATE(20, "已创建"), + PROCESS(30, "执行中"), + COMPLETE(40, "完成"); private int value; private String description; - CHECK_REULST(int value, String description) { + PROCESS_INSPECTION(int value, String description) { this.value = value; this.description = description; } @@ -3728,16 +4033,53 @@ public class MesPcnEnumUtil { } /** - * 生产队列 队列类型 + * 整体检测结果状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QUEUE_ORDER_QUEUE_TYPE { - PRODUCT_QUEUE(10, "生产队列"), - PRELOAD_QUEUE(20, "预装队列"), - FIRST_CELL_QUEUE(30, "首工位队列"); - - private int value; - private String description; + public enum CHECK_RESULT { + + PASS(10, "通过"), + NON_PASS(20, "不通过"), + CONCESSION_PRODUCTION(30, "让步生产"); + + private int value; + private String description; + + CHECK_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 生产队列 队列类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_QUEUE_TYPE { + PRODUCT_QUEUE(10, "生产队列"), + PRELOAD_QUEUE(20, "预装队列"), + FIRST_CELL_QUEUE(30, "首工位队列"); + + private int value; + private String description; QUEUE_ORDER_QUEUE_TYPE(int value, String description) { this.value = value; @@ -3956,7 +4298,8 @@ public class MesPcnEnumUtil { PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), - ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"), + NO_CHECK_SN(50, "NO_CHECK_SN", "不校验条码"); private int value; private String code; @@ -4022,8 +4365,11 @@ public class MesPcnEnumUtil { public enum PRODUCE_ERROR_RECORD { JUMP_PROCESS(10, "跳过工序"), JUMP_STEP(20, "跳过工步"), + JUMP_STEP_IN_STATE(25, "跳过状态点中的工步"), JUMP_STATE(30, "跳过状态点"), - ABNORMAL_DEDUCTION(40, "扣减异常"); + ABNORMAL_DEDUCTION(40, "扣减异常"), + REDO_STATION(50, "工位重做"), + RELEASE(60, "放行继续"); private int value; private String description; @@ -4192,52 +4538,6 @@ public class MesPcnEnumUtil { } /** - * MES_生产队列散件清单 选配类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_OPTION_TYPE { - - OPTION_PART(1, "选配件"), - BOM_DISASSEMBLY(2, "BOM拆解"); - - private int value; - private String description; - - MES_OPTION_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static Integer descriptionOfValue(String description) { - Integer tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 绑定模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4335,9 +4635,29 @@ public class MesPcnEnumUtil { return tmp; } + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + public static String valueOfDescription(int val) { return valueOf(val); } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } } /** @@ -4564,4 +4884,1844 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PTL_IS_LIGHT { + + IS_PICK_LIGHT(10, "不需亮灯"); + + private int value; + private String description; + + MES_PTL_IS_LIGHT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PHOTO_EXTRACT_STATUS { + NEED_SYNC_DATA(10, "待同步数据"), + ALREADY_SYNC_DATA(20, "已同步数据"); + + private int value; + private String description; + + PHOTO_EXTRACT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GET_AND_SET { + GET(10, "get"), + SET(20, "set"); + + private int value; + private String description; + + GET_AND_SET(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_BUSI_TYPE { + AGV_EMERGENCY_STOP(10, "紧急停止"), + AGV_EMERGENCY_RESET(20, "急停复位"), + AGV_DELAY_HELP(30, "延时帮助"); + + private int value; + private String description; + + PLC_BUSI_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_TYPE { + STANDARD(10, "标准"), + EQU_WORKING_SIGNAL(20, "设备作业信号"); + + private int value; + private String description; + + PLC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + } + + /** + * mes设备状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_STATUS { + + INUSE(10, "在用"), + SPARE(20, "停止"), + FAULT(30, "故障"), + SERVICE(40, "检修"), + STOPUSING(50, "暂停"); + + private int value; + private String description; + + MES_EQUIPMENT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * JIT队列锁定池 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIT_LOCK_CACHE_STATUS { + CREATE(10, "创建"), + RELEASE(20, "下达"), + ONLINE_COMPLETE(30, "上线完成"); + + private Integer value; + private String description; + + JIT_LOCK_CACHE_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * JIT队列锁定池 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ASSISTANT_MODULE_DISPLAY { + MULTIMEDIA_PLUG(10, "多媒体插头"), + ATTENTION_INFO(20, "关注内容"); + + private Integer value; + private String description; + + ASSISTANT_MODULE_DISPLAY(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 排程记录 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCHEDULING_RECORD_STATUS { + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private Integer value; + private String description; + + SCHEDULING_RECORD_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 产品特性 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_TRAIT { + NORMAL(10, "正常件"), + FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"), + FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"), + FICTIVE(40, "虚拟件"); + + private int value; + private String description; + + PART_TRAIT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STEP_DISPLAY_CLASS { + WHITE(10, "white"), + LIGHT_BLUE(20, "lightBlue"); + + private Integer value; + private String description; + + STEP_DISPLAY_CLASS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROMPT_SOUND { + SUCCESS(10, "扫描成功"), + FAILURE(20, "扫描失败"); + + private Integer value; + private String description; + + PROMPT_SOUND(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 事务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TRANS_TYPE { + + OUTSTOCK(10, "出库"), + INSTOCK(20, "入库"), + GOBACK(30, "退回"); + + private int value; + private String description; + + PACKAGE_TRANS_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TRANS_STATUS { + + CREATE(10, "创建"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + PACKAGE_TRANS_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_SAMPLE_TYPE { + + NORMAL(10, "正常batch"), + FIRST(20, "首件"), + MIDDLE(30, "中件"), + LAST(40, "末件"); + + private int value; + private String description; + + PACKAGE_SAMPLE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + + } + + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + CANCEL(30, "取消"), + OFFLINE(40, "下线"), + SHIPMENT(50, "发运"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 涂装导入--反喷标识（Y-正常；F-反喷） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REVERSE_SPRAY_MARK { + REVERSE_SPRAY("F", "反喷"), + NORMAL("Y", "正常"); + + private String value; + private String description; + + REVERSE_SPRAY_MARK(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 是否展示放空队列 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_VENTING_QUEUE { + CREATE(10, "显示"), + SHIPMENT(20, "不显示"); + + private int value; + private String description; + + SHOW_VENTING_QUEUE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 过程检测数据源类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_DATA_SOURCE { + MANUAL_INPUT(10, "10", "人工输入"), + DB(30, "30", "数据库"), + PLC(20, "20", "PLC"); + + private int value; + private String description; + private String code; + + QC_CHECK_DATA_SOURCE(int value, String code, String description) { + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 过程检测检测对象数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_TYPE { + STRING(10, "字符串"), + INTEGER(20, "数值"); + + private int value; + private String description; + + QC_CHECK_VALUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 过程检测检测检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_RESULT { + OK(10), + NOT_OK(20), + MANUAL(30); + + private int value; + + QC_CHECK_VALUE_RESULT(int value) { + this.value = value; + } + + public int getValue() { + return value; + } + } + + /** + * 队列 料架摆放位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_SIDE { + POSITIVE(10, "A", "正面"), + REVERSE_SIDE(20, "B", "背面"); + + private Integer value; + private String code; + private String description; + + GROUP_SIDE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 过程检测检测检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_MONITOR_OBJECT_TYPE { + ORGANIZE("10"), + WORK_SHOP("20"), + WORK_CENTER("30"); + + private String value; + + BOARD_MONITOR_OBJECT_TYPE(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + } + + /** + * 中航DB数据检查配置-DB复核项 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DB_DATA_CHECK_ITEM { + PART_NO_NULL(10, "物料为空复核"), + PART_NO_ORDER(20, "零件工单匹对复核"), + SERIA_LNUMBER_REPEAT(30, "过程条码重复复核"), + SERIA_LNUMBER_NULL(40, "过程条码为空复核"), + PRODUCT_SN_REPEAT(50, "产品二维码重复复核"), + PRODUCT_SN_NULL(60, "产品二维码为空复核"), + KEY_DATA_FILED_NULL(70, "质量关键字段为空复核"), + QC_FAIL_MAX_COUNT(80, "缺陷类型连续超过设定数复核"); + + private int value; + private String description; + + MES_DB_DATA_CHECK_ITEM(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 客户JIT生产队列特殊标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + NORMAL(10, "正常"), + EMPTYING(20, "放空"), + ERR_PERCH(30, "异常占位"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_CATEGORY_NAME { + + FL("FL", "前左"), + FR("FR", "前右"), + RL("RL", "后左"), + RR("RR", "后右"); + + private String description; + private String value; + + PRODUCE_CATEGORY_NAME(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 设备自动报警 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQU_AUTO_ALARM_TYPE { + + NORMAL(10, "正常"), + RUNNING(20, "正在运行"), + ERROR(30, "发生异常"); + + private String description; + private Integer value; + + EQU_AUTO_ALARM_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + + /** + * 过程检测数据源类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LINE_OPERATION_TYPE { + DB(10, "数据库"), + PLC(20, "PLC"); + + private int value; + private String description; + + LINE_OPERATION_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 产线监控业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CENTER_MONITOR_BUSI_TYPE { + EQU_ALARM(10, "设备自动报警"); + + private int value; + private String description; + + WORK_CENTER_MONITOR_BUSI_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 功能模块 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_MENU_CODE { + + STATION_MONITOR("STATION_MONITOR", "工位监控"); + + private String value; + private String description; + + SRC_MENU_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 弹窗异常提醒记录 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXCEPTION_WINDOW_RECORD_STATUS { + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private Integer value; + private String description; + + EXCEPTION_WINDOW_RECORD_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 设备故障等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAKET_LEVEL_CODE { + NORMAL(10, "A", "不需要报警和安灯处理"), + ALARM_CALL_ANDON(20, "B", "不需要报警,安灯记录"), + CALL_ANDON(30, "C", "安灯记录"), + FORCE_ANDON(40, "D", "强制ANDON呼叫"), + STOPLINE_FORCE_ANDON(50, "E", "系统进行记录并停线,强制ANDON呼叫"); + + private Integer value; + private String code; + private String description; + + TAKET_LEVEL_CODE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 图片展示类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IMG_DISPLAY_TYPE { + STEP(10, "按工步显示"), + WORK_CELL(20, "按工位显示"); + + private Integer value; + private String description; + + IMG_DISPLAY_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 工位线程类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PCN_THREAD_TYPE { + STEP(10, "跟随工步线程"), + PROCESS(20, "跟随工序线程"), + MODULE(30, "跟随展示组件线程"); + + private Integer value; + private String description; + + PCN_THREAD_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 控制计划审核状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONTROL_PLAN_AUDIT_TYPE { + WAIT_AUDIT(10, "待审核"), + AUDIT_PASS(20, "审核通过"), + AUDIT_NON_PASS(30, "审核驳回"); + + private int value; + private String description; + + CONTROL_PLAN_AUDIT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 预装产线，工位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRE_WORK_CENTER_CODE { + OP10("OP10", "OP10"), + OP20A("OP20a", "OP20a"), + OP20B("OP20b", "OP20b"); + + private String code; + private String description; + + PRE_WORK_CENTER_CODE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static PRE_WORK_CENTER_CODE getByCode(String code) { + for (PRE_WORK_CENTER_CODE workCenterCode : values()) { + if (workCenterCode.getCode().equals(code)) { + return workCenterCode; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIS_BACKFLUSH_STATUS { + BACKFLUSH("BACKFLUSH", "正常回冲扣减"), + REPAIR("REPAIR", "返修冲料"); + + private String value; + private String description; + + JIS_BACKFLUSH_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkCellJumpRecord 跳过类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_JUMP_TYPE { + + SERIAL_SN(10, "过程条码"), + PRODUCT_SN(20, "产品条码"), + PACK_SN(30, "包装条码"), + OTHER(40, "其他"); + + private int value; + private String description; + + MES_WORK_CELL_JUMP_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 扭矩枪版本 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TORQUE_VERSION { + PF6_2_0("PF6-2.0", "002000010030 00 \0", "PF6 2.0"), + PF6_3_0("PF6-3.0", "002000010060 00 \0", "PF6 3.0"); + + private String value; + private String code; + private String description; + + TORQUE_VERSION(String code, String value, String description) { + this.code = code; + this.value = value; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static TORQUE_VERSION getByCode(String code) { + for (TORQUE_VERSION torqueVersion : values()) { + if (torqueVersion.getCode().equals(code)) { + return torqueVersion; + } + } + return null; + } + } + + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_CATEGORY { + + FL("FL", "DOOR_FRONT_LEFT"), + FR("FR", "DOOR_FRONT_RIGHT"), + RL("RL", "DOOR_REAR_LEFT"), + RR("RR", "DOOR_REAR_RIGHT"); + + private String description; + private String value; + + PRODUCE_CATEGORY(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 看板类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_TYPE { + BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), + BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), + BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), + BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), + BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), + BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"), + BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"), + BOARD_MGN_BJ_MAIN_SCREEN("BOARD_MGN_BJ_MAIN_SCREEN", "北京麦格纳总屏幕看板"), + BOARD_MGN_BJ_EQU_REPAIR("BOARD_MGN_BJ_EQU_REPAIR", "北京麦格纳设备维修看板"); + + private String code; + private String description; + + BOARD_TYPE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static BOARD_TYPE getByCode(String code) { + for (BOARD_TYPE boardType : values()) { + if (boardType.getCode().equals(code)) { + return boardType; + } + } + return null; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 运算对象代码 Period capacity + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATE_OBJECT_CODE { + ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"), + ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"), + WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"), + EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"), + PERIOD_CAPACITY("PERIOD_CAPACITY", "时段产能"); + + private String value; + private String description; + + OPERATE_OBJECT_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static OPERATE_OBJECT_CODE getByValue(String value) { + for (OPERATE_OBJECT_CODE objectCode : values()) { + if (objectCode.getValue().equals(value)) { + return objectCode; + } + } + return null; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HQL_EXPRESSION { + GT(">", ">", "大于"), + LT("<", "<", "小于"), + EQ("=", "=", "等于"), + NEQ("!=", "!=", "不等于"), + GTE(">=", ">=", "大于等于"), + LTE("<=", "<=", "小于等于"), + LIKE("like", "like", "LIKE"), + IN("in", "in", "包含"); + + private String value; + private String code; + private String description; + + HQL_EXPRESSION(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOfDesc(String val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + return values()[i].description; + } + } + return null; + } + + public static HQL_EXPRESSION codeOf(String value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + return values()[i]; + } + } + return null; + } + } + + /** + * 排序校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOOLING_ACTION_RECORD_TYPE { + REPLACE(10, "REPLACE", "更换"), + WAREHOUSE(20, "WAREHOUSE", "入库"), + Use(30, "Use", "领用"), + ERROR(40, "ERROR", "异常操作"); + + private int value; + private String code; + private String description; + + TOOLING_ACTION_RECORD_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 看板-安灯监控状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_QUEUE_STATUS { + CALL(10, "呼叫"), + RESPONSE(20, "响应"), + SOLVE(30, "解决"); + + private int value; + private String description; + + ANDON_QUEUE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 用户登陆状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_LOGIN_STATUS { + ONLINE(10, "在线"), + OFFLINE(20, "离线"); + + private int value; + private String description; + + USER_LOGIN_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum THA_MONITOR_STATUS { + MONITORING(10, "MONITORING", "监听中"), + MONITOR_COMPLETE(20, "MONITOR_COMPLETE", "监听完成"); + + private int value; + private String code; + private String description; + + THA_MONITOR_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** + * 工位等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_GRADE { + ORDINARY(10, "普通工位"), + MONITOR(20, "监听工位"); + + private int value; + private String description; + + MES_WORK_CELL_GRADE(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 质检取值字段类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_FILED_TYPE { + NUMBER(10, "数字"), + STRING(20, "字符串"); + + private int value; + private String description; + + QC_FILED_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 6fbf7bc..7c63db2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -816,4 +816,102 @@ public class PtlEnumUtil { } } + /** + * 完成器音乐枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINISH_TAG_LIGHT_MUSIC_CMD { + FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"), + FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"), + FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"), + FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"), + FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"), + FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"), + FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"), + FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"), + FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"), + FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"), + FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"), + FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss"); + + private String code; + private Integer value; + private String description; + + FINISH_TAG_LIGHT_MUSIC_CMD(String code, Integer value, String description) { + this.code = code; + this.value = value; + this.description = description; + } + + public static String valueOf(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].code; + } + } + return tmp; + } + + public String getCode() { + return code; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + } + + /** + * 标签显示器亮灯颜色枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAG_LIGHT_COLOR_CMD { + TAG_LIGHT_COLOR_RED("00", 1, "红"), + TAG_LIGHT_COLOR_GREEN("01", 2, "绿"), + TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"), + TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"), + TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"), + TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿"); + + private String code; + private Integer value; + private String description; + + TAG_LIGHT_COLOR_CMD(String code, Integer value, String description) { + this.code = code; + this.value = value; + this.description = description; + } + + public static String valueOf(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].code; + } + } + return tmp; + } + + public String getCode() { + return code; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 9c85618..1dda378 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -15,6 +15,37 @@ public class PtlPcnEnumUtil { * 状态机异常处理状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINISH_PICK_SEND_FLAG { + SECTION(10, "10", "区段"), + AREA(10, "20", "区域"); + + private int value; + private String code; + private String description; + + FINISH_PICK_SEND_FLAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** + * 状态机异常处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS { TRUE(10, "已处理"), FALSE(20, "未处理"); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java new file mode 100644 index 0000000..2a1a32a --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java @@ -0,0 +1,721 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import java.math.BigDecimal; +import java.net.URL; +import java.sql.*; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午5:16 + * @desc + */ +public class ScreenEnumUtil { + + public enum DATA_OBJECT_SOURCE { + TABLE(1, "TABLE", "数据库表"), + VIEW(2, "VIEW", "数据库视图"); + + private Integer value; + private String code; + private String description; + + DATA_OBJECT_SOURCE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer codeOfValue(String code) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static DATA_OBJECT_SOURCE valueOfEnum(Integer value) { + DATA_OBJECT_SOURCE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + return tmp; + } + } + + public enum SCREEN_TYPE { + PC(10, "PC", "PC端"), + PDA(20, "PDA", "PDA手持端"); + + private Integer value; + private String code; + private String description; + + SCREEN_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum ACTION_TYPE { + FRONT(10, "FRONT", "前端"), + BACKEND(20, "BACKEND", "后端"); + + private Integer value; + private String code; + private String description; + + ACTION_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum NULLABLE { + YES(10, "YES", "允许为空"), + NO(20, "NO", "不允许为空"); + + private Integer value; + private String code; + private String description; + + NULLABLE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static NULLABLE valueOfEnum(Integer value) { + NULLABLE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + return tmp; + } + } + + public enum INDEX_TYPE { + PRIMARY(10, "PRIMARY", "主键"), + NORMAL(20, "NORMAL", "普通索引"), + UNIQUE(30, "UNIQUE", "唯一键"); + + private Integer value; + private String code; + private String description; + + INDEX_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum DEFAULT_FIELD_IN_DB { + CREATE_DATE_TIME("createDatetime", "create_date_time", "创建时间"), + MODIFY_DATE_TIME("modifyDatetime", "modify_date_time", "修改时间"), + IS_VALID("isValid", "is_valid", "是否有效"), + IS_DELETED("isDeleted", "is_deleted", "是否弱删"); + + private String code; + private String codeDb; + private String description; + + DEFAULT_FIELD_IN_DB(String code, String codeDb, String description) { + this.code = code; + this.codeDb = codeDb; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getCodeDb() { + return codeDb; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum LAYOUT_TYPE { + SCREEN(10, "SCREEN", "Screen布局"), + PANEL(20, "PANEL", "Panel布局"); + + private Integer value; + private String code; + private String description; + + LAYOUT_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum DATASOURCE_CONNECTION_STATUS { + SUCCESS(10, "success", "连接成功"), + FAILED(20, "failed", "连接失败"); + + private Integer value; + private String code; + private String description; + + DATASOURCE_CONNECTION_STATUS(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum ACTION { + SEARCH(10, "search", "查询", "scrSearchActionStrategy"), + CREATE(20, "create", "保存", "scrCreateActionStrategy"), + UPDATE(30, "update", "更新", "scrUpdateActionStrategy"), + DELETE(40, "delete", "删除", "scrDeleteActionStrategy"), + VALID(50, "valid", "启用", "scrValidActionStrategy"), + INVALID(60, "invalid", "禁用", "scrInvalidActionStrategy"), + SEARCH_PAGER(70, "searchPager", "分页查询", "scrSearchPagerActionStrategy"), + ENUM(80, "enum", "枚举查询", "scrEnumActionStrategy"), + DIRECT(90, "direct", "跳转", "scrDirectActionStrategy"), + DOWNLOAD(100, "download", "下载", "scrDownloadActionStrategy"), + UPLOAD(110, "upload", "上传", "scrUploadActionStrategy"), + INVOKE(120, "invoke", "调用", "scrInvokeActionStrategy"); + + private Integer value; + private String code; + private String description; + private String beanName; + + ACTION(Integer value, String code, String description, String beanName) { + this.value = value; + this.code = code; + this.description = description; + this.beanName = beanName; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String beanOfCode(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equalsIgnoreCase(code)) { + tmp = values()[i].beanName; + } + } + return tmp; + } + + public static ACTION codeOfEnum(String code) { + ACTION tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equalsIgnoreCase(code)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + + public enum COMMUNICATION_TYPE { + HTTP(10, "HTTP", "Http"), + WEBSOCKET(20, "WEBSOCKET", "WebSocket"); + + private Integer value; + private String code; + private String description; + + COMMUNICATION_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum DATA_RESOURCE_TYPE { + ENUM(10, "enum", "枚举"), + WEBSOCKET(20, "WEBSOCKET", "WebSocket"); + + private Integer value; + private String code; + private String description; + + DATA_RESOURCE_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum MODEL_TYPE { + DATA_OBJECT(10, "DATA_OBJECT", "数据库对应类型"), + INNER_MODEL(20, "INNER_MODEL", "程序内部对应类型"); + + private Integer value; + private String code; + private String description; + + MODEL_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum DATETIME_FORMAT { + DATETIME(10, "yyyy-MM-dd HH:mm:ss", "日期"), + DATE(20, "yyyy-MM-dd", "日期"), + TIME(30, "HH:mm:ss", "时间"), + TIME_NO_SECOND(40, "HH:mm", "时间（无秒）"); + + + private Integer value; + private String code; + private String description; + + DATETIME_FORMAT(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum MODEL_FIELD_DATASOURCE { + FROM_TEXT(10, "TEXT", "文本"), + FROM_NUMBER(20, "NUMBER", "数字"), + FROM_PASSWORD(30, "PASSWORD", "密码"), + FROM_DATETIME(40, "DATETIME", "时间"), + FROM_PICK_UP(50, "PICK_UP", "拾取"), + FROM_ENUM(60, "ENUM", "枚举"), + FROM_DICTIONARY(70, "DICTIONARY", "字典"), + FROM_API(80, "API", "API调用"); + + private Integer value; + private String code; + private String description; + + MODEL_FIELD_DATASOURCE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum AUTH_TYPE { + ROW(10, "ROW", "行"), + COLUMN(20, "COLUMN", "列"); + + private Integer value; + private String code; + private String description; + + AUTH_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum JDBC_TYPES { + BIT(Types.BIT, "BIT", Boolean.class), + TINYINT(Types.TINYINT, "TINYINT", Byte.class), + SMALLINT(Types.SMALLINT, "SMALLINT", Short.class), + INTEGER(Types.INTEGER, "INTEGER", Integer.class), + BIGINT(Types.BIGINT, "BIGINT", Long.class), + FLOAT(Types.FLOAT, "FLOAT", Double.class), + REAL(Types.REAL, "REAL", Float.class), + DOUBLE(Types.DOUBLE, "DOUBLE", Double.class), + NUMERIC(Types.NUMERIC, "NUMERIC", BigDecimal.class), + DECIMAL(Types.DECIMAL, "DECIMAL", BigDecimal.class), + CHAR(Types.CHAR, "CHAR", String.class), + VARCHAR(Types.VARCHAR, "VARCHAR", String.class), + LONGNVARCHAR(Types.LONGNVARCHAR, "LONGNVARCHAR", String.class), + DATE(Types.DATE, "DATE", Date.class), + TIME(Types.TIME, "TIME", Time.class), + TIMESTAMP(Types.TIMESTAMP, "TIMESTAMP", Timestamp.class), + BINARY(Types.BINARY, "BINARY", Byte[].class), + VARBINARY(Types.VARBINARY, "VARBINARY", Byte[].class), + LONGVARBINARY(Types.LONGVARBINARY, "LONGVARBINARY", Byte[].class), + STRUCT(Types.STRUCT, "STRUCT", Struct.class), + ARRAY(Types.ARRAY, "ARRAY", Array.class), + BLOB(Types.BLOB, "BLOB", Blob.class), + CLOB(Types.CLOB, "CLOB", Clob.class), + REF(Types.REF, "REF", Ref.class), + DATALINK(Types.DATALINK, "DATALINK", URL.class), + BOOLEAN(Types.BOOLEAN, "BOOLEAN", Boolean.class), + NCHAR(Types.NCHAR, "NCHAR", String.class), + NVARCHAR(Types.NVARCHAR, "NVARCHAR", String.class), + LONGVARCHAR(Types.LONGVARCHAR, "LONGVARCHAR", String.class), + NCLOB(Types.NCLOB, "NCLOB", NClob.class), + SQLXML(Types.SQLXML, "SQLXML", String.class); + + private Integer value; + private String code; + private Class clazz; + + JDBC_TYPES(Integer value, String code, Class clazz) { + this.value = value; + this.code = code; + this.clazz = clazz; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public Class getClazz() { + return clazz; + } + + public static Integer valueOfCode(String code) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static JDBC_TYPES valueOfEnum(Integer value) { + JDBC_TYPES tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i]; + } + } + return tmp; + } + } + + +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index fd9784a..fca896c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class SwebEnumUtil { /** - * 单据主表状态(ASN,PO,MOVE,QC) + * 采购单据主表状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_MASTER_STATUS { @@ -136,6 +136,235 @@ public class SwebEnumUtil { } /** + * 单据条码状态（PO/DOC_MOVE） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_SN_STATUS { + CREATE(10, "N", "创建"), + RECEIPTED(20, "R", "已完成"), + CANCEL(30, "C", "行取消"); + + private int value; + private String code; + private String description; + + ORDER_SN_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 委外单据主表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVEMENT_MASTER_STATUS { + CREATE(10, "CREATE", "新建"), + PRINTED(20, "PRINTED", "已打印"), + DELIVERY(30, "DELIVERY", "已发货"); + + private int value; + private String code; + private String description; + + MOVEMENT_MASTER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 委外订单明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVEMENT_DETAILS_STATUS { + CREATE(10, "CREATE", "新建"), + PRINTED(20, "PRINTED", "已打印"), + DELIVERY(30, "DELIVERY", "已发货"); + + private int value; + private String code; + private String description; + + MOVEMENT_DETAILS_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * PO订单来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_SOURCE { + WMS(10, "WMS", "WMS"), + SWEB(20, "SWEB", "SWEB"); + + private int value; + private String code; + private String description; + + ORDER_SOURCE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 包装类型枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -649,59 +878,6 @@ public class SwebEnumUtil { } /** - * 单据条码状态（PO/DOC_MOVE） - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_SN_STATUS { - CREATE(10, "N", "创建"), - RECEIPTED(20, "R", "已完成"), - CANCEL(30, "C", "行取消"), - PRINTED(40, "C", "已打印"); - - private int value; - private String code; - private String description; - - ORDER_SN_STATUS(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getCode() { - return code; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 条码类型 10=实物条码，20=虚拟条码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 6b820ef..09a9a27 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 @@ -263,6 +263,7 @@ public class WmsEnumUtil { this.description = description; } + public int getValue() { return value; } @@ -300,6 +301,62 @@ public class WmsEnumUtil { } } + + /** + * 单据主表状态(ASN,PO,MOVE,QC,SO) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PICKING_MASTER_ORDER_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "已生成"), + FAILED(30, "RECEIPT_FINISH", "生成失败"); + + private int value; + private String code; + private String description; + + PICKING_MASTER_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** * 收货状态 */ @@ -307,7 +364,7 @@ public class WmsEnumUtil { public enum REC_STATUS_KANBAN { TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"), RECEIVING(20, "RECEIVING", "收货中"), - DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"), + DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟"), COMPLETED(40, "COMPLETED", "已完成"); private int value; @@ -668,6 +725,10 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /** @@ -740,7 +801,7 @@ public class WmsEnumUtil { SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"), SCATTERED_IN(60, "SCATTERED_IN", "零星入库"), NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"), - SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR + SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货(DMR)"),//默认DMR CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"), PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"), INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"), @@ -780,6 +841,7 @@ public class WmsEnumUtil { KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), + FINISH_PRODUCT_SHPING_NEW(480, "FINISH_PRODUCT_SHPING_NEW", "成品发运-新业务类型"), KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), @@ -799,7 +861,20 @@ public class WmsEnumUtil { PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK(640, "PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK", "零件号转化物料出库"), INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"), CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"), - MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"); + MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"), + PROD_SCRAP(680, "PROD_SCRAP", "生产报废"), + OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"), + OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"), + WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), + WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), + OTHER_IN(730, "OTHER_IN", "其它入库"), + OTHER_OUT(740, "OTHER_OUT", "其它出库"), + COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"), + SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), + COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR + PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库"), + SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库");//默认DMR + private int value; private String code; private String description; @@ -1386,7 +1461,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_STRATEGY_TYPE { - PART_COVERAGE(110, "物料分类覆盖"), + MATERIAL_PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), ZORE_STOCK(130, "零库存"), MATERIAL_COVERAGE(140, "物料覆盖"); @@ -1583,6 +1658,11 @@ public class WmsEnumUtil { return description; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -1719,6 +1799,7 @@ public class WmsEnumUtil { public enum QC_STATUS { INSPECTION_FREE(10, "免检"), PENDING_QUALITY_INSPECTION(20, "待质检"), + DELAYED_NON_QC(40, "延迟"), QUALITY_INSPECTION_COMPLETED(30, "质检完成"); private int value; @@ -1819,6 +1900,89 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + } + + /** + * PO 单据质检状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_QC_STATUS { + INQUALITY(10, "INQUALITY", "质检中"), + NORMAL(20, "NORMAL", "合格"), + ABNORMAL(30, "ABNORMAL", "不合格"); + private int value; + private String code; + private String description; + + private PO_QC_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static PO_QC_STATUS codeOfs(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /** @@ -2272,6 +2436,21 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** @@ -2288,7 +2467,9 @@ public class WmsEnumUtil { MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"), QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"), - INITIALIZE_SN("INITIALIZE_SN", "库存初始化"); + INITIALIZE_SN("INITIALIZE_SN", "库存初始化"), + IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号"), + PRINT_PACKAGE_NO_SERIAN("PRINT_PACKAGE_NO_SERIAN", "包装编号序列化"); private String code; private String description; @@ -2386,7 +2567,8 @@ public class WmsEnumUtil { TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"), BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"), - BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"); + BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"), + PDA_BTN(90, "PDA_BTN", "PDA按钮"); private String code; private String description; @@ -3964,7 +4146,7 @@ public class WmsEnumUtil { public enum INVENTORY_DIFFERENCE_TYPE { INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"), INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"), - INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"), + INVENTORY_WIN(30, "INVENTORY_WIN", "盘盈"), INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"), INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘"); @@ -4219,7 +4401,8 @@ public class WmsEnumUtil { REPORT(10, "REPORT", "生产报工"), BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"), REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销"), - PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"); + PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"), + SHIP_CHECK(50, "SHIP_CHECK", "发运校验"); private int value; private String code; @@ -4699,6 +4882,55 @@ public class WmsEnumUtil { } } + + /** + * 客户发运 发运数量控制逻辑 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCK_FIFO_SN_TYPE { + SHIP_FLAG(10, "客户发运"), + OVER_SEND(20, "多发"), + CONSISTENT(30, "一致"), + NO_CONTROL(40, "不控制"), + OVER_ONE_BOX(50, "多一箱"); + + + private int value; + private String description; + + LOCK_FIFO_SN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static LOCK_FIFO_SN_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * 拉动方式维护 * 默认为 10 @@ -4710,7 +4942,8 @@ public class WmsEnumUtil { LINE_PULL(30, "巡线拉动"), PLANNED_PULL(40, "计划拉动"), ANDON_PULL(50, "安灯拉动"), - EXTERNAL_PULL(60, "手工拉动"); + EXTERNAL_PULL(60, "手工拉动"), + WORKORDER_PULL(70, "工单拉动"); private int value; private String description; @@ -4944,17 +5177,23 @@ public class WmsEnumUtil { /** - * 是否贵重物料 - * 默认为2 + * 生产计划主表计划状态 + * 默认为 10 */ - public enum IS_VALUABLE { - TRUE(1, "贵重物料"), FALSE(2, "非贵重物料"); + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PLAN_STATUS { + CREATE(10, "CREATE", "创建"), + PLANNED(20, "PLANNED", "处理中"), + FINISH(25, "FINISH", "已完成"), + CLOSE(30, "CLOSE", "已关闭"); private int value; + private String code; private String description; - IS_VALUABLE(int value, String description) { + WORK_ORDER_PLAN_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -4966,7 +5205,11 @@ public class WmsEnumUtil { return description; } - public static String valueOfDescription(int val) { + public String getCode() { + return code; + } + + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -4976,7 +5219,7 @@ public class WmsEnumUtil { return tmp; } - public static int descriptionOfValue(String desc) { + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { if (values()[i].description.equals(desc)) { @@ -4985,23 +5228,22 @@ public class WmsEnumUtil { } return tmp; } - } /** - * 计划拉动明细表状态创建 + * 生产工单类型 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PULL_TASK_DETAILS_STATUS { - BE_HANDLE(10, "BE_HANDLE", "待处理"), - CANCELLATION(20, "CANCELLATION", "已处理"); + public enum WORK_ORDER_PLAN_TYPE { + REPORT(10, "REPORT", "生产报工"), + PACKING(20, "PACKING", "打箱包装"); private int value; private String code; private String description; - PULL_TASK_DETAILS_STATUS(int value, String code, String description) { + WORK_ORDER_PLAN_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -5041,23 +5283,17 @@ public class WmsEnumUtil { } /** - * 计划拉动主表状态创建 - * 默认为 10 + * 是否贵重物料 + * 默认为2 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PULL_TASK_MASTER_STATUS { - CREATE(10, "CREATE", "创建"), - ENABLED(20, "ENABLED", "已启动"), - COMPLETE(30, "COMPLETE", "已完成"), - CLOSE(40, "CLOSE", "已关闭"); + public enum IS_VALUABLE { + TRUE(1, "贵重物料"), FALSE(2, "非贵重物料"); private int value; - private String code; private String description; - PULL_TASK_MASTER_STATUS(int value, String code, String description) { + IS_VALUABLE(int value, String description) { this.value = value; - this.code = code; this.description = description; } @@ -5069,11 +5305,7 @@ public class WmsEnumUtil { return description; } - public String getCode() { - return code; - } - - public static String valueOf(int val) { + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -5083,7 +5315,7 @@ public class WmsEnumUtil { return tmp; } - public static int descOf(String desc) { + public static int descriptionOfValue(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { if (values()[i].description.equals(desc)) { @@ -5092,6 +5324,7 @@ public class WmsEnumUtil { } return tmp; } + } /** @@ -5099,13 +5332,119 @@ public class WmsEnumUtil { * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum VENDOR_TYPE { - VENDOR(10, "供应商"), CARRIERS(20, "承运商"); + public enum PULL_TASK_DETAILS_STATUS { + BE_HANDLE(10, "BE_HANDLE", "待处理"), + CANCELLATION(20, "CANCELLATION", "已处理"); private int value; + private String code; private String description; - VENDOR_TYPE(int value, String description) { + PULL_TASK_DETAILS_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 计划拉动主表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_TASK_MASTER_STATUS { + CREATE(10, "CREATE", "创建"), + ENABLED(20, "ENABLED", "已启动"), + COMPLETE(30, "COMPLETE", "已完成"), + CLOSE(40, "CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + PULL_TASK_MASTER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 计划拉动明细表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VENDOR_TYPE { + VENDOR(10, "供应商"), CARRIERS(20, "承运商"); + + private int value; + private String description; + + VENDOR_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -5261,13 +5600,17 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PICKING_EXECUTE_STATUS { - IN_PROGRESS(1, "执行中"), EXPIRED(2, "已超期"), NORMAL(3, "正常"); + IN_PROGRESS(1,"IN_PROGRESS", "执行中"), + EXPIRED(2,"EXPIRED", "已超期"), + NORMAL(3,"NORMAL", "正常"); private int value; + private String code; private String description; - PICKING_EXECUTE_STATUS(int value, String description) { + PICKING_EXECUTE_STATUS(int value,String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -5275,6 +5618,10 @@ public class WmsEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -6188,19 +6535,21 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WEEK_TYPE { - MONDAY(20, "星期一"), - TUESDAY(30, "星期二"), - WEDNESDAY(40, "星期三"), - THURSDAY(50, "星期四"), - FRIDAY(60, "星期五"), - SATURDAY(70, "星期六"), - SUNDAY(10, "星期日"); + MONDAY(20, 1, "星期一"), + TUESDAY(30, 2, "星期二"), + WEDNESDAY(40, 3, "星期三"), + THURSDAY(50, 4, "星期四"), + FRIDAY(60, 5, "星期五"), + SATURDAY(70, 6, "星期六"), + SUNDAY(10, 0, "星期日"); private final int value; + private final int code; private final String description; - WEEK_TYPE(int value, String description) { + WEEK_TYPE(int value, int code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -6208,6 +6557,10 @@ public class WmsEnumUtil { return value; } + public int getCode() { + return code; + } + public String getDescription() { return description; } @@ -6230,6 +6583,15 @@ public class WmsEnumUtil { } return tmp; } + + public static int getValByCode(int code) { + for (int i = 0; i < values().length; i++) { + if (values()[i].code == code) { + return values()[i].value; + } + } + return 0; + } } /** @@ -6297,7 +6659,12 @@ public class WmsEnumUtil { DATE_FORMAT(4, "Date", "日期格式"), FLOAT_FORMAT(5, "Float", "浮点格式"), BOOL_FORMAT(6, "Boolean", "布尔格式"), - LONG_FORMAT(7, "LONG", "长整数格式"); + LONG_FORMAT(7, "LONG", "长整数格式"), + BYTE_FORMAT(8, "Byte", "字节格式"), + BIGDECIMAL_FORMAT(9, "Bigdecimal", "BigDecimal格式"), + BLOB_FORMAT(10, "Blob", "BLOB格式"), + CLOB_FORMAT(11, "Clob", "CLOB格式"), + TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式"); private int value; private String code; @@ -7119,6 +7486,80 @@ public class WmsEnumUtil { } /** + * 报文校验类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INTERFACE_DATA_VERIFY_STATUS { + INITIAL(10, "INITIAL", "初始化"), + COMPLETED(30, "COMPLETED", "校验完成"), + ERROR(40, "ERROR", "校验出错"); + + private int value; + private String code; + private String description; + + INTERFACE_DATA_VERIFY_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static INTERFACE_DATA_VERIFY_STATUS codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** * 运费单审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -7277,7 +7718,8 @@ public class WmsEnumUtil { PICK(40, "REPAIR", "挑选"), REPAIR(50, "REPAIR", "返修"), BIND(60, "BIND", "绑定"), - OUTSTOCK(70, "OUTSTOCK", "出库"); + OUTSTOCK(70, "OUTSTOCK", "出库"), + RE_PACKING(80, "RE_PACKING", "重绑"); private int value; private String code; private String description; @@ -7628,7 +8070,8 @@ public class WmsEnumUtil { public enum BH_SUMMARY_IS_SYNC { INIT(10, "INIT", "初始化"), WAIT_SYNC(20, "WAIT_SYNC", "待同步"), - FINISH_SYNC(30, "FINISH_SYNC", "已同步"); + FINISH_SYNC(30, "FINISH_SYNC", "已同步"), + OLD_WMS_FINISH_SYNC(40, "OLD_WMS_FINISH_SYNC", "老WMS已同步"); private int value; private String code; @@ -8794,4 +9237,486 @@ public class WmsEnumUtil { return null; } } -} + + /** + * 收货看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_BOARD_STATUS { + FINISH(10, "已完成"),//绿色 + OVER_TIME(20, "已超时"),//红色 + UNRECEIVED(30, "未收货"),//蓝色 + VARIANT(40, "有差异"),//黄色 + NORMAL(50, "正常");//白色 + + private int value; + private String description; + + RC_BOARD_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static RC_BOARD_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 循环规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CYCLE_RULE { + FIVE_SECONDs("0/5 * * * * ?", "FIVE_SECONDs", "五秒一次"), + TWENTY_SECONDS("0/20 * * * * ?", "TWENTY_SECONDS", "二十秒一次"), + EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"), + EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"), + NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点"), + NINE("0 0 9 * * ?", "NINE", "早上九点"), + NINTEEN("0 0 21 * * ?", "NINTEEN", "晚上九点"); + private String value; + private String code; + private String description; + + CYCLE_RULE(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + + /** + * BOM + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOM_PRODUCTING_LINE { + GJ(10, "PIPE", "管件"), + JF(20, "JF", "夹方"), + JH(30, "JH", "机焊"), + SH(40, "SH", "手焊"); + + private String code; + private String description; + int value; + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + BOM_PRODUCTING_LINE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BOM_PRODUCTING_LINE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + + /** + * 成品条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_STATUS { + NORMAL(10, "正常"), + REPAIRE(20, "返工"), + SCRAP(30, "报废"); + + private int value; + private String description; + + PRODUCT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PRODUCT_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 质检单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS_FLAG { + NORMAL(1, "NORMAL", "合格"), + ABNORMAL(2, "ABNORMAL", "超时"); + + private int value; + private String code; + private String description; + + QC_STATUS_FLAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * PLC业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_BUSI_TYPE { + DR(10, "DR", "DR"), + DF(20, "DF", "DF"), + IP(30, "IP", "IP"); + + private int value; + private String code; + private String description; + + PLC_BUSI_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * WMS数据库类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_DB_TYPE { + MYSQL(10, "mysql", "mysql"), + SQLSERVER(20, "sqlserver", "sqlserver"), + ORACLE(30, "oracle", "oracle"), + POSTGRESQL(40, "postgresql", "postgresql"); + + private int value; + private String code; + private String description; + + WMS_DB_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 报废类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRAP_TYPE { + ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"), + AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废"); + + private int value; + private String code; + private String description; + + SCRAP_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + + } + + public static int descriptionOfValue(String desc) { + int tmp = ISOLATED_SCRAP.value; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * PDA_BTN + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PDA_BTN { + CLEAR_REDIS(10, "CLEAR_REDIS", "清空缓存"); + + private int value; + private String code; + private String description; + + PDA_BTN(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * TIME_STATUS + */ + public enum TIME_STATUS { + NORMAL(1,"正常"), + TIME_OUT(2,"超时"); + + private int value; + private String description; + + TIME_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + public static String valueOfDescription(int val) { + return valueOf(val); + } + } +} + + + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java deleted file mode 100644 index 04c9a2d..0000000 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.estsh.i3plus.pojo.base.jpa.dao; - -import cn.estsh.i3plus.pojo.base.common.Pager; -import org.bson.conversions.Bson; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.mongodb.repository.MongoRepository; -import org.springframework.data.repository.NoRepositoryBean; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Description : 自定义Repository的方法接口 - * @Reference : MongoRepository - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 10:34 - * @Modify: - **/ -@NoRepositoryBean -public interface BaseMongoRepository extends MongoRepository { - - T getById(long id); - - List findByProperty(String propertyName, Object value); - - List findByProperty(String propertyName, Object value,String orderByParam, int ascOrDesc); - - List findByPropertyLike(String propertyName, Object value); - - List findByPropertyLike(String propertyName, Object value,String orderByParam, int ascOrDesc); - - T getByProperty(String propertyName, Object value); - - List findByBson(Bson bson); - - List findByBson(Bson bson,String orderByParam, int ascOrDesc); - - int findByBsonCount(Bson bson); - - List findByBsonPager(Bson bson,Pager pager); - - List findByBsonPager(Bson bson,Pager pager,String orderByParam, int ascOrDesc); - - int listCount(); - - List listPager(Pager pager); - - List listPager(Pager pager,String orderByParam, int ascOrDesc); - - long deleteByProperty(Bson bson); - long deleteByPropertyIn(String propName, Object[] propValues); - long deleteByIds(ID[] ids); -} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index e2e0255..62ecbd3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -371,6 +371,8 @@ public interface BaseRepository extends JpaReposito boolean isExitByProperty(String[] propertyNames, Object[] values); + boolean isExitByPropertyDemo(String[] propertyNames, Object[] values); + boolean isExitByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values); boolean isExitByHqlWhere(String hqlWhere); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java deleted file mode 100644 index ef58910..0000000 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java +++ /dev/null @@ -1,352 +0,0 @@ -package cn.estsh.i3plus.pojo.base.jpa.daoimpl; - -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import com.alibaba.fastjson.JSONObject; -import com.mongodb.BasicDBObject; -import com.mongodb.Block; -import com.mongodb.client.FindIterable; -import com.mongodb.client.model.CountOptions; -import com.mongodb.client.model.Filters; -import com.mongodb.client.model.Sorts; -import org.apache.commons.lang3.StringUtils; -import org.bson.Document; -import org.bson.conversions.Bson; -import org.bson.json.JsonMode; -import org.bson.json.JsonWriterSettings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.dao.DuplicateKeyException; -import org.springframework.data.mapping.context.MappingContext; -import org.springframework.data.mongodb.core.MongoOperations; -import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; -import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.data.mongodb.repository.query.MongoEntityInformation; -import org.springframework.data.mongodb.repository.support.SimpleMongoRepository; - -import javax.persistence.Id; -import java.io.Serializable; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.UUID; - -/** - * @Description : 自定义mongodb持久化接口实现 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 11:24 - * @Modify: - **/ -public class BaseMongoRepositoryImpl extends SimpleMongoRepository - implements BaseMongoRepository { - public static final Logger LOGGER = LoggerFactory.getLogger(BaseMongoRepositoryImpl.class); - - /** - * 持久化上下文 - */ - private final MongoOperations mongoOperations; - private final MongoEntityInformation entityInformation; - private final MappingContext, MongoPersistentProperty> mongoContext; - private final Class entityClass; - private SnowflakeIdMaker snowflakeIdMaker; - - public BaseMongoRepositoryImpl(MongoEntityInformation metadata, MongoOperations mongoOperations,SnowflakeIdMaker snowflakeIdMaker) { - super(metadata, mongoOperations); - this.entityInformation = metadata; - this.mongoOperations = mongoOperations; - this.entityClass = this.entityInformation.getJavaType(); - mongoContext = mongoOperations.getConverter().getMappingContext(); - this.snowflakeIdMaker = snowflakeIdMaker; - } - - /** - * 重写新增方法 - * @param entity - * @param - * @return - */ - @Override - public S insert(S entity) { - innerSave(entity); - return entity; - } - - /** - * 保存对象 - * @param item 保存对象 - * @return - */ - private T innerSave(T item) { - try { - if(item==null)return null; - Class clazz = item.getClass(); - - //获取主键 - Field idField = clazz.getField("id"); - if(idField == null){ - idField = clazz.getField("primaryKey"); - } - if(idField == null){ - // 遍历所有属性，以@Id声明确认主键 - Field[] fields = clazz.getFields(); - for(Field f : fields){ - if(f.getAnnotation(Id.class) != null){ - idField = f; - break; - } - } - } - - if(idField != null){ - Class type = idField.getType(); - Object val = idField.get(item); - if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){ - // long类型主键，以snowflake为主键 - idField.set(item, snowflakeIdMaker.nextId() + System.currentTimeMillis()); - } else if(type == String.class && (val==null || "".equals(val))){ - // String类型主键，以UUID为主键 - idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase()); - } - } - -// try { - this.mongoOperations.insert(item, this.entityInformation.getCollectionName()); -// }catch (DuplicateKeyException dke){ -// LOGGER.error("【出现重复主键】"); -// //出现重复主键，再次插入 -// if(idField != null){ -// Class type = idField.getType(); -// Object val = idField.get(item); -// if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){ -// // long类型主键，以snowflake为主键 -// idField.set(item, snowflakeIdMaker.nextId()); -// } else if(type == String.class && (val==null || "".equals(val))){ -// // String类型主键，以UUID为主键 -// idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase()); -// } -// } -// -// this.mongoOperations.insert(item, this.entityInformation.getCollectionName()); -// } - if(idField != null){ - return item; - }else { - return null; - } - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - } - - @Override - public Optional findById(ID id) { - T entity = this.mongoOperations.findById(id, this.entityInformation.getJavaType(), this.entityInformation.getCollectionName()); - - if(entity != null) { - return Optional.of(entity); - }else{ - return null; - } - } - - @Override - public T getById(long id) { - return this.mongoOperations.findById(id, this.entityInformation.getJavaType(), this.entityInformation.getCollectionName()); - } - - @Override - public List findByProperty(String propertyName, Object value) { - return findByProperty(propertyName,value,null,0); - } - - @Override - public List findByProperty(String propertyName, Object value, String orderByParam, int ascOrDesc) { - Bson bson = Filters.and( - Filters.eq(propertyName, value) - ); - - return findByBson(bson,orderByParam,ascOrDesc); - } - - @Override - public List findByPropertyLike(String propertyName, Object value) { - return findByPropertyLike(propertyName,value,null,0); - } - - @Override - public List findByPropertyLike(String propertyName, Object value, String orderByParam, int ascOrDesc) { - Bson bson = Filters.and( - Filters.regex(propertyName, value.toString()) - ); - - return findByBson(bson,orderByParam,ascOrDesc); - } - - @Override - public T getByProperty(String propertyName, Object value) { - List tList = this.findByProperty(propertyName,value); - if(tList.size() > 0){ - return tList.iterator().next(); - }else{ - return null; - } - } - - /** - * 根据bson查询 - * @param bson - * @return - */ - public List findByBson(Bson bson) { - return findByBson(bson,null,0); - } - - @Override - public List findByBson(Bson bson, String orderByParam, int ascOrDesc) { - List dList = new ArrayList<>(); - Block saveBlock = new Block() { - @Override - public void apply(final Document document) { - dList.add(document); - } - }; - - FindIterable findIter = null; - if(bson != null) { - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson); - }else{ - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(); - } - if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ - //排序 - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){ - findIter.sort(Sorts.ascending(orderByParam)); - }else{ - findIter.sort(Sorts.descending(orderByParam)); - } - } - findIter.forEach(saveBlock); - - return packObjectListFromDocument(dList); - } - - @Override - public int findByBsonCount(Bson bson) { - if(bson == null){ - return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(); - }else { - return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson); - } - } - - private List packObjectListFromDocument(List dList) { - //将获取的document转为对象 - List resultList = new ArrayList<>(); - // 设置为宽松模式 - JsonWriterSettings jsonWriterSettings = JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build(); - for(Document d : dList){ - resultList.add(JSONObject.parseObject(d.toJson(jsonWriterSettings), entityClass)); - } - - return resultList; - } - - @Override - public List findByBsonPager(Bson bson, Pager pager) { - return findByBsonPager(bson,pager,null,0); - } - - @Override - public List findByBsonPager(Bson bson, Pager pager, String orderByParam, int ascOrDesc) { - List dList = new ArrayList<>(); - Block saveBlock = new Block() { - @Override - public void apply(final Document document) { - dList.add(document); - } - }; - - FindIterable findIter = null; - if(bson == null) { - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(); - }else{ - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson); - } - if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ - //排序 - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){ - findIter.sort(Sorts.ascending(orderByParam)); - }else{ - findIter.sort(Sorts.descending(orderByParam)); - } - }else{ - //根据id排序 - findIter.sort(new BasicDBObject("_id", 1)); - } - findIter.skip(pager.getStartRow()).limit(pager.getPageSize()); - findIter.forEach(saveBlock); - - return packObjectListFromDocument(dList); - } - - @Override - public int listCount() { - return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(); - } - - @Override - public List listPager(Pager pager) { - return listPager(pager,null,0); - } - - @Override - public List listPager(Pager pager, String orderByParam, int ascOrDesc) { - List dList = new ArrayList<>(); - Block saveBlock = new Block() { - @Override - public void apply(final Document document) { - dList.add(document); - } - }; - FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(); - if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ - //排序 - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){ - findIter.sort(Sorts.ascending(orderByParam)); - }else{ - findIter.sort(Sorts.descending(orderByParam)); - } - }else{ - //根据id排序 - findIter.sort(new BasicDBObject("_id", 1)); - } - findIter.skip(pager.getStartRow()).limit(pager.getPageSize()); - findIter.forEach(saveBlock); - return packObjectListFromDocument(dList); - } - - @Override - public long deleteByProperty(Bson bson) { - return mongoOperations.getCollection(this.entityInformation.getCollectionName()).deleteMany(bson).getDeletedCount(); - } - - @Override - public long deleteByPropertyIn(String propName, Object[] propValues) { - Bson bson = Filters.and( - Filters.in(propName, propValues) - ); - return deleteByProperty(bson); - } - - @Override - public long deleteByIds(ID[] ids) { - return deleteByPropertyIn("_id",ids); - } - -} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index afd81eb..c6a529a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -48,6 +48,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep private SnowflakeIdMaker snowflakeIdMaker; /* 默认查询数据条数 */ private static final Pager DEFAULT_PAGER = new Pager(10,10); + private static final Pager GETBYPROPERTY_PAGER = new Pager(1,1); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -61,6 +62,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep } public void detachObject(T t){ + if (t == null) { + return; + } entityManager.detach(t); } @@ -509,7 +513,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { try { - List list = findByHqlWherePage(packBean,DEFAULT_PAGER); + List list = findByHqlWherePage(packBean,GETBYPROPERTY_PAGER); return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在，DdlPackBean：{}",packBean); @@ -522,17 +526,17 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, GETBYPROPERTY_PAGER); } @Override public T getByProperty(String[] propertyNames, Object[] values) { - return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); + return getByPropertyPager(propertyNames, values, GETBYPROPERTY_PAGER); } @Override public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { - pager = pager == null ? DEFAULT_PAGER: pager; + pager = pager == null ? GETBYPROPERTY_PAGER: pager; if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); @@ -576,7 +580,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int listCount() { try{ - Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class) + Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model", Long.class) .getSingleResult(); return count == null ? 0 : count.intValue(); }catch(NoResultException e){ @@ -647,6 +651,34 @@ public class BaseRepositoryImpl extends SimpleJpaRep } } + + public int findByPropertyCountDemo(String[] propertyNames, Object[] values) { + if(propertyNames.length != values.length){ + throw new IllegalArgumentException("参数错误数量和值个数不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append("select count(*) from " + persistentClass.getName() + " as model where 1=1 "); + for (int i = 0; i < propertyNames.length; i++) { + if(values[i] != null) { + queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString(),Long.class); + for (int i = 0; i < propertyNames.length; i++) { + if(values[i] != null) { + queryObject.setParameter(propertyNames[i], values[i]); + } + } + + try{ + Long count = (Long) queryObject.getSingleResult(); + return count == null ? 0 : count.intValue(); + }catch(NoResultException e){ + return 0; + } + } + @Override public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) { if(pager != null){ @@ -1435,6 +1467,11 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public boolean isExitByPropertyDemo(String[] propertyNames, Object[] values) { + return findByPropertyCountDemo(propertyNames, values) > 0; + } + + @Override public boolean isExitByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values) { return findByHqlWhereCount(hqlWhere,propertyNames,values) > 0; } @@ -1520,7 +1557,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { - StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); + StringBuffer sb = new StringBuffer("select max(CAST(model." + sumPropertyName + " as integer)) from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); if(StringUtils.isNotBlank(groupByName)){ sb.append(" group by model." + groupByName); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java deleted file mode 100644 index f864c1e..0000000 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.estsh.i3plus.pojo.base.jpa.factory; - -import cn.estsh.i3plus.pojo.base.jpa.daoimpl.BaseMongoRepositoryImpl; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.core.MongoOperations; -import org.springframework.data.mongodb.repository.MongoRepository; -import org.springframework.data.mongodb.repository.query.MongoEntityInformation; -import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory; -import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean; -import org.springframework.data.repository.core.RepositoryInformation; -import org.springframework.data.repository.core.RepositoryMetadata; -import org.springframework.data.repository.core.support.RepositoryFactorySupport; - -import java.io.Serializable; - -/** - * @Description : 自定义mongodb持久化工厂类 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 14:55 - * @Modify: - **/ -public class BaseMongoRepositoryFactoryBean, T, I extends Serializable> extends MongoRepositoryFactoryBean { - public static final Logger LOGGER = LoggerFactory.getLogger(BaseMongoRepositoryFactoryBean.class); - - @Autowired - public SnowflakeIdMaker snowflakeIdMaker; - - public BaseMongoRepositoryFactoryBean(Class repositoryInterface) { - super(repositoryInterface); - } - - @Override - protected RepositoryFactorySupport getFactoryInstance(MongoOperations operations) { - //LOGGER.info("【初始mongo持久仓】"); - //生成持久mongo仓库实例 - return new BaseMongoRepositoryFactory(operations,snowflakeIdMaker); - } - - //创建一个内部类，该类不用在外部访问 - private static class BaseMongoRepositoryFactory extends MongoRepositoryFactory { - private final MongoOperations mongoOperations; - //private final MappingContext, MongoPersistentProperty> mappingContext; - private final SnowflakeIdMaker snowflakeIdMaker; - - public BaseMongoRepositoryFactory(MongoOperations mongoOperations,SnowflakeIdMaker snowflakeIdMaker) { - super(mongoOperations); - this.mongoOperations = mongoOperations; - this.snowflakeIdMaker = snowflakeIdMaker; - //this.mappingContext = mongoOperations.getConverter().getMappingContext(); - } - - //设置具体的实现类是BaseRepositoryImpl - @Override - protected Object getTargetRepository(RepositoryInformation information) { - MongoEntityInformation entityInformation = getEntityInformation(information.getDomainType()); - return new BaseMongoRepositoryImpl(entityInformation, mongoOperations,snowflakeIdMaker); - } - - //设置具体的实现类的class - @Override - protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { - return BaseMongoRepositoryImpl.class; - } - } -} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java deleted file mode 100644 index f355b4b..0000000 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ /dev/null @@ -1,816 +0,0 @@ -package cn.estsh.i3plus.pojo.base.tool; - -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import com.alibaba.fastjson.JSONObject; -import com.mongodb.Block; -import com.mongodb.client.MongoCollection; -import com.mongodb.client.model.Filters; -import com.mongodb.client.model.Sorts; -import org.apache.commons.lang3.StringUtils; -import org.bson.Document; -import org.bson.conversions.Bson; -import org.springframework.data.mongodb.core.MongoOperations; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.regex.Pattern; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-11-01 16:26 - * @Modify: - * - * (>) 大于 - $gt - * (<) 小于 - $lt - * (>=) 大于等于 - $gte - * (<= ) 小于等于 - $lte - * $ne ----------- not equal != - * $eq -------- equal = - * - * 查询 title 包含"库"字的文档： - * db.col.find({title:/库/}) - * - * 查询 title 字段以"教"字开头的文档： - * db.col.find({title:/^库/}) - * - * 查询 titl e字段以"教"字结尾的文档： - * db.col.find({title:/库$/}) - **/ -public class BsonPackTool { - - /** - * 防止sql注入 - * @param data - * @return - */ - public static String getSafeParam(Object data){ - return data.toString().replaceAll(";","") - .replaceAll("'","") - .replaceAll("\"","") - .replaceAll("/","") - .replaceAll("\\\\","") - .replaceAll("delete","") - .replaceAll("update","") - .replaceAll("insert",""); - } - - /** - * 单页查询，获取查询document结果集合 - * @param mongoOperations - * @param tableName 查询的表名 - * @param bson 查询条件 - * @param skip 忽略的条数 - * @param limit 查询的条数 - * @return document结果集合 - */ - public static List query(MongoOperations mongoOperations, String tableName, Bson bson, int skip, int limit) { - List newLins = new ArrayList<>(); - Block saveBlock = new Block() { - @Override - public void apply(final Document document) { - newLins.add(document); - } - }; - - //查询 - MongoCollection collection = mongoOperations.getCollection(tableName); - if(bson == null) { - collection.count(); - collection.find().skip(skip).limit(limit).forEach(saveBlock); - }else { - collection.count(bson); - collection.find(bson).skip(skip).limit(limit).forEach(saveBlock); - } - - return newLins; - } - - /** - * 分页查询 - * @param mongoOperations - * @param tableName 表名 - * @param bson 查询条件 - * @param pageSize 单页查询条数 - * @return 查询结果集合 - */ - public static List queryPages(MongoOperations mongoOperations, String tableName, Bson bson, int pageSize) { - //分页查询 - List list = new ArrayList<>(); - long count = mongoOperations.getCollection(tableName).count(bson); - int loops = (int)((count + pageSize - 1) / pageSize); - List newFinds = null; - for(int i = 0; i < loops; i++) { - newFinds = query(mongoOperations, tableName, bson, i * pageSize, pageSize); - list.addAll(newFinds); - } - return list; - } - - /** - * 封装日期 - * @param startDate 开始日期 - * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） - * @param columnName HQL里对应的时间字段 - * @param bson 封装的bson - * @param isShowTime 是否包含时分秒 - */ - public static Bson timeBuilder( String startDate,String endDate, String columnName, Bson bson, boolean isShowTime) { - if (startDate == null || startDate.trim().length() == 0) { - startDate = "1900-01-01"; - } else { - startDate = getSafeParam(startDate); - startDate = startDate.trim(); - } - if (isShowTime && startDate.trim().length()<=11) { - startDate+= " 00:00:00"; - } - if (endDate == null || endDate.trim().length() == 0) { - endDate = "2100-01-01"; - } else { - endDate = getSafeParam(endDate); - endDate = endDate.trim(); - } - if (isShowTime&& endDate.trim().length()<=11) { - endDate+= " 23:59:59"; - } - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, startDate), //大于等于开始日期 - Filters.lte(columnName, endDate) //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, startDate), //大于等于开始日期 - Filters.lte(columnName, endDate) //小于等于结束日期 - ); - } - - return bson; - } - - /** - * 封装日期 - * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） - * @param columnName HQL里对应的时间字段 - * @param bson 封装的bson - * @param showToday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 - * @param isShowTime 是否包含时分秒 - */ - public static Bson timeBuilder( String date, String columnName, Bson bson, boolean showToday,boolean isShowTime) { - if(date != null && !"null".equals(date) && date.trim().length() > 0){ - date = getSafeParam(date); - - String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); - if(date.length() == 1 || ",".equals(date)){ - //只有一个逗号 - date = ""; - } - - String[] time = date.split(","); - if(time.length == 1){ - //只有开始日期，没有结束日期 - if(bson == null){ - bson = Filters.and( - Filters.regex(columnName, "^" + time[0]) //like 日期%^ - ); - }else { - bson = Filters.and( - bson, - Filters.regex(columnName, "^" + time[0]) //like 日期%^ - ); - } - }else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) || (time[1] != null & time[1].trim().length() > 0))) { - if (time[0] == null || time[0].trim().length() == 0) { - time[0] = "1900-01-01"; - } else { - time[0] = time[0].trim(); - } - if (isShowTime && time[0].trim().length()<=11) { - time[0]+= " 00:00:00"; - } - if (time[1] == null || time[1].trim().length() == 0) { - time[1] = "2100-01-01"; - } else { - time[1] = time[1].trim(); - } - if (isShowTime&& time[1].trim().length()<=11) { - time[1]+= " 23:59:59"; - } - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, time[0]), //大于等于开始日期 - Filters.lte(columnName, time[1]) //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, time[0]), //大于等于开始日期 - Filters.lte(columnName, time[1]) //小于等于结束日期 - ); - } - } else { - if (showToday) { - if (isShowTime) { - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, time[0] + " 00:00:00"), //大于等于开始日期 - Filters.lte(columnName, time[1] + " 23:59:59") //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, time[0] + " 00:00:00"), //大于等于开始日期 - Filters.lte(columnName, time[1] + " 23:59:59") //小于等于结束日期 - ); - } - }else{ - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, time[0]), //大于等于开始日期 - Filters.lte(columnName, time[1]) //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, time[0]), //大于等于开始日期 - Filters.lte(columnName, time[1]) //小于等于结束日期 - ); - } - } - } - } - } - return bson; - } - - /** - * 查询方位分装 - * @param columnName 列名称 - * @param bson - * @param startTime 开始值 - * @param endTime 结束之 - * @return - */ - public static Bson timeBuilder(String columnName, Bson bson, String startTime,String endTime) { - if( Objects.nonNull(bson) && StringUtils.isNotBlank(columnName) &&StringUtils.isNotBlank(startTime)&& StringUtils.isNotBlank(endTime)){ - bson = Filters.and( - bson, - Filters.gte(columnName, startTime), //大于等于开始日期 - Filters.lte(columnName, endTime) //小于等于结束日期 - ); - } - return bson; - } - - /** - * 大于日期 - * @param dateTime 日期 - * @param columnName HQL里对应的时间字段 - * @param bson 封装的bson - * @param isShowTime 是否包含时分秒 - */ - public static Bson timeMore( String dateTime, String columnName, Bson bson, boolean isShowTime) { - if (dateTime == null || dateTime.trim().length() == 0) { - dateTime = "1900-01-01"; - } else { - dateTime = getSafeParam(dateTime); - dateTime = dateTime.trim(); - } - if (isShowTime && dateTime.trim().length()<=11) { - dateTime+= " 00:00:00"; - } - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, dateTime) //大于等于开始日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, dateTime) //大于等于开始日期 - ); - } - - return bson; - } - - /** - * 小于日期 - * @param dateTime 日期 - * @param columnName HQL里对应的时间字段 - * @param bson 封装的bson - * @param isShowTime 是否包含时分秒 - */ - public static Bson timeLess( String dateTime, String columnName, Bson bson, boolean isShowTime) { - if (dateTime == null || dateTime.trim().length() == 0) { - dateTime = "2100-01-01"; - } else { - dateTime = getSafeParam(dateTime); - dateTime = dateTime.trim(); - } - if (isShowTime&& dateTime.trim().length()<=11) { - dateTime+= " 23:59:59"; - } - if(bson == null) { - bson = Filters.and( - Filters.lte(columnName, dateTime) //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.lte(columnName, dateTime) //小于等于结束日期 - ); - } - - return bson; - } - - /** - * 封装String对象成like语句 - * @param str 对象值 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringLikerPack(String str,String columnName, Bson bson) { - if (str != null && str.trim().length() > 0) { - str = getSafeParam(str); - - if(bson == null) { - bson = Filters.and( - Filters.regex(columnName, str) //like - ); - }else{ - bson = Filters.and( - bson, - Filters.regex(columnName, str)//like - ); - } - } - - return bson; - } - - /** - * 封装String对象成like语句 - * @param str 对象值 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringLikerPackOr(String str,String columnName, Bson bson) { - if (str != null && str.trim().length() > 0) { - str = getSafeParam(str); - - if(bson == null) { - bson = Filters.or( - Filters.regex(columnName, str) //like - ); - }else { - bson = Filters.and( - bson, - Filters.or( - Filters.regex(columnName, str) //like - ) - ); - } - } - return bson; - } - - /** - * 封装String对象成like语句(右侧模糊) - * @param str 对象值 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringRightLikerPack(String str,String columnName, Bson bson) { - if (str != null && str.trim().length() > 0) { - str = getSafeParam(str); - if(bson == null) { - bson = Filters.and( - Filters.regex(columnName, str + "^") //like - ); - }else{ - bson = Filters.and( - bson, - Filters.regex(columnName, str + "^") //like - ); - } - } - return bson; - } - - /** - * 封装String对象成like语句(左侧模糊) - * @param str 对象值 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringLeftLikerPack(String str,String columnName, Bson bson) { - if (str != null && str.trim().length() > 0) { - str = getSafeParam(str); - if(bson == null) { - bson = Filters.and( - Filters.regex(columnName, "^" + str) //like - ); - }else{ - bson = Filters.and( - bson, - Filters.regex(columnName, "^" + str) //like - ); - } - } - return bson; - } - - /** - * 封装String对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringEqualPack(String data,String columnName, Bson bson) { - if(data != null && data.trim().length() > 0){ - data = getSafeParam(data); - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPack(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPackForZero(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) >= 0){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumWithZeroEqualPack(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) >= 0){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成大于语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumBiggerPack(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.gt(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.gt(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成小于语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumSmallerPack(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.lt(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.lt(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装double对象成大于语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getDoubleBiggerPack(Object data,String columnName, Bson bson) { - if(data!=null&&Double.parseDouble(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.gt(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.gt(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装double对象成小于语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getDoubleSmallerPack(Object data,String columnName, Bson bson) { - if(data!=null&&Double.parseDouble(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.lt(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.lt(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPack(Object data,String columnName, Bson bson,Integer expvalue) { - if(data!=null&&Long.parseLong(data.toString()) > (long)expvalue){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装double对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson) { - if(data!=null&&Double.parseDouble(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson,Integer expvalue) { - if(data!=null&&Double.parseDouble(data.toString()) > (double)expvalue){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句(不等于) - * @param columnName 列名 - * @param bson - */ - public static Bson getNumNOEqualPack(Object data,String columnName, Bson bson) { - if(data!=null){ - if(bson == null) { - bson = Filters.and( - Filters.ne(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.ne(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装in查询语句 - * @param data - * @param columnName - * @param bson - */ - public static Bson getInPack(String data,String columnName, Bson bson){ - if (data!=null&&data.trim().length()>0) { - data = getSafeParam(data); - if(bson == null) { - bson = Filters.and( - Filters.in(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.in(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装in String查询语句 - * @param data - * @param columnName - * @param bson - */ - public static Bson getInPackString(String data,String columnName, Bson bson){ - if (data != null && data.trim().length()>0) { - data = getSafeParam(data); - //判断最后一位是不是逗号 - if(data.lastIndexOf(",") != (data.length()-1)){ - data += ","; - } - String[] dataArray = data.substring(0, data.length()-1).split(","); - data = ""; - for (int i = 0 ; i < dataArray.length ;i++) { - if(i == dataArray.length -1){ - data += "'" + dataArray[i] + "'"; - }else{ - data += "'" + dataArray[i] + "',"; - } - } - if(bson == null) { - bson = Filters.and( - Filters.in(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.in(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装in String查询语句 - * @param data - * @param columnName - * @param bson - */ - public static Bson getNotInPackString(String data,String columnName, Bson bson){ - if (data != null && data.trim().length()>0) { - data = getSafeParam(data); - //判断最后一位是不是逗号 - if(data.lastIndexOf(",") != (data.length()-1)){ - data += ","; - } - String[] dataArray = data.substring(0, data.length()-1).split(","); - data = ""; - for (int i = 0 ; i < dataArray.length ;i++) { - if(i == dataArray.length -1){ - data += "'" + dataArray[i] + "'"; - }else{ - data += "'" + dataArray[i] + "',"; - } - } - if(bson == null) { - bson = Filters.and( - Filters.nin(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.nin(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装not in查询语句 - * @param data - * @param columnName - * @param bson - */ - public static Bson getNotInPack(String data,String columnName, Bson bson){ - if (data!=null&&data.trim().length()>0) { - data = getSafeParam(data); - if(bson == null) { - bson = Filters.and( - Filters.nin(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.nin(columnName, data) - ); - } - } - return bson; - } - - /** - * 将MONGODB的BSON转成对象 - * @param dList - * @param entityClass - * @return - */ - public List packDocumentToObjectList(List dList,Class entityClass){ - //将获取的document转为对象 - List resultList = new ArrayList(); - for(Document d : dList){ - resultList.add(JSONObject.parseObject(d.toJson(), entityClass)); - } - - return resultList; - } -} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 9a6e187..52ab4ff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.tool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; @@ -85,7 +86,7 @@ public class DdlPreparedPack { * @param isShowTime 是否包含时分秒 */ public static void timeBuilder(String date, String columnName, DdlPackBean packBean, Boolean showTaday, boolean isShowTime) { - if (date != null && date.trim().length() > 0) { + if (date != null && date.trim().length() > 2) { String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); if (date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) { //只有一个逗号 @@ -236,7 +237,7 @@ public class DdlPreparedPack { */ public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%"); + packBean.addColumnQuery("rl_"+columnName, " and model." + columnName + " like :m_rl_" + columnName, val + "%"); } } @@ -249,28 +250,43 @@ public class DdlPreparedPack { */ public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val); + packBean.addColumnQuery("ll_"+columnName, " and model." + columnName + " like :m_ll_" + columnName, "%" + val); } } /** - * 封装String对象成equal语句 + * 封装String对象成equal语句,不封装空值，空字符串 * * @param columnName 列名 * @param packBean */ public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val); + getStringEqualAndAllowBlankPack(val, columnName, packBean); } } /** - * 封装String对象成equal语句 + * 封装String对象成equal语句,封装空值，空字符串 * + * @param val 条件 + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualAndAllowBlankPack(String val, String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val); + } + + /** + * 不建议使用该方法，其他方法已满足需要 + * @see #getStringLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean) + * @see #getStringLikerPackOr(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean) + * @see #getStringLeftLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean) + * @see #getStringRightLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean) * @param columnName 列名 * @param packBean */ + @Deprecated public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val); @@ -278,6 +294,18 @@ public class DdlPreparedPack { } /** + * 不建议使用该方法，仅在特殊情况下使用。 + * 如sqlserver库中不允许对长数据字段进行=判断，可使用like替换 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikeEqualPack(String val, String columnName, DdlPackBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val); + } + } + + /** * 封装String对象成不等于语句 * * @param columnName 列名 @@ -484,6 +512,18 @@ public class DdlPreparedPack { } /** + * 封装double对象成大于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data); + } + } + + /** * 封装double对象成小于语句 * * @param columnName 列名 @@ -496,6 +536,18 @@ public class DdlPreparedPack { } /** + * 封装double对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data); + } + } + + /** * 封装double对象成小于等于语句 * * @param columnName 列名 @@ -508,6 +560,18 @@ public class DdlPreparedPack { } /** + * 封装double对象成小于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data); + } + } + + /** * 封装long或者int的整数对象成equal语句(不等于) * * @param columnName 列名 @@ -612,6 +676,25 @@ public class DdlPreparedPack { } } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param sufColumnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, String sufColumnName, DdlPackBean packBean) { + if (data != null && data.size() > 0) { + String destColumnName = columnName; + if (!StringUtil.isEmpty(sufColumnName)) { + destColumnName = destColumnName + "_" + System.currentTimeMillis(); + } + packBean.addColumnQuery(destColumnName, " and model." + columnName + " not in (:m_" + destColumnName + ")", data); + } + } + /** * 封装in String查询语句 * @@ -638,6 +721,33 @@ public class DdlPreparedPack { } } + + /** + * 多个字段列or查询 + * + * @param data + * @param columnNames + * @param columnNamesKey + * @param packBean + */ + public static void getMultOrPackString(String data, List columnNames, String columnNamesKey, DdlPackBean packBean) { + StringBuffer sbf = new StringBuffer(" and ( "); + if (StringUtil.isEmpty(columnNamesKey)) { + columnNamesKey = "mult_column_name"; + } + for (int i = 0; i < columnNames.size(); i++) { + String columnName = columnNames.get(i); + sbf.append(" model." + columnName + "=:m_" + columnNamesKey); + if (i == columnNames.size() - 1) { + continue; + } + sbf.append(" or "); + } + sbf.append(" )"); + packBean.addColumnQuery(columnNamesKey, sbf.toString(), data); + + } + /** * 封装in String查询语句 * diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index 4823179..416e42c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -243,6 +243,19 @@ public class HqlPack { } /** + * 输入日期大于所选字段 + * + * @param columnName 列名 + * @param result + */ + public static void getStringBiggerPack(Object data, String columnName, StringBuffer result) { + if (data != null && StringUtils.isNotBlank(String.valueOf(data))) { + data = getSafeParam(data); + result.append(" and model." + columnName + " < '" + data + "'"); + } + } + + /** * 封装String对象成equal语句 * @param columnName 列名 * @param result diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java index 1504765..0985f97 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.base.util; +import com.google.common.collect.Lists; import org.apache.commons.beanutils.BeanUtils; import org.springframework.cglib.beans.BeanGenerator; import org.springframework.cglib.beans.BeanMap; @@ -24,6 +25,7 @@ public class BeanMapUtils { return map; } + /** * 将map集合中的数据转化为指定对象的同名属性中 */ @@ -37,6 +39,7 @@ public class BeanMapUtils { /** * 键值对转换为对象 + * * @param mapList * @return */ @@ -61,4 +64,24 @@ public class BeanMapUtils { return null; } } + + /** + * 将List转换为List> + * @param objList + * @param + * @return + */ + public static List> objectsToMaps(List objList) { + List> list = Lists.newArrayList(); + if (objList != null && objList.size() > 0) { + Map map = null; + T bean = null; + for (int i = 0, size = objList.size(); i < size; i++) { + bean = objList.get(i); + map = beanToMap(bean); + list.add(map); + } + } + return list; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java index 6a7a274..d9c48c7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java @@ -12,11 +12,11 @@ import java.util.regex.Pattern; public class StringUtil { public static boolean isEmpty(Object obj){ - + if(obj ==null || obj.toString().trim().equals("")){ return true; } - + return false; } @@ -33,4 +33,13 @@ public class StringUtil { } return fieldNames; } + + public static boolean isEmptyAndNull(Object obj){ + + if(obj == null || obj.toString().trim().equals("") || "null".equalsIgnoreCase(obj.toString().trim())){ + return true; + } + + return false; + } } diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..a9e288f 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index 5d5f78a..917912c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -61,6 +62,7 @@ public class BfDataObject extends BaseBean { @ApiParam(value ="表状态(是否同步)") private Integer objectStatus; + @AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TABLE_TYPE.class) @Column(name="OBJECT_TYPE") @ApiParam(value ="数据类型") private Integer objectType; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index c12f8d0..e919715 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -8,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,6 +55,18 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="数据对象列名称") private String objectColumnName; + // 暂用来区分存储过程出入参数信息 + @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class) + @ColumnDefault("10") + @Column(name="ORIGIN_PROPERTY_TYPE") + @ApiParam(value ="原始列类型") + private Integer originPropertyType; + + public String getOriginPropertyTypeTxt() { + return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription() + : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType); + } + @Column(name="OBJECT_COLUMN_TYPE") @ApiParam(value ="数据对象类型") private Integer objectColumnType; @@ -64,12 +79,16 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="是否主键") private Integer isPrimaryKey; + public boolean isPrimaryKey(){ + return isPrimaryKey != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isPrimaryKey); + } + @Column(name="IS_NULLABLE") @ApiParam(value = "是否允许为空") private Integer isNullable; public Integer getIsNullableVal(){ - return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue(); + return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable; } // 字段长度 diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 29d0044..20b7111 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -8,11 +8,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; 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.Lob; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -72,18 +74,34 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否新增") private Integer isObjectAdd; + public boolean isObjectAdd(){ + return isObjectAdd != null && isObjectAdd == BlockFormEnumUtil.ELEMENT_ADD_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_EDIT") @ApiParam(value = "是否编辑") private Integer isObjectEdit; + public boolean isObjectEdit(){ + return isObjectEdit != null && isObjectEdit == BlockFormEnumUtil.ELEMENT_EDIT_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_DEL") @ApiParam(value = "是否删除") private Integer isObjectDel; + public boolean isObjectDel(){ + return isObjectDel != null && isObjectDel == BlockFormEnumUtil.ELEMENT_DEL_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_DEL_WEAK") @ApiParam(value = "是否弱删除") private Integer isObjectDelWeak; + public boolean isObjectDelWeak(){ + return isObjectDelWeak != null && isObjectDelWeak == BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.ON.getValue(); + } + public Integer getIsObjectDelWeakVal(){ return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue(); } @@ -100,6 +118,10 @@ public class BfElement extends BaseBean { return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue(); } + public boolean isObjectValid(){ + return isObjectValid != null && isObjectValid == BlockFormEnumUtil.ELEMENT_VALID_STATUS.ON.getValue(); + } + @Column(name = "ELEMENT_VALID_ATTR_ID") @ApiParam(value = "元素有效属性id") private Long elementValidAttrId; @@ -112,10 +134,30 @@ public class BfElement extends BaseBean { return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue(); } + public boolean isOrganizeIsolation(){ + return isOrganizeIsolation != null && isOrganizeIsolation == BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.ON.getValue(); + } + @Column(name = "ELEMENT_ORGANIZE_ISOLATION_ATTR_ID") + @ApiParam(value = "组织隔离属性id") + private Long elementOrganizeIsolationAttrId; + + public Long getElementOrganizeIsolationAttrId() { + return elementOrganizeIsolationAttrId; + } + + public void setElementOrganizeIsolationAttrId(Long elementOrganizeIsolationAttrId) { + this.elementOrganizeIsolationAttrId = elementOrganizeIsolationAttrId; + } + @Column(name = "IS_OBJECT_EXPORT") @ApiParam(value = "是否导出") private Integer isObjectExport; + @ColumnDefault("2") + @Column(name = "IS_OBJECT_IMPORT") + @ApiParam(value = "是否导入") + private Integer isObjectImport; + @Column(name="ELEMENT_SORT_ATTR_ID") @ApiParam(value ="默认排序属性") @JsonSerialize(using = ToStringSerializer.class) @@ -129,10 +171,16 @@ public class BfElement extends BaseBean { @ApiParam(value ="默认排序规则") private Integer elementSortAttrType; +// @Lob @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") private String elementCssStyle; +// @Lob + @Column(name="ELEMENT_FORMATTER") + @ApiParam(value ="元素格式化") + private String elementFormatter; + @Column(name="ELEMENT_DESCRIPTION") @ApiParam(value ="元素描述") private String elementDescription; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java index 8bf2d5c..2a6f1c9 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java @@ -30,6 +30,8 @@ import javax.persistence.Table; @Api(value = "表单拾取属性", description = "表单拾取属性") public class BfElementPickUpProperty extends BaseBean { + private static final long serialVersionUID = -1071243642582327905L; + @Column(name = "PICK_UP_PROPERTY_ID") @ApiParam(value = "拾取属性id", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index a89a117..864ad93 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -2,12 +2,15 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -49,6 +52,18 @@ public class BfElementProperty extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long dataObjectPropertyId; + // 暂用来区分存储过程出入参数信息 + @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class) + @ColumnDefault("10") + @Column(name="ORIGIN_PROPERTY_TYPE") + @ApiParam(value ="原始列类型") + private Integer originPropertyType; + + public String getOriginPropertyTypeTxt() { + return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription() + : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType); + } + @Column(name="PROPERTY_TYPE") @ApiParam(value ="属性类型") private Integer propertyType; @@ -73,6 +88,10 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "是否必填") private Integer propertyValueNotNull; + public boolean isPropValNotNull() { + return propertyValueNotNull == null || propertyValueNotNull == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + } + @Column(name = "PROPERTY_IS_FIND") @ApiParam(value = "是否查询条件") private Integer propertyIsFind; @@ -109,6 +128,14 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "显示顺序") private Integer propertySort; + @Column(name = "IS_SUPPORT_IMPORT") + @ApiParam(value = "是否支持导入") + private Integer isSupportImport; + + public boolean isSupportImport() { + return isSupportImport != null && isSupportImport == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + } + @Column(name = "PROPERTY_CONTROL_TYPE") @ApiParam(value = "控件类型") private Integer propertyControlType; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index 06adc7a..bd5d622 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -28,59 +28,64 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_METHOD_DETAIL_PROPERTY") -@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") +@Table(name = "BF_METHOD_DETAIL_PROPERTY") +@Api(value = "表单功能明细关联属性", description = "表单功能明细关联属性") public class BfMethodDetailProperty extends BaseBean { private static final long serialVersionUID = -7541677357317732343L; - @Column(name="METHOD_ID") - @ApiParam(value ="功能id") + @Column(name = "METHOD_ID") + @ApiParam(value = "功能id") @JsonSerialize(using = ToStringSerializer.class) private Long methodId; // 关联功能明细表id - @Column(name="PRI_METHOD_DETAIL_ID") - @ApiParam(value ="主功能明细id") + @Column(name = "PRI_METHOD_DETAIL_ID") + @ApiParam(value = "主功能明细id") @JsonSerialize(using = ToStringSerializer.class) private Long priMethodDetailId; - @Column(name="PRI_METHOD_DETAIL_NAME_RDD") - @ApiParam(value ="主功能明细名称") + @Column(name = "PRI_METHOD_DETAIL_NAME_RDD") + @ApiParam(value = "主功能明细名称") private String priMethodDetailNameRdd; - @Column(name="PRI_ELEMENT_ID") - @ApiParam(value ="主对象元素id") + @Column(name = "PRI_ELEMENT_ID") + @ApiParam(value = "主对象元素id") @JsonSerialize(using = ToStringSerializer.class) private Long priElementId; - @Column(name="PRI_ELEMENT_NAME_RDD") - @ApiParam(value ="主对象元素名称") + @Column(name = "PRI_ELEMENT_NAME_RDD") + @ApiParam(value = "主对象元素名称") private String priElementNameRdd; // 枚举:BlockFormEnumUtil.TRIGGER_EVENT - @Column(name="PRI_ELEMENT_EVENT") - @ApiParam(value ="主对象元素事件") + @Column(name = "PRI_ELEMENT_EVENT") + @ApiParam(value = "主对象元素事件") private Integer priElementEvent; - @Column(name="SEC_METHOD_DETAIL_ID") - @ApiParam(value ="关联功能明细id") + // 枚举:BlockFormEnumUtil.TRIGGER_ACTION + @Column(name = "PRI_ELEMENT_ACTION") + @ApiParam(value = "主对象元素动作") + private Integer priElementAction; + + @Column(name = "SEC_METHOD_DETAIL_ID") + @ApiParam(value = "关联功能明细id") @JsonSerialize(using = ToStringSerializer.class) private Long secMethodDetailId; - @Column(name="SEC_METHOD_DETAIL_NAME_RDD") - @ApiParam(value ="关联功能明细名称") + @Column(name = "SEC_METHOD_DETAIL_NAME_RDD") + @ApiParam(value = "关联功能明细名称") private String secMethodDetailNameRdd; - @Column(name="SEC_ELEMENT_ID") - @ApiParam(value ="关联对象元素id") + @Column(name = "SEC_ELEMENT_ID") + @ApiParam(value = "关联对象元素id") @JsonSerialize(using = ToStringSerializer.class) private Long secElementId; - @Column(name="SEC_ELEMENT_NAME_RDD") - @ApiParam(value ="关联对象元素名称") + @Column(name = "SEC_ELEMENT_NAME_RDD") + @ApiParam(value = "关联对象元素名称") private String secElementNameRdd; @Transient - @ApiParam(value ="表单功能明细关联属性") + @ApiParam(value = "表单功能明细关联属性") private List refList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java index 0a5e8be..6f48488 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_METHOD_DETAIL_PROPERTY") +@Table(name="BF_METHOD_DETAIL_PROPERTY_REF") @Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") public class BfMethodDetailPropertyRef extends BaseBean { diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0a44fb0..17f3171 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -42,6 +42,12 @@ + + + i3plus.pojo + i3plus-pojo-base + + ${project.artifactId}-${project.version} diff --git a/modules/i3plus-pojo-hardswitch/src/main/java/cn/estsh/i3plus/pojo/hardswitch/bean/OpcUAParam.java b/modules/i3plus-pojo-hardswitch/src/main/java/cn/estsh/i3plus/pojo/hardswitch/bean/OpcUAParam.java new file mode 100644 index 0000000..654b74b --- /dev/null +++ b/modules/i3plus-pojo-hardswitch/src/main/java/cn/estsh/i3plus/pojo/hardswitch/bean/OpcUAParam.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.hardswitch.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-11-12 17:03 + * @Modify: + **/ +@Data +public class OpcUAParam { + + //opc.tcp://127.0.0.1:49320 + @ApiParam("ua服务地址") + private String serverUrl; + + /** + * 命名空间索引 + * 地址所在的 OPC UA 服务器命名空间的索引。 + */ + @ApiParam("命名空间索引") + private Integer namespaceIndex; + + /** + * 标记地址 + * 通道.设备.标记 + */ + @ApiParam("标记地址") + private String tagAddress; + + /** + * 标记值 + */ + @ApiParam("标记值") + private String tagValue; + + /** + * 标记值类型 + */ + @ApiParam("标记值类型") +// @AnnoOutputColumn(refClass = OpcUAEnumUtil.OPC_UA_TAG_VALUE_TYPE.class) + private String tagValueType; + public String getTagValueTypeVal(){ + return tagValueType == null ? "10" : tagValueType; + } + + /** + * 用户名 + */ + @ApiParam("用户名") + private String userName; + + /** + * 用户密码 + */ + @ApiParam("用户密码") + private String password; + + /** + * 请求间隔 + */ + @ApiParam("请求间隔") + private Double requestInterval = 500.0; + +} diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-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 ba89b61..123fdc9 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-DEV-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 fdcf6e3..50ab2c2 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..7f94617 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index 3fef7c4..b549407 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -7,7 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; @@ -29,12 +29,12 @@ public abstract class BaseMdmBean extends BaseBean { private static final long serialVersionUID = 3957595289035947441L; @Transient - @ApiModelProperty("是否主数据") + @ApiParam("是否主数据") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); @Column(name = "MDM_VERSION") - @ApiModelProperty("mdm数据版本") + @ApiParam("mdm数据版本") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) private Long mdmVersion; @@ -50,12 +50,12 @@ public abstract class BaseMdmBean extends BaseBean { } @Column(name = "IS_MDM_PUBLISHED") - @ApiModelProperty("是否发布") + @ApiParam("是否发布") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) private Integer isMdmPublished; @Column(name = "MDM_OPERATE_TYPE") - @ApiModelProperty("操作类型") + @ApiParam("操作类型") @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true) private Integer mdmOperateType; @@ -68,7 +68,7 @@ public abstract class BaseMdmBean extends BaseBean { } @Column(name = "MDM_REF_ID") - @ApiModelProperty("关联id") + @ApiParam("关联id") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) private Long mdmRefId; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java index ef84a68..a35e1f0 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; @@ -27,23 +27,24 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean { private static final long serialVersionUID = 4267453020130810967L; @Transient - @ApiModelProperty("是否主数据") + @ApiParam("是否主数据") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); @Transient - @ApiModelProperty("主数据Class") + @ApiParam("主数据Class") @AnnoOutputColumn(hidden = true) protected static Class mdmMasterClass = BaseMdmBean.class; @Transient - @ApiModelProperty("软件模块") + @ApiParam("软件模块") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true) protected static Integer mdmSoftType; @Column(name = "MDM_MASTER_ID") - @ApiModelProperty("主数据id") + @ApiParam("主数据id") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) public Long mdmMasterId; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java index 1fe17c1..a4096d2 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.mdm.bean.base; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; /** * @Description :MDM模型bean @@ -16,10 +16,10 @@ public abstract class BaseMdmBusiModelBean syncDataId; - @ApiModelProperty("同步数据用户名") + @ApiParam("同步数据用户名") private String syncDateUserName; - @ApiModelProperty("同步时间") + @ApiParam("同步时间") private String syncDateTime; - @ApiModelProperty("同步失败键") + @ApiParam("同步失败键") private String syncFailKey; - @ApiModelProperty("同步失败时间") + @ApiParam("同步失败时间") private String syncFailDateTime; - @ApiModelProperty("同步失败信息") + @ApiParam("同步失败信息") private String syncFailMessage; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java new file mode 100644 index 0000000..b9cb717 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MDM_DATA_SUBSCRIBE") +@ApiModel("数据订阅信息") +public class MdmDataSubscribe extends BaseBean { + + private static final long serialVersionUID = 8821827445193232389L; + + @Column(name = "MDM_CLASS_NAME") + @ApiParam("主数据类名") + private String mdmClassName; + + @Column(name = "MDM_NAME") + @ApiParam("主数据名称") + private String mdmName; + + @Column(name = "INTERNAL_APP_NUM") + @ApiParam("内部订阅应用数量") + private Integer internalAppNum; + + public long addInternalAppNum() { + if (internalAppNum == null) { + internalAppNum = 1; + } else { + internalAppNum++; + } + return internalAppNum; + } + + @Column(name = "EXTERNAL_APP_NUM") + @ApiParam("外部订阅应用数量") + private Integer externalAppNum; + + public long addExternalAppNum() { + if (externalAppNum == null) { + externalAppNum = 1; + } else { + externalAppNum++; + } + return externalAppNum; + } + + @Transient + @ApiParam("内部订阅信息") + private List internalAppSubList; + + public List getInternalAppSubList() { + return internalAppSubList == null ? new ArrayList<>() : internalAppSubList; + } + + public void addInternalApp(MdmDataSubscribeDetail detail) { + if (internalAppSubList == null) { + internalAppSubList = new ArrayList<>(); + } + internalAppSubList.add(detail); + } + + @Transient + @ApiParam("外部订阅信息") + private List externalAppSubList; + + public List getExternalAppSubList() { + return externalAppSubList == null ? new ArrayList<>() : externalAppSubList; + } + + public void addExternalApp(MdmDataSubscribeDetail detail) { + if (externalAppSubList == null) { + externalAppSubList = new ArrayList<>(); + } + externalAppSubList.add(detail); + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribeDetail.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribeDetail.java new file mode 100644 index 0000000..05be14b --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribeDetail.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MDM_DATA_SUBSCRIBE_DETAIL") +@ApiModel("数据订阅明细") +public class MdmDataSubscribeDetail extends BaseBean { + + private static final long serialVersionUID = -741233265567034262L; + + @Column(name = "DATA_SUBSCRIBE_ID") + @ApiParam("数据订阅id") + @JsonSerialize(using = ToStringSerializer.class) + private Long dataSubscribeId; + + @Column(name = "APP_ID") + @ApiParam("应用id") + @JsonSerialize(using = ToStringSerializer.class) + private Long appId; + + @Column(name = "APP_TYPE") + @ApiParam("应用类型") + private Integer appType; + + public int getAppTypeVal() { + return appType == null ? MdmEnumUtil.MDM_SYNC_APP_TYPE.INTERNAL.getValue() : appType; + } + + @Column(name = "APP_NAME") + @ApiParam("应用名称") + private String appName; +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java new file mode 100644 index 0000000..8a05c07 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MDM_EXTERNAL_APP") +@ApiModel("外部应用信息") +public class MdmExternalApp extends BaseBean { + + private static final long serialVersionUID = -5344361274535836969L; + + @Column(name = "APP_NAME") + @ApiParam("应用名称") + private String appName; + + @Column(name = "APP_CODE") + @ApiParam("应用代码") + private String appCode; + + @Column(name = "CALL_TOKEN") + @ApiParam("调用令牌") + private String callToken; + + @Column(name = "CALLBACK_URL") + @ApiParam("回调地址") + private String callbackUrl; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java index 7c498ef..b46e36a 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java @@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; @@ -35,17 +35,17 @@ public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean { private static final long serialVersionUID = -3535174942277452194L; @Transient - @ApiModelProperty("主数据Class") + @ApiParam("主数据Class") @AnnoOutputColumn(hidden = true) public static Class mdmMasterClass = MdmGear.class; @Transient - @ApiModelProperty("软件模块") + @ApiParam("软件模块") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true) public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue(); @Column(name = "CORE_NUM") - @ApiModelProperty("核心数量") + @ApiParam("核心数量") public String coreNum; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java index 18dbcb1..bd07162 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.mdm.bean.master; import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; @@ -31,11 +31,11 @@ public class MdmGear extends BaseMdmBean { private static final long serialVersionUID = -7580444601811207793L; @Column(name="NAME") - @ApiModelProperty("齿轮名称") + @ApiParam("齿轮名称") private String name; @Column(name="GEAR_MODEL") - @ApiModelProperty("齿轮规格") + @ApiParam("齿轮规格") private String gearModel; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java index 76a4cd5..1e31ec2 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java @@ -71,11 +71,11 @@ public class MdmBusiModelRepositoryImpl, M value = propValue[i]; if (value != null) { if ((value instanceof Object[])) { - query.setParameter(name.replace(".", ""), (Object[]) value); + query.setParameter(name.replace("_", ""), (Object[]) value); } else if ((value instanceof Collection)) { - query.setParameter(name.replace(".", ""), (Collection) value); + query.setParameter(name.replace("_", ""), (Collection) value); } else { - query.setParameter(name.replace(".", ""), value); + query.setParameter(name.replace("_", ""), value); } } } @@ -90,12 +90,12 @@ public class MdmBusiModelRepositoryImpl, M if (((value instanceof Object[])) || ((value instanceof Collection))) { Object[] arraySerializable = (Object[]) value; if ((arraySerializable != null) && (arraySerializable.length > 0)) { - sb.append(" and model." + name + " in (:" + name.replace(".", "") + ")"); + sb.append(" and model." + name + " in (:" + name.replace("_", "") + ")"); } } else if (value == null) { sb.append(" and model." + name + " is null "); } else { - sb.append(" and model." + name + "=:" + name.replace(".", "")); + sb.append(" and model." + name + "=:" + name.replace("_", "")); } } } @@ -148,7 +148,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -272,7 +272,7 @@ public class MdmBusiModelRepositoryImpl, M @Override public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { String queryString = - selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; + selectAll + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; try { List list = entityManager.createQuery(queryString) .setParameter(entityType.getAlias() + "_" + propertyName, value) @@ -345,7 +345,7 @@ public class MdmBusiModelRepositoryImpl, M @Override public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { try { - String queryString = selectCount + " where " + entityType.getAlias() + "." + propertyName + String queryString = selectCount + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; Long count = entityManager.createQuery(queryString, Long.class) .setParameter(entityType.getAlias() + "_" + propertyName, value) @@ -400,7 +400,7 @@ public class MdmBusiModelRepositoryImpl, M @Override public List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager) { if (pager.getTotalRows() > 0) { - String queryString = selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff; + String queryString = selectAll + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff; return entityManager.createQuery(queryString) .setParameter(entityType.getAlias() + "_" + propertyName, value) .getResultList(); @@ -592,7 +592,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -613,7 +613,7 @@ public class MdmBusiModelRepositoryImpl, M Query query = entityManager.createQuery(queryString.toString(), Long.class); for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -657,7 +657,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -695,7 +695,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -714,7 +714,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -731,7 +731,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java index 6e7cc79..874d299 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java @@ -22,6 +22,7 @@ public class MdmHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeDetailRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeDetailRepository.java new file mode 100644 index 0000000..480bf9a --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mdm.repository.busi; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmDataSubscribeDetail; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-04-14 10:56 + * @Modify: + **/ +public interface MdmDataSubscribeDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeRepository.java new file mode 100644 index 0000000..752f798 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.busi; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmDataSubscribe; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:44 + * @Modify: + **/ +@Repository +public interface MdmDataSubscribeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java new file mode 100644 index 0000000..7d89f14 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.busi; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-03-29 17:52 + * @Modify: + **/ +@Repository +public interface MdmExternalAppRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java new file mode 100644 index 0000000..0d83dd8 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java @@ -0,0 +1,499 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-11-22 20:37 + * @Modify: + **/ +public final class DdlMdmBusiPreparedPack extends DdlMdmModelPreparedPack { + + protected static MdmEnumUtil.HQL_ENTITY_TYPE entityType = MdmEnumUtil.HQL_ENTITY_TYPE.BUSI; + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + timeBuilder(entityType, startDate, endDate, columnName, packBean, isShowTime); + } + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) { + timeBuilder(entityType, startDate, endDate, columnName, isLeftContain, isRightContain, packBean); + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) { + timeBuilder(entityType, date, columnName, packBean, showTaday, isShowTime); + } + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + getTimeBetweenCol(entityType, date, startColumnName, endColumnName, packBean, isShowTime); + } + + /** + * 封装String对象成order by排序 + *s + * @param order + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object[] order, String[] columnName, DdlPackMdmModelBean packBean) { + getOrderByPack(entityTypes, order, columnName, packBean); + } + + /** + * 对象默认排序 + * + * @param bean + */ + public static void getOrderDefault(BaseBean bean) { + getOrderDefault(bean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringRightLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringRightLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLeftLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLeftLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikePack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成不等于语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringNoEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotNullPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotNullPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotBlanklPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotBlanklPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装long或者int的正整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param twoColumnName + * @param packBean + */ + public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) { + getNotEqueals(entityType, firstColumnName, twoColumnName, packBean); + } + + /** + * 封装long或者int的负整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNegativeNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOr(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOr(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOverZero(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumWithZeroEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPackContainsZero(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumNOEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getInPack(entityType, data, columnName, packBean); + } + + /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotOrIsNull(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(String data, String columnName, DdlPackMdmModelBean packBean) { + getOrInPack(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getInOrPackString(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackString(entityType, data, columnName, packBean); + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPack(entityType, data, columnName, packBean); + } + + /** + * 转换排序列 + * + * @param columnName 列名 + * @param basisType 基本类型 + * @return + * @see CommonEnumUtil.BASIS_TYPE + */ + public static String getOrderColConvertType(String columnName, int basisType) { + return getOrderColConvertType(entityType, columnName, basisType); + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java new file mode 100644 index 0000000..eea8a90 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java @@ -0,0 +1,499 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-11-22 20:37 + * @Modify: + **/ +public final class DdlMdmMasterPreparedPack extends DdlMdmModelPreparedPack { + + protected static MdmEnumUtil.HQL_ENTITY_TYPE entityType = MdmEnumUtil.HQL_ENTITY_TYPE.MASTER; + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + timeBuilder(entityType, startDate, endDate, columnName, packBean, isShowTime); + } + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) { + timeBuilder(entityType, startDate, endDate, columnName, isLeftContain, isRightContain, packBean); + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) { + timeBuilder(entityType, date, columnName, packBean, showTaday, isShowTime); + } + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + getTimeBetweenCol(entityType, date, startColumnName, endColumnName, packBean, isShowTime); + } + + /** + * 封装String对象成order by排序 + *s + * @param order + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object[] order, String[] columnName, DdlPackMdmModelBean packBean) { + getOrderByPack(entityTypes, order, columnName, packBean); + } + + /** + * 对象默认排序 + * + * @param bean + */ + public static void getOrderDefault(BaseBean bean) { + getOrderDefault(bean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringRightLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringRightLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLeftLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLeftLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikePack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成不等于语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringNoEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotNullPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotNullPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotBlanklPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotBlanklPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装long或者int的正整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param twoColumnName + * @param packBean + */ + public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) { + getNotEqueals(entityType, firstColumnName, twoColumnName, packBean); + } + + /** + * 封装long或者int的负整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNegativeNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOr(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOr(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOverZero(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumWithZeroEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPackContainsZero(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumNOEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getInPack(entityType, data, columnName, packBean); + } + + /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotOrIsNull(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(String data, String columnName, DdlPackMdmModelBean packBean) { + getOrInPack(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getInOrPackString(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackString(entityType, data, columnName, packBean); + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPack(entityType, data, columnName, packBean); + } + + /** + * 转换排序列 + * + * @param columnName 列名 + * @param basisType 基本类型 + * @return + * @see CommonEnumUtil.BASIS_TYPE + */ + public static String getOrderColConvertType(String columnName, int basisType) { + return getOrderColConvertType(entityType, columnName, basisType); + } +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/MdmHqlPack.java new file mode 100644 index 0000000..5d1aae3 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/MdmHqlPack.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmDataSubscribe; +import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-04-14 19:33 + * @Modify: + **/ +public class MdmHqlPack { + + /** + * mdm订阅信息查询条件拼接 + * + * @param mdmDataSubscribe + * @return + */ + public static DdlPackBean packHqlMdmDataSubscribe(MdmDataSubscribe mdmDataSubscribe) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmDataSubscribe); + + DdlPreparedPack.getStringLikerPack(mdmDataSubscribe.getMdmName(), "mdmName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(mdmDataSubscribe.getMdmClassName(), "mdmClassName", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckMdmDataSubscribeOnly(MdmDataSubscribe mdmDataSubscribe) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmDataSubscribe); + + DdlPreparedPack.getNumNOEqualPack(mdmDataSubscribe.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(mdmDataSubscribe.getMdmClassName(), "mdmClassName", ddlPackBean); + + return ddlPackBean; + } + + /** + * 外部应用查询条件拼接 + * + * @param mdmExternalApp + * @return + */ + public static DdlPackBean packHqlMdmExternalApp(MdmExternalApp mdmExternalApp) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmExternalApp); + + DdlPreparedPack.getStringLikerPack(mdmExternalApp.getAppName(), "appName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(mdmExternalApp.getAppCode(), "appCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 数据对象查询条件拼接 + * + * @param mdmExternalApp + * @return + */ + public static DdlPackBean packHqlCheckMdmExternalAppOnly(MdmExternalApp mdmExternalApp) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmExternalApp); + + DdlPreparedPack.getNumNOEqualPack(mdmExternalApp.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(mdmExternalApp.getAppCode(), "appCode", ddlPackBean); + + return ddlPackBean; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..d800ecf 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-DEV-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/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java deleted file mode 100644 index 651f8dc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ /dev/null @@ -1,100 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 10:01 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PACKAGE_DETAIL") -@Api("包装明细表") -public class IfPackageDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = -1873101288426218272L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装条码") - private String packageNo; - - @Column(name = "LOT_NO") - @ApiParam("包装批次") - private String lotNo; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编号2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编号3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编号4") - private String packageNo4; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; - - @Column(name = "CT_NO") - @ApiParam("容器编号") - private String ctNo; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java deleted file mode 100644 index ac19407..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java +++ /dev/null @@ -1,48 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION") -@Api("mes系统业务动作") -public class MesAction extends BaseBean implements Serializable { - private static final long serialVersionUID = -6451213228967727835L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "ACTION_NAME") - @ApiParam("动作名称") - private String actionName; - - @Column(name = "ACTION_TYPE") - @ApiParam("动作类型") - private Integer actionType; - - public int getActionTypeVal() { - return this.actionType == null ? 0 : this.actionType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java deleted file mode 100644 index eafb489..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java +++ /dev/null @@ -1,40 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\13 11:47 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_IF") -@Api("动作接口配置") -public class MesActionIf extends BaseBean implements Serializable { - - private static final long serialVersionUID = -5058215339453766620L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java deleted file mode 100644 index b38452f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java +++ /dev/null @@ -1,49 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作方法 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_METHOD") -@Api("系统业务动作方法") -public class MesActionMethod extends BaseBean implements Serializable { - private static final long serialVersionUID = 6249418690993577108L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "METHOD_CODE") - @ApiParam("方法代码") - private String methodCode; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java deleted file mode 100644 index d1910a3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description :生产区域 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_AREA") -@Api("生产区域") -public class MesArea extends BaseBean implements Serializable { - private static final long serialVersionUID = 1047604067591557689L; - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "AREA_NAME") - @ApiParam("区域名称") - private String areaName; - - @Transient - @ApiParam(value = "子集列表") - private List childTreeList; - - @Transient - @ApiParam(value = "名称") - private String name; - - // 默认值 -1 - @Transient - @ApiParam(value = "父节点", access = "父节点", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java deleted file mode 100644 index 7471095..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java +++ /dev/null @@ -1,90 +0,0 @@ -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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :BOM清单 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_BOM") -@Api("BOM清单") -public class MesBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -1772273641263268564L; - @Column(name = "PART_NO") - @ApiParam("父零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("父零件名称") - private String partName; - - @Column(name = "UNIT") - @ApiParam(value = "单位") - private String unit; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "数量", example = "0") - private Double qty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子零件") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子零件名称") - private String itemPartName; - - @Column(name = "ITEM_UNIT") - @ApiParam(value = "子零件单位") - private String itemUnit; - - @Column(name = "ITEM_QTY") - @ColumnDefault("0") - @ApiParam(value = "子零件数量", example = "0") - private Double itemQty; - - @Column(name = "BOM_VERSION") - @ApiParam(value = "BOM版本") - private String bomVersion; - - @Column(name = "EFF_START_TIME") - @ApiParam(value = "生效时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String effStartTime; - - @Column(name = "EFF_END_TIME") - @ApiParam(value = "失效时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String effEndTime; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getitemQtyVal() { - return this.itemQty == null ? 0.0d : this.itemQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java deleted file mode 100644 index 60e2d1d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java +++ /dev/null @@ -1,79 +0,0 @@ -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; -import javax.persistence.Version; -import java.io.Serializable; - -/** - * @Description :工位投料信息 - * @Reference : - * @Author : Wynne.Lu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CELL_FEED") -@Api("工位投料信息") -public class MesCellFeed extends BaseBean implements Serializable { - private static final long serialVersionUID = 2412657464618960515L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("特殊批次") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public Integer lockVersion; - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java deleted file mode 100644 index 6464445..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java +++ /dev/null @@ -1,74 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :工位投料履历信息 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2020-06-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CELL_FEED_RECORD") -@Api("工位投料履历信息") -public class MesCellFeedRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1947971379489107783L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("原材料数量") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java deleted file mode 100644 index f8b9558..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :配置表 - * @Reference : - * @Author : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CONFIG") -@Api("mes配置表") -public class MesConfig extends BaseBean implements Serializable { - private static final long serialVersionUID = -5759669472714287000L; - @Column(name = "CFG_CODE") - @ApiParam("配置代码") - private String cfgCode; - - @Column(name = "CFG_NAME") - @ApiParam("配置名称") - private String cfgName; - - @Column(name = "CFG_TYPE") - @ApiParam("配置类型") - private String cfgType; - - @Column(name = "CFG_KEY") - @ApiParam("配置key") - private String cfgKey; - - @Column(name = "CFG_VALUE") - @ApiParam("配置value") - private String cfgValue; - - @Column(name = "CFG_VAULE_DESC") - @ApiParam("配置value描述") - private String cfgValueDesc; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java deleted file mode 100644 index 8e9a363..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java +++ /dev/null @@ -1,40 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_PROD_LINE") -@Api("客户产线代码") -public class MesCustProdLine extends BaseBean implements Serializable { - private static final long serialVersionUID = 3049432665592161513L; - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "CUST_PROD_LINE_NAME") - @ApiParam("客户产线名称") - private String custProdLineName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java deleted file mode 100644 index 21f2ad1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java +++ /dev/null @@ -1,56 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes客户表 - * @Reference : - * @Author : crish - * @CreateDate : 2019-04-22 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUSTOMER") -@Api("客户信息") -public class MesCustomer extends BaseBean implements Serializable { - private static final long serialVersionUID = 167635887082538926L; - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "CUSTOMER_NAME") - @ApiParam("客户名称") - private String customerName; - - @Column(name = "BRIEF_TEXT") - @ApiParam("客户简称") - private String briefText; - - @Column(name = "ADDRESS") - @ApiParam("客户地址") - private String address; - - @Column(name = "CONTACT") - @ApiParam("客户联系人") - private String contact; - - @Column(name = "TELEPHONE") - @ApiParam("客户电话") - private String telephone; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java deleted file mode 100644 index 0c5f49c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java +++ /dev/null @@ -1,49 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes客户表 - * @Reference : - * @Author : yiming.gu - * @CreateDate : 2019-05-20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUSTOMER_PART") -@Api("客户零件关系") -public class MesCustomerPart extends BaseBean implements Serializable { - private static final long serialVersionUID = -4731252848471949263L; - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUSTOMER_PART_NO") - @ApiParam("客户零件号") - private String customerPartNo; - - @Column(name = "CUSTOMER_PART_NAME") - @ApiParam("客户零件描述") - private String customerPartName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java deleted file mode 100644 index 8bded7d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ /dev/null @@ -1,71 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:12 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DATA_OBJECT") -@Api("数据对象") -public class MesDataObject extends BaseBean implements Serializable { - - private static final long serialVersionUID = -1419262751765770535L; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Column(name = "FIELD_PK") - @ApiParam("主键") - private String fieldPk; - - @Column(name = "READ_FLAG_VALUE") - @ApiParam("读取标志值") - private String readFlagValue; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "SELF_ADDITION") - @ApiParam("自增列") - private String selfAddition; - - @Column(name = "SELF_ADDITION_VALUE") - @ApiParam("自增列值") - private Long selfAdditionValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java deleted file mode 100644 index 93ea185..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java +++ /dev/null @@ -1,82 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:17 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DATASOURCE") -@Api("地址清单") -public class MesDatasource extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7387559860198655900L; - @Column(name = "DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name = "DS_NAME") - @ApiParam("数据源名称") - private String dsName; - - @Column(name = "DS_TYPE") - @ApiParam("数据源类型") - private String dsType; - - @Column(name = "DS_HOST") - @ApiParam("主机") - private String dsHost; - - @Column(name = "DS_PORT") - @ApiParam("端口") - private Integer dsPort; - - @Column(name = "DS_USER") - @ApiParam("用户名") - private String dsUser; - - @Column(name = "DS_PASSWORD") - @ApiParam("密码") - private String dsPassword; - - @Column(name = "DS_DB_NAME") - @ApiParam("数据库名称") - private String dsDbName; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Override - public String toString() { - return "MesDatasource{" + - "dsCode='" + dsCode + '\'' + - ", dsName='" + dsName + '\'' + - ", dsType='" + dsType + '\'' + - ", dsHost='" + dsHost + '\'' + - ", dsPort=" + dsPort + - ", dsUser='" + dsUser + '\'' + - ", dsPassword='" + dsPassword + '\'' + - ", dsDbName='" + dsDbName + '\'' + - ", equipmentCode='" + equipmentCode + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java deleted file mode 100644 index 2214411..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ /dev/null @@ -1,68 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT") -@Api("缺陷表") -public class MesDefect extends BaseBean implements Serializable { - - private static final long serialVersionUID = -6771813937279359333L; - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "DEFECT_TYPE") - @ApiParam("缺陷类型") - private String defectType; - - @Transient - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @Transient - @ApiParam("缺陷位置") - private String defectLocation; - - @Transient - @ApiParam("缺陷类型子集") - private List mesDefectList; - public MesDefect() { - - } - - public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) { - this.defectCode = defectCode; - this.defectName = defectName; - this.defectType = defectType; - this.defectTypeName = defectTypeName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java deleted file mode 100644 index d4f287f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java +++ /dev/null @@ -1,44 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_CAUSE") -@Api("缺陷原因表") -public class MesDefectCause extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3867250593038812861L; - @Column(name = "DC_CODE") - @ApiParam("缺陷原因代码") - private String dcCode; - - @Column(name = "DC_NAME") - @ApiParam("缺陷原因名称") - private String dcName; - - @Column(name = "DC_TYPE") - @ApiParam("缺陷原因类型") - private String dcType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java deleted file mode 100644 index a97ccef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ /dev/null @@ -1,80 +0,0 @@ -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.*; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 19:53 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("不良信息记录表") -public class MesDefectRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2828208776424343584L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "DEFECT_LOCATION") - @ApiParam("缺陷位置") - private String defectLocation; - - @Column(name = "SIDE_LOCATION") - @ApiParam("面位") - private String sideLocation; - - @Column(name = "REPAIR_STATUS") - @ApiParam("维修状态") - private Integer repairStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Transient - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java deleted file mode 100644 index 14151ff..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ /dev/null @@ -1,97 +0,0 @@ -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.*; -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 15:03 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD", indexes = { - @Index(columnList = "SN"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("物料拆解记录表") -public class MesDismantleRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7924346039878218038L; - @Column(name = "DISMANTLE_ID") - @ApiParam("拆解编号") - private String dismantleId; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "PARENT_PART_NO") - @ApiParam("产品物料编码") - private String parentPartNo; - - @Column(name = "PARENT_PART_NAME") - @ApiParam("产品物料名称") - private String parentPartName; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Double qty; - - @Column(name = "DISMANTLE_QTY") - @ApiParam("拆解数") - private BigDecimal dismantleQty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子物料编码") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子物料名称") - private String itemPartName; - - @Column(name = "OK_QTY") - @ApiParam("合格数") - private BigDecimal okQty; - - @Column(name = "MISS_QTY") - @ApiParam("缺失数") - private BigDecimal missQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数") - private BigDecimal scrapQty; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Transient - private String serialNumber; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java deleted file mode 100644 index 655c2f4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java +++ /dev/null @@ -1,93 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/7/30 9:30 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ESOP") -@Api("作业指导书信息表(ODS)") -public class MesEsop extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4869646502033099294L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步序号") - private Integer stepSeq; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - - @Transient - @ApiParam("文件名称") - private String fileName; - - @Transient - @ApiParam("文件URL") - private String fileUrl; - - @Transient - @ApiParam("组名") - private String groupName; - - @Transient - @ApiParam("文件原名") - private String fileOriginName; - - @Transient - @ApiParam("文件大小") - private String fileSize; - - @Transient - @ApiParam("文件类型名称") - private String fileType; - - @Transient - @ApiParam("同步标记") - private Integer syncTag = 0; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java deleted file mode 100644 index cc17b50..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java +++ /dev/null @@ -1,52 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes系统业务事件 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EVENT") -@Api("系统业务事件") -public class MesEvent extends BaseBean implements Serializable { - private static final long serialVersionUID = -5604724665202938464L; - @Column(name = "EVENT_CODE") - @ApiParam("事件代码") - private String eventCode; - - @Column(name = "EVENT_NAME") - @ApiParam("事件名称") - private String eventName; - - @Column(name = "EVENT_TYPE") - @ApiParam("事件类型") - private Integer eventType; - - @Column(name = "BUTTON_CODE") - @ApiParam("按钮代码") - private String buttonCode; - - public int getEventTypeVal() { - return this.eventType == null ? 0 : this.eventType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java deleted file mode 100644 index 2a16eb0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java +++ /dev/null @@ -1,54 +0,0 @@ -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.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务事件动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EVENT_ACTION") -@Api("系统业务事件动作") -public class MesEventAction extends BaseBean implements Serializable { - private static final long serialVersionUID = 3964084375279916831L; - @Column(name = "EVENT_CODE") - @ApiParam("事件代码") - private String eventCode; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java deleted file mode 100644 index a90ed92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java +++ /dev/null @@ -1,59 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/12/4 1:28 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_FILE") -@Api("文件表") -public class MesFile extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7017379708394714424L; - @Column(name = "FILE_NAME") - @ApiParam("文件名称") - private String fileName; - - @Column(name = "FILE_URL") - @ApiParam("文件URL") - private String fileUrl; - - @Column(name = "GROUP_NAME") - @ApiParam("组名") - private String groupName; - - @Column(name = "FILE_ORIGIN_NAME") - @ApiParam("文件原名") - private String fileOriginName; - - @Column(name = "FILE_SIZE") - @ApiParam("文件大小") - private String fileSize; - - @Column(name = "FILE_TYPE") - @ApiParam("文件类型名称") - private String fileType; - - @Column(name = "SYNC_TAG") - @ApiParam("同步标记") - private Integer syncTag = 0; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java deleted file mode 100644 index 243e6a9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java +++ /dev/null @@ -1,65 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :物料关键数据 - * @Reference : - * @Author : crish - * @CreateDate : 2019-05-15 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_KP_DATA") -@Api("生产区域") -public class MesKpData extends BaseBean implements Serializable { - private static final long serialVersionUID = -3332582267186642790L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "KEY_DATA_CODE") - @ApiParam("关键数据代码") - private String keyDataCode; - - @Column(name = "KEY_DATA_NAME") - @ApiParam("关键数据名称") - private String keyDataName; - - @Column(name = "KEY_DATA_COUNT") - @ApiParam("关键数据数量") - private Integer keyDataCount; - - @Column(name = "UPPER_LIMIT") - @ApiParam("数据上限") - private Double upperLimit; - - @Column(name = "LOWER_LIMIT") - @ApiParam("数据下限") - private Double lowerLimit; - - @Transient - @ApiParam("扭矩值") - private Double torqueValue; - - @Transient - @ApiParam("是否在范围之内") - private Boolean ok; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java deleted file mode 100644 index 9ca9ac7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java +++ /dev/null @@ -1,95 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_KPSN_RULE") -@Api("关键件条码校验规则") -public class MesKpsnRule extends BaseBean implements Serializable { - private static final long serialVersionUID = 8238308232531730720L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "LENGTH") - @ApiParam("长度") - private Integer length; - - @Column(name = "FROM1") - @ApiParam("起始1") - private Integer from1; - - @Column(name = "TO1") - @ApiParam("至1") - private Integer to1; - - @Column(name = "FIX1") - @ApiParam("内容1") - private String fix1; - - @Column(name = "FROM2") - @ApiParam("起始2") - private Integer from2; - - @Column(name = "TO2") - @ApiParam("至2") - private Integer to2; - - @Column(name = "FIX2") - @ApiParam("内容2") - private String fix2; - - @Column(name = "TYPE") - @ApiParam("类型") - private String type; - - @Column(name = "BIND_RULE") - @ApiParam("绑定规则") - private Integer bandRule; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - public int getLengthVal() { - return this.length == null ? 0 : this.length; - } - - public int getFrom1Val() { - return this.from1 == null ? 0 : this.from1; - } - - public int getTo1Val() { - return this.to1 == null ? 0 : this.to1; - } - - public int getFrom2Val() { - return this.from2 == null ? 0 : this.from2; - } - - public int getTo2Val() { - return this.to2 == null ? 0 : this.to2; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java deleted file mode 100644 index 589c237..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java +++ /dev/null @@ -1,54 +0,0 @@ -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.*; -import java.io.Serializable; -import java.util.List; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-18 11:00 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_LABEL_TEMPLATE") -@Api(value = "打印模板", description = "打印模板") -public class MesLabelTemplate extends BaseBean implements Serializable { - - - private static final long serialVersionUID = 3797103812377146878L; - @Column(name = "TEMPLATE_CODE") - @ApiParam(value = "模板代码") - private String templateCode; - - @Column(name = "TEMPLATE_NAME") - @ApiParam(value = "模板名称") - private String templateName; - - @Lob - @Column(name = "TEMPLATE_CONTENT") - @ApiParam(value = "模板内容") - private String templateContent; - - // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value = "模板参数拼接") - @Transient - private String paramsPack; - - @Transient - @ApiParam(value = "模板id对应的模板参数") - private List labelTemplateParamList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java deleted file mode 100644 index 253f29a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Description : 打印模板参数 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-18 11:00 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_LABEL_TEMPLATE_PARAM") -@Api(value = "打印模板参数", description = "打印模板参数") -public class MesLabelTemplateParam extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3595706874099358555L; - @Column(name = "TEMPLATE_ID") - @ApiParam(value = "模板ID", access = "模板ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name = "TEMPLATE_CODE") - @ApiParam(value = "模板代码") - private String templateCode; - - @Column(name = "TEMPLATE_PARAM") - @ApiParam(value = "模板参数") - private String templateParam; - - @Lob - @Column(name = "TEMPLATE_PARAM_TEXT") - @ApiParam(value = "模板参数描述") - private String templateParamText; - - // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value = "模板参数值") - @Transient - private String templateParamValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java deleted file mode 100644 index e8daace..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java +++ /dev/null @@ -1,55 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes系统业务方法 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_METHOD") -@Api("系统业务方法") -public class MesMethod extends BaseBean implements Serializable { - private static final long serialVersionUID = -3629909409034083767L; - @Column(name = "METHOD_CODE") - @ApiParam("方法代码") - private String methodCode; - - @Column(name = "METHOD_NAME") - @ApiParam("方法名称") - private String methodName; - - @Column(name = "CALL_CLASS") - @ApiParam("具体实现类") - private String callClass; - - /** - * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） - */ - @Column(name = "METHOD_TYPE") - @ApiParam("方法类型") - private Integer methodType; - - public int getMethodTypeVal() { - return this.methodType == null ? 0 : this.methodType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java deleted file mode 100644 index 3e81c47..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java +++ /dev/null @@ -1,52 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 17:11 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_MONITOR_TASK") -@Api("监听任务") -public class MesMonitorTask extends BaseBean implements Serializable { - - private static final long serialVersionUID = -8614480099840448294L; - @Column(name = "TASK_NO") - @ApiParam("任务编号") - private String taskNo; - - @Column(name = "TASK_NAME") - @ApiParam("任务名称") - private String taskName; - - @Column(name = "TASK_OBJECT_TYPE") - @ApiParam("任务对象类型") - private Integer taskObjectType; - - @Column(name = "TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - - @Column(name = "TASK_EXCEPTION_DESC") - @ApiParam("异常描述") - private String taskExceptionDesc; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java deleted file mode 100644 index 891dc65..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java +++ /dev/null @@ -1,48 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 17:19 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_MONITOR_TASK_DETAIL") -@Api("监听任务明细") -public class MesMonitorTaskDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4811270359386960747L; - @Column(name = "TASK_NO") - @ApiParam("任务编号") - private String taskNo; - - @Column(name = "DATA_OBJECT_NO") - @ApiParam("数据对象编号") - private String dataObjectNo; - -// @Column(name = "STORE_OBJECT_CODE") -// @ApiParam("存储对象代码") -// private String storeObjectCode; -// -// @Column(name = "STORE_FIELD_CODE") -// @ApiParam("存储字段代码") -// private String storeFieldCode; - -} 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 deleted file mode 100644 index 9fc51c2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java +++ /dev/null @@ -1,60 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @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 implements Serializable { - - private static final long serialVersionUID = -4039194855353751178L; - @Column(name = "RULE_CODE") - @ApiParam("规则代码") - private String ruleCode; - - @Column(name = "RULE_DESC") - @ApiParam("规则描述") - private String ruleDesc; - - @Column(name = "PREFIX") - @ApiParam("前缀") - private String 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 deleted file mode 100644 index 16436c6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java +++ /dev/null @@ -1,49 +0,0 @@ -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; -import javax.persistence.Version; -import java.io.Serializable; - -/** - * @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 implements Serializable { - - private static final long serialVersionUID = -3024166851634742872L; - @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; - - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java deleted file mode 100644 index 5b7c166..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ /dev/null @@ -1,60 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:14 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_OBJECT_CFG") -@Api("对象结构") -public class MesObjectCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3640782210450491835L; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "FIELD_CODE") - @ApiParam("字段代码") - private String fieldCode; - - @Column(name = "FIELD_NAME") - @ApiParam("字段名称") - private String fieldName; - - @Column(name = "FIELD_TYPE") - @ApiParam("字段类型") - private String fieldType; - - @Column(name = "FIELD_LENGTH") - @ApiParam("列长度") - private Integer fieldLength; - - @Column(name = "POJO_ATTR") - @ApiParam("对应的pojo属性") - private String pojoAttr; - - @Column(name = "IS_SAVE") - @ApiParam("是否保存 1存 2不存") - private Integer isSave; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java deleted file mode 100644 index 38c0363..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ /dev/null @@ -1,62 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :PLC设备信息配置表 - * @Reference : - * @Author : Crish - * @CreateDate : 2019-05-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC_CONFIGURE") -@Api("PLC设备信息配置表") -@Deprecated -public class MesPLCConfigure extends BaseBean implements Serializable { - private static final long serialVersionUID = 8274445475806774L; - @Column(name = "IP") - @ApiParam("设备ip") - private String ipAddress; - - @Column(name = "CHANNEL_NAME") - @ApiParam("通道名称") - private String channelName; - - @Column(name = "DEVICE_NAME") - @ApiParam("设备地址") - private String deviceName; - - @Column(name = "TAG_NAME") - @ApiParam("标签地址") - private String tagName; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java deleted file mode 100644 index 7ca973d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java +++ /dev/null @@ -1,99 +0,0 @@ -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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :包装规格 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACK_SPEC") -@Api("包装规格") -public class MesPackSpec extends BaseBean implements Serializable { - private static final long serialVersionUID = -788654193624068327L; - @Column(name = "SPEC_CODE") - @ApiParam("包装规格代码") - private String specCode; - - @Column(name = "SPEC_NAME") - @ApiParam("包装规格名称") - private String specName; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "包装数量", example = "0") - private Double qty; - - @Column(name = "QTY2") - @ColumnDefault("0") - @ApiParam(value = "包装数量2", example = "0") - private Double qty2; - - @Column(name = "QTY3") - @ColumnDefault("0") - @ApiParam(value = "包装数量3", example = "0") - private Double qty3; - - @Column(name = "QTY4") - @ColumnDefault("0") - @ApiParam(value = "包装数量4", example = "0") - private Double qty4; - - @Column(name = "IS_MIXED") - @ApiParam("是否混包") - private Integer isMixed; - - @Column(name = "IS_MIXED2") - @ApiParam("是否混包2") - private Integer isMixed2; - - @Column(name = "IS_MIXED3") - @ApiParam("是否混包3") - private Integer isMixed3; - - @Column(name = "IS_MIXED4") - @ApiParam("是否混包4") - private Integer isMixed4; - - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getIsMixedVal() { - return this.isMixed == null ? 0 : this.isMixed; - } - - public int getIsMixed2Val() { - return this.isMixed2 == null ? 0 : this.isMixed2; - } - - public int getIsMixed3Val() { - return this.isMixed3 == null ? 0 : this.isMixed3; - } - - public int getIsMixed4Val() { - return this.isMixed4 == null ? 0 : this.isMixed4; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java deleted file mode 100644 index 6c1beda..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ /dev/null @@ -1,119 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 1:26 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) - } -) -@Api("包装规格") -public class MesPackage extends BaseBean implements Serializable { - private static final long serialVersionUID = 2292859018089339608L; - @Column(name = "PACKAGE_NO", nullable = false) - @ApiParam("包装编号") - private String packageNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "PACK_SPEC_QTY") - @ApiParam("包装规格数量") - private Double packSpecQty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "LOT_NO") - @ApiParam("批号") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批号") - private String fixLotNo; - - @Column(name = "PACK_SPEC") - @ApiParam("包装规格") - private String packSpec; - - @Column(name = "IS_SEALED") - @ApiParam("是否封箱") - private Integer isSealed; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态10：未打印 20：已打印") - private Integer printStatus; - - @Column(name = "PACK_LEVEL") - @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") - private Integer packLevel; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Transient - @ApiParam("封箱状态") - private String sealStatus; - - @Transient - @ApiParam("打印状态文字") - private String printStrStatus; - - @Transient - @ApiParam("打印缓存id") - private String printId; - - public MesPackage() { - } - - public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { - this.packageNo = packageNo; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.qty = qty; - this.packSpecQty = packSpecQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java deleted file mode 100644 index 863a6fd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ /dev/null @@ -1,63 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 2:55 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) - } -) -@Api("包装规格明细") -public class MesPackageDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8162606304720621672L; - @Column(name = "PACKAGE_NO", nullable = false) - @ApiParam("包装编码") - private String packageNo; - - @Column(name = "SERIAL_NUMBER", nullable = false) - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("物料编号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编码2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编码3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编码4") - private String packageNo4; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java deleted file mode 100644 index 72084e3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ /dev/null @@ -1,58 +0,0 @@ -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.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 3:23 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) -@Api("包装履历表") -public class MesPackageTravel extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2808747095415676213L; - @Column(name = "PACKAGE_NO") - @ApiParam("包装编码") - private String packageNo; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "OP_TYPE") - @ApiParam("操作类型") - private Integer opType; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编码2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编码3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编码4") - private String packageNo4; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java deleted file mode 100644 index 81365ef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ /dev/null @@ -1,93 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :物料信息 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART") -@Api("物料信息") -public class MesPart extends BaseBean implements Serializable { - private static final long serialVersionUID = 3936033255397936854L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("零件名称") - private String partName; - - @Column(name = "BRIEF_TEXT") - @ApiParam("零件简称") - private String briefText; - - @Column(name = "PART_SPEC") - @ApiParam("零件规格") - private String partSpec; - - @Column(name = "CATEGORY_CODE1") - @ApiParam("分类1") - private String categoryCode1; - - @Column(name = "CATEGORY_CODE2") - @ApiParam("分类2") - private String categoryCode2; - - @Column(name = "CATEGORY_CODE3") - @ApiParam("分类3") - private String categoryCode3; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "PACK_SPEC_CODE") - @ApiParam("包装规格代码") - private String packSpecCode; - - @Column(name = "DEFAULT_WORK_CENTER") - @ApiParam("默认工作中心") - private String defaultWorkCenter; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PROCESS_MATCH_TYPE") - @ApiParam("过程编码匹配类型") - private Integer processMatchType; - - @Column(name = "PACKAGE_MATCH_TYPE") - @ApiParam("包装编码匹配类型") - private Integer packageMatchType; - - @Column(name = "PRODUCT_MATCH_TYPE") - @ApiParam("产品编码匹配类型") - private Integer productMatchType; - - @Transient - @ApiParam("分类名称") - private String categoryName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java deleted file mode 100644 index 949a02f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java +++ /dev/null @@ -1,44 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :零件种类 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART_CATEGORY") -@Api("零件种类") -public class MesPartCategory extends BaseBean implements Serializable { - private static final long serialVersionUID = 9076081904146489470L; - @Column(name = "CATEGORY_CODE") - @ApiParam("分类代码") - private String categoryCode; - - @Column(name = "CATEGORY_NAME") - @ApiParam("分类名称") - private String categoryName; - - @Column(name = "CATEGORY_TYPE") - @ApiParam("分类类型") - private String categoryType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java deleted file mode 100644 index 9c8adca..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ /dev/null @@ -1,68 +0,0 @@ -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.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :JIS发运模式 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PATTERN_JIS") -@Api("JIS发运模式") -public class MesPatternJis extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1119289554542499312L; - @Column(name = "PATTERN_NO") - @ApiParam("模式编号") - private String patternNo; - - @Column(name = "PATTERN_NAME") - @ApiParam("模式名称") - private String patternName; - - @Column(name = "QUEUE_NO") - @ApiParam("显示主队列数") - private Integer queueNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; - - @Column(name = "PATTERN_DESC") - @ApiParam("描述") - private String patternDesc; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型组") - private String produceCategoryCode; - - @Column(name = "PATTERN_TYPE") - @ApiParam("模式类型") - private Integer patternType; - - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java deleted file mode 100644 index c19bfa3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ /dev/null @@ -1,87 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN") -@Api("PCN节点") -public class MesPcn extends BaseBean implements Serializable { - private static final long serialVersionUID = -7570827672640277097L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "PCN_NAME") - @ApiParam("PCN名称") - private String pcnName; - - @Column(name = "AREA_CODE") - @ApiParam("区域") - private String areaCode; - - @Column(name = "AREA_NAME") - @ApiParam("区域名称") - private String areaName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "PCN_VERSION") - @ApiParam("PCN版本") - private String pcnVersion; - - @Column(name = "CONNECT_IP") - @ApiParam("连接IP") - private String connectIp; - - @Column(name = "CONNECT_COUNT") - @ApiParam("连接次数") - private Integer connectCount; - - @Column(name = "IS_CONNECT") - @ApiParam("是否连接") - private Integer isConnect; - - @Column(name = "CONNECT_TIME") - @ApiParam("连接时间") - private String connectTime; - - @Column(name = "CODE_SPECIFIC") - @ApiParam("PCN特殊字段") - private String codeSpecific; - - public int getConnectCountVal() { - return this.connectCount == null ? 0 : this.connectCount; - } - - public int getIsConnectVal() { - return this.isConnect == null ? 0 : this.isConnect; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java deleted file mode 100644 index faa7f92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java +++ /dev/null @@ -1,55 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_CONNECT_LOG") -@Api("PCN节点连接日志") -public class MesPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -4153357131289178766L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "PCN_NAME") - @ApiParam("PCN名称") - private String pcnName; - - @Column(name = "PCN_VERSION") - @ApiParam("PCN版本") - private String pcnVersion; - - @Column(name = "CONNECT_IP") - @ApiParam("连接IP") - private String connectIp; - - @Column(name = "IS_CONNECT") - @ApiParam("是否连接") - private Integer isConnect; - - @Column(name = "REMARK") - @ApiParam("备注") - private String Remark; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java deleted file mode 100644 index 4d321f8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java +++ /dev/null @@ -1,92 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYNC_CFG") -@Api("MES_PCN_同步配置") -public class MesPcnSyncCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -6869288362923390521L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "OBJECT_KEY") - @ApiParam("对象主键") - private String objectKey; - - @Column(name = "SYNC_FREQUENCY") - @ApiParam("同步频率") - private Integer syncFrequency; - - @Column(name = "SYNC_TIME") - @ApiParam(value = "同步时间") - private String syncTime; - - @Column(name = "SYNC_PATTERN") - @ApiParam("同步方式 2.新增 1.修改") - private Integer syncPattern; - - @Column(name = "SYNC_TYPE") - @ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes") - private Integer syncType; - - @Column(name = "LAST_SYNC_TIME") - @ApiParam(value = "上一同步时间") - private String lastSyncTime; - - @Column(name = "EXTRACT_GAP") - @ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制") - private Integer extractGap; - - @Column(name = "EXTRACT_CONDITION") - @ApiParam(value = "从数据库抽取的条件限制") - private String extractCondition; - - @Column(name = "IS_IGNORE_ORG") - @ApiParam(value = "同步的时候是否区分工厂") - private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); - - public int getSyncFrequencyVal() { - return this.syncFrequency == null ? 0 : this.syncFrequency; - } - - public int getSyncTypeVal() { - return this.syncType == null ? 0 : this.syncType; - } - - public int getSyncPatternVal() { - return this.syncPattern == null ? 0 : this.syncPattern; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java deleted file mode 100644 index 22810be..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ /dev/null @@ -1,54 +0,0 @@ -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.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYNC_ERRORLOG") -@Api("MES_PCN同步异常日志") -public class MesPcnSyncErrorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -2249754641660006488L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "ERROR_SPOT") - @ApiParam("异常位置") - private String errorSpot; - - @Lob - @Column(name = "ERROR_CONTENT") - @ApiParam("异常内容") - private String errorContent; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java deleted file mode 100644 index 78d3caa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ /dev/null @@ -1,70 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.List; - -/** - * @Description : 账号离线登陆表 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-09-01 11:02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYS_USER_OFFLINE") -@Api(value = "账号离线登陆表", description = "账号离线登陆表。") -public class MesPcnSysUserOffline extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7617353154826718154L; - @Column(name = "USER_ID") - @ApiParam(value = "人员ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long userId; - - @Column(name = "USER_CODE") - @ApiParam(value = "用户编号", access = "用户编号") - private String userCode; - - @Column(name = "USER_NAME") - @ApiParam(value = "用户名称", access = "账号名称") - private String userName; - - @Column(name = "LOGIN_NAME") - @ApiParam(value = "登陆名称", access = "登陆名称") - private String loginName; - - @Column(name="USER_TYPE") - @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") - private Integer userType; - - @Lob - @Column(name="LOGIN_INFO") - @ApiParam(value ="登陆信息" , access ="登陆信息") - private String loginInfo; - - @Lob - @Column(name="MENU_LIST") - @ApiParam(value ="菜单" , access ="菜单") - private String menuList; - - @Lob - @Column(name="MODULE_LIST") - @ApiParam(value ="模块" , access ="模块") - private String moduleList; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java deleted file mode 100644 index 8288401..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ /dev/null @@ -1,90 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes-pcn定时任务工作清单 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-26 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_TASK") -@Api("mes-pcn定时任务工作清单") -public class MesPcnTask extends BaseBean implements Serializable { - - private static final long serialVersionUID = 4777357978430670966L; - @Column(name = "TASK_CODE") - @ApiParam("任务代码") - private String taskCode; - - @Column(name = "TASK_NAME") - @ApiParam("任务名称") - private String taskName; - - @Column(name = "TASK_GROUP_NAME") - @ApiParam("任务组名称") - private String taskGroupName; - - @Column(name = "TASK_DESCRIPTION") - @ApiParam("任务描述") - private String taskDescription; - - @Column(name = "TASK_TYPE") - @ApiParam("任务类型") - private Integer taskType; - - @Column(name = "TASK_MODULE") - @ApiParam("任务模块") - private String taskModule; - - @Column(name = "TASK_CLASS") - @ApiParam("任务类名") - private String taskClass; - - @Column(name = "TASK_PACKAGE") - @ApiParam("任务包名") - private String taskPackage; - - @Column(name = "PCN_NAME") - @ApiParam("PCN节点名称") - private String pcnName; - - @Column(name = "PCN_CODE") - @ApiParam("PCN节点名称代码") - private String pcnCode; - - @Column(name = "TASK_CYCLE_EXPS") - @ApiParam("任务周期表达式") - private String taskCycleExps; - - @Column(name = "TASK_CYCLE_DESCRIPTION") - @ApiParam("任务周期描述") - private String taskCycleDescription; - - @Column(name = "TASK_PARAM") - @ApiParam("任务参数") - private String taskParam; - - public int getTaskTypeVal() { - return this.taskType == null ? 0 : this.taskType; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java deleted file mode 100644 index f0ee69f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java +++ /dev/null @@ -1,53 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes-pcn定时任务工作清单同步记录 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-27 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_TASK_LOG") -@Api("mes-pcn定时任务工作清单同步记录") -public class MesPcnTaskLog extends BaseBean implements Serializable { - - private static final long serialVersionUID = -784806389462540310L; - @Column(name = "SYNC_TIME_START") - @ApiParam("同步数据开始时间") - private String syncTimeStart; - - @Column(name = "SYNC_TIME_END") - @ApiParam("同步数据截止时间") - private String syncTimeEnd; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_CONTENT") - @ApiParam("异常内容") - private Long errorContent; - - public int getSyncStatusVal() { - return this.syncStatus == null ? 0 : this.syncStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java deleted file mode 100644 index bb60da6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ /dev/null @@ -1,144 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) - } -) -@Api("生产主计划") -public class MesPlanOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 8571104279843276872L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("生产计划单号") - private String orderNo; - - @Column(name = "PO_TYPE") - @ApiParam("计划类型") - private Integer planType; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PLAN_QTY") - @ApiParam("计划数量") - private Double planQty; - - @Column(name = "DECOMPOSE_QTY") - @ApiParam("分解数量") - private Double decomposeQty; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam("计划开始时间") - private String startTime; - - @Column(name = "END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam("计划结束时间") - private String endTime; - - @Column(name = "DELIVERY_DATE") - @ApiParam("交货日期") - private String deliveryDate; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "SOURCE") - @ApiParam("计划来源") - private String source; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - /********************** 冗余字段 *********************************/ - - @Transient - @ApiParam(value = "区域") - public String areaCode; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - public double getPlanQtyVal() { - return this.planQty == null ? 0.0d : this.planQty; - } - - public double getDecomposeQtyVal() { - return this.decomposeQty == null ? 0.0d : this.decomposeQty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public int getPlanTypeVal() { - return this.planType == null ? 0 : this.planType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java deleted file mode 100644 index 5d5a48c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ /dev/null @@ -1,112 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/25 8:07 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC") -@Api("PLC配置表") -public class MesPlc extends BaseBean implements Serializable { - - private static final long serialVersionUID = -5346536604317095818L; - @Column(name = "PLC_CODE") - @ApiParam("PLC代码") - private String plcCode; - - @Column(name = "PLC_NAME") - @ApiParam("PLC名称") - private String plcName; - - @Column(name = "PLC_MODEL") - @ApiParam("PLC型号") - private String plcModel; - - @Column(name = "PLC_IP") - @ApiParam("PLC IP") - private String plcIp; - - @Column(name = "CHANNEL") - @ApiParam("通道") - private String channel; - - @Column(name = "TAG_NAME") - @ApiParam("标签名称") - private String tagName; - - @Column(name = "TAG_ADDRESS") - @ApiParam("标签地址") - private String tagAddress; - - @Column(name = "DATA_TYPE") - @ApiParam("标签数据类型") - private String dataType; - - @Column(name = "GROUP_NAME") - @ApiParam("分组名称") - private String groupName; - - @Column(name = "DEVICE") - @ApiParam("驱动") - private String device; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "PLC_CFG") - @ApiParam("PLC的值的设定") - private String plcCfg; - - @Column(name = "ANALYSIS_RULE") - @ApiParam("解析规则") - private String analysisRule; - - @Column(name = "IS_ANALYSIS") - @ApiParam("是否解析") - private String isAnalysis; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Transient - @ApiParam("设备名称") - private String equipmentName; - - @Column(name = "TOOLING_CODE ") - @ApiParam("工装代码") - private String toolingCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java deleted file mode 100644 index 752400b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java +++ /dev/null @@ -1,39 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :工序 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROCESS") -@Api("工序") -public class MesProcess extends BaseBean implements Serializable { - private static final long serialVersionUID = -2619648674238082872L; - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "PROCESS_NAME") - @ApiParam("工序名称") - private String processName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java deleted file mode 100644 index 8114387..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ /dev/null @@ -1,106 +0,0 @@ -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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Description :产品绑定记录表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "KP_SN") -}) -@Api("产品绑定记录表") -public class MesProdBindRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -4319604821328717354L; - @Column(name = "SERIAL_NUMBER") - @ApiParam(value = "产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品条码零件号") - private String partNo; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单号") - private String workOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元") - private String workCellCode; - - @Column(name = "STEP_CODE") - @ApiParam(value = "工步代码") - private String stepCode; - - @Column(name = "ITEM_PART_NO") - @ApiParam("原材料零件号") - private String itemPartNo; - - @Column(name = "KP_SN") - @ApiParam("原材料条码") - private String kpSn; - - @Column(name = "KP_QTY") - @ColumnDefault("0") - @ApiParam(value = "原材料数量", example = "0") - private Double kpQty; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商") - private String supplierCode; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "IS_FEED") - @ApiParam("是否投料配置") - private Integer isFeed; - - @Column(name = "VERSION") - @ApiParam("版本") - private String version; - - @Column(name = "RESULT") - @ApiParam(value = "结果") - private String result; - - @Column(name = "is_BIND_KEY") - @ApiParam(value = "是否绑定关键件") - private Integer isBindKey; - - @Column(name = "ACTION_TYPE") - @ApiParam(value = "动作类型") - private Integer actionType; - - public int getIsFeedVal() { - return this.isFeed == null ? 0 : this.isFeed; - } - - public double getQtyVal() { - return this.kpQty == null ? 0.0d : this.kpQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java deleted file mode 100644 index 4ff20da..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java +++ /dev/null @@ -1,44 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :产品配置 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_CFG") -@Api("产品配置") -public class MesProdCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7487874316722319947L; - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PROD_CFG_NAME") - @ApiParam("产品配置名称") - private String prodCfgName; - - @Column(name = "PROD_CFG_Type_CODE") - @ApiParam("产品配置类型代码") - private String prodCfgTypeCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java deleted file mode 100644 index fd4cf72..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java +++ /dev/null @@ -1,53 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :产品配置明细 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_CFG_DETAIL") -@Api("产品配置明细") -public class MesProdCfgDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -8362302529703401583L; - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "IS_VIRTUAL") - @ApiParam("是否虚零件") - private Integer isVirtual; - - @Transient - @ApiParam("零件名称") - private String partName; - - public int getIsVirtualVal() { - return this.isVirtual == null ? 0 : this.isVirtual; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java deleted file mode 100644 index a68bcec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java +++ /dev/null @@ -1,69 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 3:25 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_PACK") -@Api("产品包装关系") -public class MesProdPack extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2621135811864108025L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "PACK_SPEC") - @ApiParam("包装规格") - private String packSpec; - - @Column(name = "PROD_LABEL_TEMPLATE") - @ApiParam("产品标签模板") - private String prodLabelTemplate; - - @Column(name = "PACK_LABEL_TEMPLATE") - @ApiParam("包装标签模板") - private String packLabelTemplate; - - @Column(name = "PACK_LABEL_TEMPLATE2") - @ApiParam("包装标签模板2") - private String packLabelTemplate2; - - @Column(name = "PACK_LABEL_TEMPLATE3") - @ApiParam("包装标签模板3") - private String packLabelTemplate3; - - @Column(name = "PACK_LABEL_TEMPLATE4") - @ApiParam("包装标签模板4") - private String packLabelTemplate4; - - @Column(name = "PROD_CFG_TYPE") - @ApiParam("项目") - private String prodCfgType; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java deleted file mode 100644 index 4e8c76d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ /dev/null @@ -1,45 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :产品类流程配置表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_CFG") -@Api("产品类流程配置表") -public class MesProdRouteCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -3768632071281056796L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java deleted file mode 100644 index 180b0df..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java +++ /dev/null @@ -1,55 +0,0 @@ -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; -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description :散件产品配置明细 - * @Reference : - * @Author : zcg - * @Date : 2020/3/9 0009 - 17:52 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_SCATTER_CFG_BOM") -@Api("散件产品配置明细") -public class MesProdScatterCfgBom extends BaseBean implements Serializable { - - @Column(name = "SP_CFG_CODE") - @ApiParam("散件配置编码") - private String spCfgCode; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品位置代码") - private String produceCtgyCode; - - @Column(name = "PART_NO") - @ApiParam("散件产品代码") - private String partNo; - - @Column(name = "ITEM_PART_NO") - @ApiParam("原材料物料号") - private String itemPartNo; - - @Column(name = "QTY") - @ApiParam("用量") - private BigDecimal qty; - - @Column(name = "IS_KEY_PART") - @ApiParam("是否关键件") - private Integer isKeyPart ; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java deleted file mode 100644 index 5520632..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java +++ /dev/null @@ -1,40 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-26-10:25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_CATEGORY") -@Api("系统业务动作") -public class MesProduceCategory extends BaseBean implements Serializable { - - private static final long serialVersionUID = 4593983703007675620L; - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PRODUCE_CTGY_NAME") - @ApiParam("产品类型名称") - private String produceCategoryName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java deleted file mode 100644 index aeda2b0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ /dev/null @@ -1,56 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_CTGY_PICTURE") -@Api("产品类型图片表") -public class MesProduceCtgyPicture extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7223382567320219332L; - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCtgyCode; - - @Column(name = "SIDE_LOCATION") - @ApiParam("面位") - private String sideLocation; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - - @Transient - @ApiParam("文件名称") - private String fileName; - - @Transient - @ApiParam("文件URL") - private String fileUrl; - - @ApiParam("图片URL") - private String pictureUrl; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java deleted file mode 100644 index 5e3440d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ /dev/null @@ -1,205 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) - } -) -@Api("产品条码表") -public class MesProduceSn extends BaseBean implements Serializable { - - private static final long serialVersionUID = 6641051790330191326L; - - @Column(name = "SERIAL_NUMBER", nullable = false) - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "QC_STATUS") - @ApiParam("质量状态") - private Integer qcStatus; - - @Column(name = "SN_STATUS") - @ApiParam("条码状态") - private Integer snStatus; - - @Column(name = "PRINT_COUNT") - @ApiParam("打印次数") - private Integer printCount; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态") - private Integer printStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS_CODE") - @ApiParam("下一工序代码") - private String nextProcessCode; - - @Column(name = "IN_WC_TIME") - @ApiParam("进产线时间") - private String inWorkCenterTime; - - @Column(name = "OUT_WC_TIME") - @ApiParam("出产线时间") - private String outWorkCenterTime; - - @Column(name = "SHIPPING_TIME") - @ApiParam("发运时间") - private String shippingTime; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "CUST_SN") - @ApiParam("客户条码") - private String custSn; - - @Column(name = "CUST_PART_NO") - @ApiParam("客户零件号") - private String custPartNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "SN_TYPE") - @ApiParam("条码类型 10=正常 20=首检件") - private Integer snType; - - @Column(name = "TRAY_NO") - @ApiParam("托盘号") - private String trayNo; -// -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public transient Integer lockVersion; - - @Transient - @ApiParam("返回信息") - private String resultMsg; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Transient - @ApiParam("下线时间开始") - private String outWorkCenterTimeStart; - - @Transient - @ApiParam("下线时间截止") - private String outWorkCenterTimeEnd; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getQcStatusVal() { - return this.qcStatus == null ? 0 : this.qcStatus; - } - - public int getSnStatusVal() { - return this.snStatus == null ? 0 : this.snStatus; - } - - public int getPrintCountVal() { - return this.printCount == null ? 0 : this.printCount; - } - - public int getPrintStatusVal() { - return this.printStatus == null ? 0 : this.printStatus; - } - - public int getSnTypeVal() { - return this.snType == null ? 0 : this.snType; - } - - @Override - public String toString() { - return "MesProduceSn{" + - "serialNumber='" + serialNumber + '\'' + - ", partNo='" + partNo + '\'' + - ", partNameRdd='" + partNameRdd + '\'' + - ", qty=" + qty + - ", qcStatus=" + qcStatus + - ", snStatus=" + snStatus + - ", printCount=" + printCount + - ", printStatus=" + printStatus + - ", workCenterCode='" + workCenterCode + '\'' + - ", workCellCode='" + workCellCode + '\'' + - ", routeCode='" + routeCode + '\'' + - ", processCode='" + processCode + '\'' + - ", nextProcessCode='" + nextProcessCode + '\'' + - ", inWorkCenterTime='" + inWorkCenterTime + '\'' + - ", outWorkCenterTime='" + outWorkCenterTime + '\'' + - ", shippingTime='" + shippingTime + '\'' + - ", workOrderNo='" + workOrderNo + '\'' + - ", custSn='" + custSn + '\'' + - ", custPartNo='" + custPartNo + '\'' + - ", snType=" + snType + - ", trayNo='" + trayNo + '\'' + - ", resultMsg='" + resultMsg + '\'' + - ", operateType=" + operateType + - ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + - ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java deleted file mode 100644 index 5d8ce41..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ /dev/null @@ -1,154 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description : 产品条码履历实体类 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 16:22 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "MODIFY_DATE_TIME") -}) -@Api("产品条码履历表") -public class MesProduceSnTravel extends BaseBean implements Serializable { - private static final long serialVersionUID = -1692487592284871549L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "QC_STATUS") - @ApiParam("质量状态") - private Integer qcStatus; - - @Column(name = "SN_STATUS") - @ApiParam("条码状态") - private Integer snStatus; - - @Column(name = "PRINT_COUNT") - @ApiParam("打印次数") - private Integer printCount; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态") - private Integer printStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS_CODE") - @ApiParam("下一工序代码") - private String nextProcessCode; - - @Column(name = "IN_WC_TIME") - @ApiParam("进产线时间") - private String inWorkCenterTime; - - @Column(name = "OUT_WC_TIME") - @ApiParam("出产线时间") - private String outWorkCenterTime; - - @Column(name = "SHIPPING_TIME") - @ApiParam("发运时间") - private String shippingTime; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "CUST_SN") - @ApiParam("客户条码") - private String custSn; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_PART_NO") - @ApiParam("客户零件号") - private String custPartNo; - - @Column(name = "SN_TYPE") - @ApiParam("条码类型 10=正常（默认），20=首检件") - private Integer snType; - - @Column(name = "TRAY_NO") - @ApiParam("托盘号") - private String trayNo; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Transient - @ApiParam("返回信息") - private String resultMsg; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getQcStatusVal() { - return this.qcStatus == null ? 0 : this.qcStatus; - } - - public int getSnStatusVal() { - return this.snStatus == null ? 0 : this.snStatus; - } - - public int getPrintCountVal() { - return this.printCount == null ? 0 : this.printCount; - } - - public int getPrintStatusVal() { - return this.printStatus == null ? 0 : this.printStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java deleted file mode 100644 index 600bfc2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ /dev/null @@ -1,109 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description :生产数据 - * @Reference : - * @Author : Wynne.Lu - * @CreateDate : 2019-10-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "OBJECT_CODE"), - @Index(columnList = "MODIFY_DATE_TIME") -}) -@Api("生产数据") -public class MesProductData extends BaseBean implements Serializable { - private static final long serialVersionUID = -2365404168777050771L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CELL_NAME") - @ApiParam("工作单元名称") - private String workCellName; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_DESC") - @ApiParam("物料名称") - private String partDesc; - - @Column(name = "EQU_CODE") - @ApiParam("设备代码") - private String equCode; - - @Column(name = "EQU_NAME") - @ApiParam("设备名称") - private String equName; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "FIELD_CODE") - @ApiParam("字段代码") - private String fieldCode; - - @Column(name = "FIELD_NAME") - @ApiParam("字段名称") - private String fieldName; - - @Column(name = "FIELD_VALUE") - @ApiParam("字段值") - private String fieldValue; - - @Column(name = "ROW_NO") - @ApiParam("数据行号") - private String rowNo; - - @Column(name = "GROUP_NO") - @ApiParam("数据组号") - private String groupNo; - - @Lob - @Column(name = "LINE_DATA") - @ApiParam("生产数据") - private String lineData; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java deleted file mode 100644 index b1b3d8c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java +++ /dev/null @@ -1,50 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_ENCODE_CFG") -@Api("产品编码配置表") -public class MesProductEncodeCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = 6641051790330191326L; - - @Column(name = "CODE_TYPE") - @ApiParam("编码类型") - private Integer codeType; - - @Column(name = "MATCH_TYPE") - @ApiParam("匹配类型") - private Integer matchType; - - @Column(name = "MATCH_VALUE") - @ApiParam("匹配值") - private String matchValue; - - @Column(name = "RULE_CODE") - @ApiParam("编码规则代码") - private String ruleCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java deleted file mode 100644 index b5b9fa2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ /dev/null @@ -1,107 +0,0 @@ -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.*; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 16:33 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA", indexes = { - @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "SN") -}) -@Api("质量过程检测数据") -public class MesQcCheckData extends BaseBean implements Serializable { - - private static final long serialVersionUID = 3600528549583720850L; - @Column(name = "CHECK_ID") - @ApiParam("检测id") - private String checkId; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "CHECK_TYPE") - @ApiParam("检测类型") - private Integer checkType; - - @Column(name = "CHECK_ITEM") - @ApiParam("检测项") - private String checkItem; - - @Column(name = "CHECK_STANDARD") - @ApiParam("检测标准") - private String checkStandard; - - @Column(name = "CHECK_GUIDE") - @ApiParam("检测指导") - private String checkGuide; - - @Column(name = "CHECK_FREQUENCY") - @ApiParam("频率") - private String checkFrequency; - - @Column(name = "CHECK_VALUE") - @ApiParam("检测值") - private String checkValue; - - @Column(name = "CHECK_RESULT") - @ApiParam("判定结果") - private String checkResult; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Integer qty; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Transient - @ApiParam("产品条码") - private String serialNumber; - - @Transient - @ApiParam("过程质量检测数据") - private List mesQcCheckStandardList; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java deleted file mode 100644 index be9bfe8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ /dev/null @@ -1,108 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 14:46 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_STANDARD") -@Api("质量检测标准") -public class MesQcCheckStandard extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1590320231495124712L; - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "CHECK_TYPE") - @ApiParam("检测类型") - private Integer checkType; - - @Column(name = "CHECK_ITEM") - @ApiParam("检测项") - private String checkItem; - - @Column(name = "CHECK_STANDARD") - @ApiParam("检测标准") - private String checkStandard; - - @Column(name = "CHECK_GUIDE") - @ApiParam("检测指导") - private String checkGuide; - - @Column(name = "CHECK_FREQUENCY") - @ApiParam("频率") - private String checkFrequency; - - @Transient - @ApiParam("物料名称") - private String partName; - - @Transient - @ApiParam("检测结果") - private String checkResult; - - @Transient - @ApiParam("检测值") - private String checkValue; - - @Column(name = "CHECK_ITEM_TYPE") - @ApiParam("检测项类型") - private String checkItemType; - - @Transient - @ApiParam("检测项类型名称") - private String checkItemTypeName; - - @Transient - private List childQcList; - - public MesQcCheckStandard() { - } - - public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard - , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { - this.id = id; - this.partNo = partNo; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.checkType = checkType; - this.checkItem = checkItem; - this.checkStandard = checkStandard; - this.checkGuide = checkGuide; - this.checkFrequency = checkFrequency; - this.partName = partName; - this.checkItemType = checkItemType; - this.checkItemTypeName = checkItemTypeName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java deleted file mode 100644 index 7d4bd81..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java +++ /dev/null @@ -1,71 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :JIS发运队列 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIS") -@Api("JIS发运队列") -public class MesQueueJis extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8028683333028906395L; - @Column(name = "JIS_NO") - @ApiParam("主队列编号") - private String jisNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "VIN_CODE") - @ApiParam("vin") - private String vinCode; - - @Column(name = "CAR_NO") - @ApiParam("车号") - private String carNo; - - @Column(name = "SEQ") - @ApiParam("排序") - private Double seq; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Transient - @ApiParam("颜色") - private String color; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java deleted file mode 100644 index ef3b7d1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java +++ /dev/null @@ -1,62 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :JIS发运队列明细 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIS_DETAIL") -@Api("JIS发运队列明细") -public class MesQueueJisDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 829273008952400763L; - @Column(name = "JIS_NO") - @ApiParam("主队列编号") - private String jisNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "FINAL_STATUS") - @ApiParam("明细整体状态") - private Integer finalStatus; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java deleted file mode 100644 index c8dcab7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ /dev/null @@ -1,90 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER", indexes = { - @Index(columnList = "CUST_FLAG_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) - } -) -@Api("生产队列主表") -public class MesQueueOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 6538031118299400711L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("主队列编号") - private String orderNo; - - @Column(name = "VIN_CODE") - @ApiParam("Vin") - private String vinCode; - - @Column(name = "CUST_FLAG_NO") - @ApiParam("客户标识号") - private String custFlagNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PROD_CFG_NAME_RDD") - @ApiParam("产品配置名称") - private String prodCfgNameRdd; - - @Column(name = "SEQ") - @ApiParam("排序") - private Double seq; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Transient - @ApiParam("起始车号") - private String custFlagNoStart; - - @Transient - @ApiParam("截至车号") - private String custFlagNoEnd; - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java deleted file mode 100644 index a266608..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ /dev/null @@ -1,103 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { - @Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) - } -) -@Api("生产队列明细") -public class MesQueueOrderDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 1548933241804083457L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("主队列编号") - private String orderNo; - - @Column(name = "PART_NO", nullable = false) - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "SEQ") - @ApiParam("队列明细序号") - private Double seq; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "WORK_TYPE") - @ApiParam("生产类型") - private String workType; - - @Column(name = "PRODUCE_CATEGORY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PRODUCE_CATEGORY_NAME_RDD") - @ApiParam("产品类型名称") - private String produceCategoryNameRdd; - - @Transient - @ApiParam("队列序号") - private Double queueSeq; - - public double getQueueSeqVal() { - return this.queueSeq == null ? 0.0d : this.queueSeq; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public MesQueueOrderDetail() { - } - - public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) { - this.queueSeq = queueSeq; - this.seq = seq; - this.serialNumber = serialNumber; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java deleted file mode 100644 index 3f3458c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ /dev/null @@ -1,78 +0,0 @@ -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.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) -@Api("原材料信息") -public class MesRawPartSn extends BaseBean implements Serializable { - private static final long serialVersionUID = 5504323561257182116L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("数量") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("生产批次") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批次") - private String fixLotNo; - - @Column(name = "STATUS") - @ApiParam("原料状态") - private Integer status; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java deleted file mode 100644 index 785f350..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java +++ /dev/null @@ -1,44 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :维修 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-08 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR") -@Api("维修") -public class MesRepair extends BaseBean implements Serializable { - private static final long serialVersionUID = -7520365696308295804L; - @Column(name = "REPAIR_CODE") - @ApiParam("维修代码") - private String repairCode; - - @Column(name = "REPAIR_NAME") - @ApiParam("维修名称") - private String repairName; - - @Column(name = "REPAIR_TYPE") - @ApiParam("维修类型") - private Integer repairType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java deleted file mode 100644 index f8b2802..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ /dev/null @@ -1,51 +0,0 @@ -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.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :流程表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE") -@Api("流程表") -public class MesRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = -7622507229961050740L; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "ROUTE_NAME") - @ApiParam("流程名称") - private String routeName; - - @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") - private Integer routeType; - - @Lob - @Column(name = "POSITION") - @ApiParam("GOJS位置") - private String position; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java deleted file mode 100644 index 556d26f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java +++ /dev/null @@ -1,64 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :流程工序关系 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE_PROCESS") -@Api("流程工序关系") -public class MesRouteProcess extends BaseBean implements Serializable { - private static final long serialVersionUID = 3477334942090180010L; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS") - @ApiParam("下一工序") - private String nextProcess; - - @Column(name = "REPAIR_PROCESS") - @ApiParam("维修工序") - private String repairProcess; - - @Column(name = "SEQ") - @ApiParam("顺序") - private Integer seq; - - @Column(name = "IS_NECESSARY") - @ApiParam("是否必须") - private Integer isNecessary; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - - public int getIsNecessaryVal() { - return this.isNecessary == null ? 0 : this.isNecessary; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java deleted file mode 100644 index 5907cec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java +++ /dev/null @@ -1,44 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :工序工作单元 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE_PROCESS_CELL") -@Api("工序工作单元对照") -public class MesRouteProcessCell extends BaseBean implements Serializable { - private static final long serialVersionUID = -703779336699805482L; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java deleted file mode 100644 index a77b075..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java +++ /dev/null @@ -1,45 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :报废原因 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-08 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP") -@Api("报废原因") -public class MesScrap extends BaseBean implements Serializable { - private static final long serialVersionUID = -6202113707752178624L; - @Column(name = "SCRAP_CODE") - @ApiParam("报废代码") - private String scrapCode; - - @Column(name = "SCRAP_NAME") - @ApiParam("报废名称") - private String scrapName; - - @Column(name = "SCRAP_TYPE") - @ApiParam("报废类型") - private String scrapType; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java deleted file mode 100644 index 97ac5d3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ /dev/null @@ -1,71 +0,0 @@ -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.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:42 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("报废信息记录表") -public class MesScrapRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -8519832449647086195L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "SCRAP_CODE") - @ApiParam("报废代码") - private String scrapCode; - - @Column(name = "SCRAP_NAME") - @ApiParam("报废名称") - private String scrapName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java deleted file mode 100644 index 13874ae..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ /dev/null @@ -1,68 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : crish - * @CreateDate : 2019-04-19 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT") -@Api("班次信息") -public class MesShift extends BaseBean implements Serializable { - private static final long serialVersionUID = -1174268061355263705L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次代码") - private String shiftCode; - - @Column(name = "SHIFT_NAME") - @ApiParam("班次名称") - private String shiftName; - - @Column(name = "START_TIME") - @ApiParam("开班时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("下班时间") - private String endTime; - - @Column(name = "WORK_TIMES") - @ApiParam("作业时长") - private Double workTimes; - - @Column(name="SHIFT_SEQ") - @ApiParam("班次顺序") - private Integer shiftSeq; - - public int getShiftSeqVal() { - return this.shiftSeq == null ? 0 : this.shiftSeq; - } - - public double getWorkTimesVal() { - return this.workTimes == null ? 0.0d : this.workTimes; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java deleted file mode 100644 index 7aac2d7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java +++ /dev/null @@ -1,47 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-18-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT_GROUP") -@Api("班组") -public class MesShiftGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = 8962836866086379111L; - @Column(name = "GROUP_CODE") - @ApiParam("班组代码") - private String groupCode; - - @Column(name = "GROUP_NAME") - @ApiParam("班组名称") - private String groupName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SQUAD_LEADER") - @ApiParam("班长") - private String squadLeader; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java deleted file mode 100644 index a7c1232..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java +++ /dev/null @@ -1,49 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : yiming.gu - * @CreateDate : 2019-05-20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT_REST") -@Api("班次休息信息") -public class MesShiftRest extends BaseBean implements Serializable { - private static final long serialVersionUID = -8712815093203320523L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次代码") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "REST_TIMES") - @ApiParam("休息时长") - private Double restTimes; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java deleted file mode 100644 index b29fae0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java +++ /dev/null @@ -1,45 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/18 0018 - 9:07 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SN_PHOTO_RELATION") -@Api("条码照片关系") -public class MesSnPhotoRelation extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7732648131003455681L; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("条码") - private String serialNumber; - - @Column(name = "PHOTO_PATH") - @ApiParam("照片路径") - private String photoPath; - - @Column(name = "PHOTO_NAME") - @ApiParam("照片名称") - private String photoName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java deleted file mode 100644 index b376b32..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java +++ /dev/null @@ -1,151 +0,0 @@ -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.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; - -/** - * @Description :工序物料清单 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STATION_BOM") -@Api("工序物料清单") -public class MesStationBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -4693067673094931011L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("产品物料名称") - private String partName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子零件") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("原材料物料名称") - private String itemPartName; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "子零件数量", example = "0") - private Double qty; - - @Column(name = "IS_REPEAT") - @ApiParam(value = "是否可重复") - private Integer isRepeat; - - @Column(name = "IS_CHECK") - @ApiParam(value = "是否检查") - private Integer isCheck; - - @Column(name = "IS_FEED") - @ApiParam(value = "是否投料配置") - private Integer isFeed; - - @Column(name = "IS_BIND_KEY") - @ApiParam(value = "是否绑定关键件") - private Integer isBindKey; - - @Transient - @ApiParam(value = "绑定数量") - private Double boundQty; - - @Transient - @ApiParam("是否已绑定") - private Boolean isBind; - - @Transient - @ApiParam("显示颜色") - private String color; - - @Transient - @ApiParam("关键件代码") - private String keyBarCode; - - @Transient - @ApiParam("产品条码") - private String serialNumber; - - public double getBoundQtyVal() { - return this.boundQty == null ? 0.0d : this.boundQty; - } - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getIsRepeatVal() { - return this.isRepeat == null ? 0 : this.isRepeat; - } - - public int getIsCheckVal() { - return this.isCheck == null ? 0 : this.isCheck; - } - - public boolean getIsBindVal() { - return this.isBind == null ? false : this.isBind; - } - - public int getIsFeedVal() { - return this.isFeed == null ? 0 : this.isFeed; - } - - @Override - public String toString() { - return "MesStationBom{" + - "partNo='" + partNo + '\'' + - ", itemPartNo='" + itemPartNo + '\'' + - ", qty=" + qty + - ", isRepeat=" + isRepeat + - ", isCheck=" + isCheck + - ", isFeed=" + isFeed + - ", isBind=" + isBind + - ", color='" + color + '\'' + - ", id=" + id + - ", organizeCode='" + organizeCode + '\'' + - ", isValid=" + isValid + - ", isDeleted=" + isDeleted + - ", createUser='" + createUser + '\'' + - ", createDatetime='" + createDatetime + '\'' + - ", modifyUser='" + modifyUser + '\'' + - ", modifyDatetime='" + modifyDatetime + '\'' + - ", createDateTimeStart='" + createDateTimeStart + '\'' + - ", createDateTimeEnd='" + createDateTimeEnd + '\'' + - ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' + - ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' + - ", orderByParam='" + orderByParam + '\'' + - ", ascOrDesc=" + ascOrDesc + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java deleted file mode 100644 index 0998015..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java +++ /dev/null @@ -1,102 +0,0 @@ -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; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :工步 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STEP") -@Api("工步") -public class MesStep extends BaseBean implements Serializable { - private static final long serialVersionUID = -2157306767211269786L; - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_NAME") - @ApiParam("工步名称") - private String stepName; - - @Column(name = "STEP_TEXT") - @ApiParam("工步描述") - private String stepText; - - @Column(name = "STEP_TYPE") - @ApiParam("工步类型") - private String stepType; - - @Column(name = "STEP_OBJECT") - @ApiParam("工步对象") - private String stepObject; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("流程代码") - private String routeCode; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工序代码") - private String processCode; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工步顺序") - private Integer stepSeq; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工步执行完毕") - private boolean isComplete; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工步是否跳过") - private boolean isJump; - - public MesStep() { - } - - public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq) { - this.stepCode = stepCode; - this.stepName = stepName; - this.stepText = stepText; - this.stepType = stepType; - this.stepObject = stepObject; - this.routeCode = routeCode; - this.processCode = processCode; - this.stepSeq = stepSeq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java deleted file mode 100644 index dd5a834..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java +++ /dev/null @@ -1,47 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :工步参数 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STEP_PARAM") -@Api("工步参数") -public class MesStepParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -147541368320233093L; - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_ATTRIBUTE") - @ApiParam("参数属性") - private String paramAttribute; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java deleted file mode 100644 index 0d30d54..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java +++ /dev/null @@ -1,40 +0,0 @@ -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; -import java.io.Serializable; - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TIME") -@Api("工步参数") -public class MesTime extends BaseBean implements Serializable { - private static final long serialVersionUID = 1562011791394529076L; - - @Column(name = "MODULE") - @ApiParam("组件") - private String module; - - @Column(name = "ELAPSE") - @ApiParam("耗时") - private Long elapse; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java deleted file mode 100644 index b6071b9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ /dev/null @@ -1,97 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :扭矩信息记录表 - * @Reference : - * @Author : Crish - * @CreateDate : 2019-05-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TORQUE_DETAIL") -@Api("扭矩信息记录表") -public class MesTorqueDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 2900363253333046861L; - - @Column(name = "SN") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "UPPER_LIMIT") - @ApiParam("最大值") - private Double upperLimit; - - @Column(name = "LOWER_LIMIT") - @ApiParam("最小值") - private Double lowerLimit; - - @Column(name = "TORQUE_DETAIL_VALUE") - @ApiParam("扭矩值") - private Double torqueValue; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "ok") - @ApiParam("扭矩是否合格") - private String ok; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "p_set") - @ApiParam("螺丝枪PSET设置值") - private String deviceSetValue; - - @Column(name = "MAXANGLE") - @ApiParam("最大扭矩") - private String maxAngle; - - @Column(name = "MINANGLE") - @ApiParam("最小扭矩") - private String minAngel; - - @Column(name = "FINALANGLE") - @ApiParam("最终扭矩") - private Integer finalAngle; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单号") - private String workOrderNo; - - @Column(name = "KEY_DATA_CODE") - @ApiParam("关键数据代码") - private String keyDataCode; - - @Column(name = "RESULT_MSG") - @ApiParam("扭矩判定结果") - private String resultMsg; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java deleted file mode 100644 index 506ed2a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java +++ /dev/null @@ -1,48 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\22 16:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TYPE_CFG") -@Api("类型信息表") -public class MesTypeCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -1699612238800419597L; - - @Column(name = "TYPE_CODE") - @ApiParam("类型代码") - private String typeCode; - - @Column(name = "TYPE_NAME") - @ApiParam("类型名称") - private String typeName; - - @Column(name = "BUSINESS_TYPE_CODE") - @ApiParam("业务类型代码") - private String businessTypeCode; - - @Column(name = "BUSINESS_TYPE_NAME") - @ApiParam("业务类型名称") - private String businessTypeName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java deleted file mode 100644 index a089f0a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java +++ /dev/null @@ -1,56 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 1:45 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK") -@Api("开线检查") -public class MesWcCheck extends BaseBean implements Serializable { - private static final long serialVersionUID = 8057329890155185557L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "CHECK_TYPE") - @ApiParam("检查类型") - private String checkType; - - @Column(name = "CHECK_OBJ") - @ApiParam("检查对象") - private String checkObj; - - @Column(name = "CHECK_ITEM") - @ApiParam("检查项") - private String checkItem; - - @Column(name = "STANDARD") - @ApiParam("检查标准") - private String standard; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java deleted file mode 100644 index fbf5699..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ /dev/null @@ -1,83 +0,0 @@ -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.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 1:57 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("开线检查记录") -public class MesWcCheckRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2173902677953303765L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_ORDER") - @ApiParam("工单号") - private String workOrder; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "CHECK_TYPE") - @ApiParam("检查类型") - private String checkType; - - @Column(name = "CHECK_OBJ") - @ApiParam("检查对象") - private String checkObj; - - @Column(name = "CHECK_ITEM") - @ApiParam("检查项") - private String checkItem; - - @Column(name = "STANDARD") - @ApiParam("检查标准") - private String standard; - - @Column(name = "CHECK_RESULT") - @ApiParam("检查结果") - private String checkResult; - - @Column(name = "CHECK_VALUE") - @ApiParam("检查值") - private String checkValue; - - @Column(name = "REASON") - @ApiParam("原因") - private String reason; - - @Column(name = "GROUP_CODE") - @ApiParam("组名") - private String groupCode; - - @Column(name = "OVERALL_RESULT") - @ApiParam("总体结果") - private Integer overAllResult; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java deleted file mode 100644 index e9bd56b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ /dev/null @@ -1,64 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :工作单元 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL") -@Api("工作单元") -public class MesWorkCell extends BaseBean implements Serializable { - private static final long serialVersionUID = -493313481197504121L; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "WORK_CELL_NAME") - @ApiParam("工作单元名称") - private String workCellName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("生产区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_TYPE") - @ApiParam("工位类型") - private Integer workCellType; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - @Column(name = "WORK_CELL_IP") - @ApiParam("工作单元IP") - private String workCellIp; - - @Column(name = "WORK_CELL_PORT") - @ApiParam("工作单元端口") - private String workCellPort; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java deleted file mode 100644 index 2249726..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java +++ /dev/null @@ -1,48 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :工作单元参数 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-30 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_PARAM") -@Api("mes工作单元参数") -public class MesWorkCellParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -3659425774085368499L; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_TYPE") - @ApiParam("参数类型") - private Integer paramType; - - @Column(name = "PARAM_MODEL") - @ApiParam("参数模式") - private Integer paramModel; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java deleted file mode 100644 index 0329add..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ /dev/null @@ -1,56 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description : 工站队列 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-22 17:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_POINT") -@Api("工站队列") -public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = 2881841596678871526L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "QUEUE_SEQ") - @ApiParam("队列主表序号") - private Double queueSeq; - - @Column(name = "QUEUE_DETAIL_SEQ") - @ApiParam("队列明细表序号") - private Double queueDetailSeq; - - public double getQueueSeqVal() { - return this.queueSeq == null ? 0 : this.queueSeq; - } - - public double getQueueDetailSeqVal() { - return this.queueDetailSeq == null ? 0 : this.queueDetailSeq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java deleted file mode 100644 index 3d35275..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java +++ /dev/null @@ -1,57 +0,0 @@ -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; -import java.io.Serializable; - -/** - * @Description :工作中心 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CENTER") -@Api("工作中心") -public class MesWorkCenter extends BaseBean implements Serializable { - private static final long serialVersionUID = -1119897685621371682L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "ERP_WORK_CENTER") - @ApiParam("ERP工作中心") - private String erpWorkCenter; - - @Column(name = "WORK_VER") - @ApiParam("工作版本") - private String workVer; - - @Column(name = "AREA_CODE") - @ApiParam("生产区域代码") - private String areaCode; - - @Column(name = "RUNNING_STATUS") - @ApiParam("运行状态") - private String runningStatus; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java deleted file mode 100644 index c4443eb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ /dev/null @@ -1,249 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.pcn.model.MesButtonFlagModel; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) -}) -@Api("生产工单") -public class MesWorkOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 8065877030194822855L; - - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("工单号") - private String orderNo; - - @Column(name = "PART_NO", nullable = false) - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "COMPLETE_QTY") - @ApiParam("完成数量") - private Double completeQty; - - @Column(name = "REPAIR_QTY") - @ApiParam("返修数量") - private Double repairQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数量") - private Double scrapQty; - - @Column(name = "SEQ") - @ApiParam("工单序号") - private Double seq; - - @Column(name = "WO_STATUS") - @ApiParam("工单状态") - private Integer workOrderStatus; - - @Column(name = "WO_TYPE") - @ApiParam("工单类型") - private Integer workOrderType; - - @Column(name = "NEXT_ORDER") - @ApiParam("下一工单") - private String nextOrder; - - @Column(name = "PLAN_ORDER_NO") - @ApiParam("生产计划单号") - private String planOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "SCHEDULE_DATE") - @ApiParam("排产日期") - private String scheduleDate; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("结束时间") - private String endTime; - - @Column(name = "WO_SOURCE") - @ApiParam("工单来源") - private String workOrderSource; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "SHIFT_GROUP") - @ApiParam("班组") - private String shiftGroup; - - @Column(name = "APPROVAL_STATUS") - @ApiParam("审批状态") - private Integer approvalStatus; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; - - @Column(name = "FI_COMPLETE_QTY") - @ApiParam("首检完成数量") - private Double fiCompleteQty; - - @Column(name = "FI_GENERATE_QTY") - @ApiParam("首检生成数量") - private Double fiGenerateQty; - - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; - - /********************** 冗余字段 *********************************/ - @Transient - @ApiParam(value = "工作中心名称") - public String workCenterName; - - @Transient - @ApiParam(value = "工作单元名称") - public String workCellName; - - @Transient - @ApiParam(value = "客户产线名称") - public String custProdLineName; - - @Transient - @ApiParam(value = "班次名称") - public String shiftName; - - @Transient - @ApiParam(value = "班组名称") - public String shiftGroupName; - - @Transient - @ApiParam(value = "产品配置名称") - public String prodCfgName; - - @Transient - @ApiParam("区域代码名称") - private String areaCodeName; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - @Transient - @ApiParam("mes生产工单页面按钮控制") - private MesButtonFlagModel mesButtonFlagModel; - - @Transient - @ApiParam("批量打包开窗页面查询工单=1") - private String pageType; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getCompleteQtyVal() { - return this.completeQty == null ? 0.0d : this.completeQty; - } - - public double getRepairQtyVal() { - return this.repairQty == null ? 0.0d : this.repairQty; - } - - public double getScrapQtyVal() { - return this.scrapQty == null ? 0.0d : this.scrapQty; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public int getWorkOrderStatusVal() { - return this.workOrderStatus == null ? 0 : this.workOrderStatus; - } - - public int getWorkOrderTypeVal() { - return this.workOrderType == null ? 0 : this.workOrderType; - } - - public int getApprovalStatusVal() { - return this.approvalStatus == null ? 0 : this.approvalStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java deleted file mode 100644 index caba23a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ /dev/null @@ -1,231 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-19-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG", indexes = { - @Index(columnList = "ORDER_NO"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("生产工单日志") -public class MesWorkOrderLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -7018645997937147427L; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "COMPLETE_QTY") - @ApiParam("完成数量") - private Double completeQty; - - @Column(name = "REPAIR_QTY") - @ApiParam("返修数量") - private Double repairQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数量") - private Double scrapQty; - - @Column(name = "SEQ") - @ApiParam("工单序号") - private Double seq; - - @Column(name = "WO_STATUS") - @ApiParam("工单状态") - private Integer workOrderStatus; - - @Column(name = "WO_TYPE") - @ApiParam("工单类型") - private Integer workOrderType; - - @Column(name = "NEXT_ORDER") - @ApiParam("下一工单") - private String nextOrder; - - @Column(name = "PLAN_ORDER_NO") - @ApiParam("生产计划单号") - private String planOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "SCHEDULE_DATE") - @ApiParam("排产日期") - private String scheduleDate; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("结束时间") - private String endTime; - - @Column(name = "WO_SOURCE") - @ApiParam("工单来源") - private String workOrderSource; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "SHIFT_GROUP") - @ApiParam("班组") - private String shiftGroup; - - @Column(name = "APPROVAL_STATUS") - @ApiParam("审批状态") - private Integer approvalStatus; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; - - @Column(name = "FI_COMPLETE_QTY") - @ApiParam("首检完成数量") - private Double fiCompleteQty; - - @Column(name = "FI_GENERATE_QTY") - @ApiParam("首检生成数量") - private Double fiGenerateQty; - - /********************** 冗余字段 *********************************/ - @Transient - @ApiParam(value = "工作中心名称") - public String workCenterName; - - @Transient - @ApiParam(value = "工作单元名称") - public String workCellName; - - @Transient - @ApiParam(value = "客户产线名称") - public String custProdLineName; - - @Transient - @ApiParam(value = "班次名称") - public String shiftName; - - @Transient - @ApiParam(value = "班组名称") - public String shiftGroupName; - - @Transient - @ApiParam(value = "产品配置名称") - public String prodCfgName; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getCompleteQtyVal() { - return this.completeQty == null ? 0.0d : this.completeQty; - } - - public double getRepairQtyVal() { - return this.repairQty == null ? 0.0d : this.repairQty; - } - - public double getScrapQtyVal() { - return this.scrapQty == null ? 0.0d : this.scrapQty; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public int getWorkOrderStatusVal() { - return this.workOrderStatus == null ? 0 : this.workOrderStatus; - } - - public int getWorkOrderTypeVal() { - return this.workOrderType == null ? 0 : this.workOrderType; - } - - public int getApprovalStatusVal() { - return this.approvalStatus == null ? 0 : this.approvalStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java deleted file mode 100644 index 3306bbf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Description : 动作请求参数 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -public class ActionRequestBean implements Serializable { - - @ApiParam("事件代码") - @Deprecated - public String eventCode; - - @ApiParam("按钮代码") - public String buttonCode; - - @ApiParam("单个结果") - public Obj resultObject; - - @ApiParam("List请求集") - public List resultList; - - @ApiParam("Map请求集") - public Map resultMap; - - @ApiParam("目的状态") - private Integer destStatus; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java deleted file mode 100644 index bfdcf1f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class AttrBean implements Serializable { - - @ApiParam("属性名称") - private String attrName; - - @ApiParam("属性名称别名") - private String attrNameAlias; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java deleted file mode 100644 index 5919ee5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class ButtonBean implements Serializable { - @ApiParam(value = "按钮代码") - private String buttonCode; - - @ApiParam(value = "按钮名称") - private String buttonName; - - // 执行类方法,sql,或者标记 - @ApiParam(value = "执行内容") - private String methodContent; - - @ApiParam(value = "按钮描述") - private String buttonDesc; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java deleted file mode 100644 index f70aaaa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/10 0010 - 15:28 - */ -@Data -@Api("数据采集Model") -public class DataAcquisitionModel { - - @ApiParam("对象代码") - private String objectCode; - - @ApiParam("对象名称") - private String objectName; - - @ApiParam("字段代码") - private String fieldCode; - - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("字段值") - private String fieldValue; -// -// @ApiParam("组号") -// private String groupNo; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java deleted file mode 100644 index 83a9451..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\28 19:50 - * @Modify: - **/ -@Data -public class DefectModel { - - private Long id; - - @ApiParam("缺陷代码") - private String defectCode; - - @ApiParam("缺陷名称") - private String defectName; - - @ApiParam("缺陷类型") - private String defectType; - - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @ApiParam("缺陷位置") - private String defectLocation; - - @ApiParam("缺陷类型子集") - private List mesDefectList; - public DefectModel() { - - } - - public DefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) { - this.id = id; - this.defectCode = defectCode; - this.defectName = defectName; - this.defectType = defectType; - this.defectTypeName = defectTypeName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java deleted file mode 100644 index ac086ba..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/12/4 3:09 下午 - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("FastDfs文件model") -public class EsopFileModel { - - private MesEsop esop; - - private MesFile file; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java deleted file mode 100644 index 418ab92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/19 7:00 PM - * @Description: - **/ - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("FastDfs文件model") -public class FastDfsDownloadModel { - - @ApiParam("部分相对路径") - private String dirPath; - - @ApiParam("文件名称") - private String fileName; - - @ApiParam("文件字节") - private byte[] fileByte; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java deleted file mode 100644 index fd91386..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 11:42 AM - * @Description: - **/ - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("生成条码模型") -public class GenSerialNoModel { - - @ApiParam("规则代码") - private String ruleCode; - - @ApiParam("规则描述") - private String ruleDesc; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("客户物料号") - private String custPartNo; - - @ApiParam("客户代码") - private String custCode; - - @ApiParam("过程条码") - private String serialNumber; - - @ApiParam("产地") - private String prodLocation; - - @ApiParam("前缀") - private String prefix; - - @ApiParam("编码规则") - private String numberRule; - - @ApiParam("序号长度") - private Integer serialnoLength; - - @ApiParam("增量") - private Integer serialnoIncrement; - - @ApiParam("最大值后循环") - private Integer isCycle; - - @ApiParam("当前编号前缀") - private String currentNumberPrefix; - - @ApiParam("当前序号") - private Integer currentSerialno; - - @ApiParam("当前编号") - private String currentNumber; - - - public GenSerialNoModel(String ruleCode) { - this.ruleCode = ruleCode; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java deleted file mode 100644 index 7883204..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Author: wangjie - * @CreateDate: 2019/8/21 9:19 AM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("mes页面按钮控制model") -public class MesButtonFlagModel implements Serializable { - - @ApiParam("修改按钮") - private boolean updateButton; - - @ApiParam("按配置修改按钮") - private boolean updateButtonConfig; - - @ApiParam("下达按钮") - private boolean transmitButton; - -// @ApiParam("测试动态下达按钮") -// private boolean dynamicTransmitButtonTest; - - @ApiParam("启动按钮") - private boolean startUpButton; - - @ApiParam("暂停按钮") - private boolean suspendButton; - - @ApiParam("取消按钮") - private boolean revokeButton; - - @ApiParam("关闭按钮") - private boolean closeButton; - - @ApiParam("完成按钮") - private boolean completeButton; - - @ApiParam("关闭按钮-提醒") - private boolean closeButtonNoticeFlag; - - @ApiParam("维修任务按钮") - private boolean repairButton; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java deleted file mode 100644 index 57ba538..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Transient; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:04 - * @Modify: - **/ -@Data -public class MesDefectModel { - - private String defectCode; - - @ApiParam("缺陷名称") - private String defectName; - - @ApiParam("缺陷类型") - private String defectType; - - @Transient - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @Transient - @ApiParam("缺陷分类子集") - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java deleted file mode 100644 index 1487bb8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ /dev/null @@ -1,125 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:05 - * @Modify: - **/ -@Data -public class MesProdBindRecordModel { - private Long id; - private String itemPartNo; - private String itemPartName; - private Double qty; - private Integer isValid; - private Integer isDeleted; - private String organizeCode; - private Integer isFeed; - private String workCenterCode; - private String workCellCode; - private String kpSn; - @ApiParam("拆解数") - private Double dismantleQty; - - @ApiParam("产品物料编码") - private String parentPartNo; - @ApiParam("产品物料名称") - private String parentPartName; - @ApiParam("合格数") - private Integer okQty; - @ApiParam("缺失数") - private Integer missQty; - @ApiParam("报废数") - private Integer scrapQty; - @ApiParam("创建时间") - private String createUser; - @ApiParam("创建时间") - private String createDatetime; - @ApiParam("修改人") - private String modifyUser; - @ApiParam("修改时间") - private String modifyDatetime; - @ApiParam("产品条码") - private String serialNumber; - @ApiParam("关联批次") - private String lotNo; - public MesProdBindRecordModel() { - - } - - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - this.dismantleQty = dismantleQty; - this.lotNo = lotNo; - } - - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String lotNo) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - this.lotNo = lotNo; - } - - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyUser = modifyUser; - this.modifyDatetime = modifyDatetime; - this.serialNumber = serialNumber; - this.lotNo = lotNo; - } - - public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) { - this.itemPartNo = itemPartNo; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.serialNumber = serialNumber; - this.lotNo = lotNo; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java deleted file mode 100644 index e6504ec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java +++ /dev/null @@ -1,75 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:04 - * @Modify: - **/ -@Data -public class MesStationBomModel { - - private Long id; - @ApiParam("子物料编码") - private String itemPartNo; - @ApiParam("子物料名称") - private String itemPartName; - @ApiParam("产品数量") - private Double qty; - private Integer isValid; - private Integer isDeleted; - private String organizeCode; - private Integer isFeed; - private String workCenterCode; - private String workCellCode; - @ApiParam("拆解数") - private Double dismantleQty; - - @ApiParam("产品物料编码") - private String parentPartNo; - @ApiParam("产品物料名称") - private String parentPartName; - @ApiParam("合格数") - private Integer okQty; - @ApiParam("缺失数") - private Integer missQty; - @ApiParam("报废数") - private Integer scrapQty; - - public MesStationBomModel() { - - } - - public MesStationBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - } - - public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java deleted file mode 100644 index f3b4227..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Map; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/25 7:41 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("PLC交互model") -public class PLCInteracticeModel { - - private String serverIp; - - private String serverPort; - - private String mwContext; - - private String protocol; - - private String plcCode; - - private String dataType; - - private String userName; - - private String password; - - private Integer enabled; - - private String realm; - - private String tag; - - private String value; - - private String comment; - - private String authenKey; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java deleted file mode 100644 index ed2bc6c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author Wynne.Lu - * @date 2020/2/21 17:20 - * @desc - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("工位监控观察者对象") -public class PcsObserverStatusModel { - - @ApiParam("产线") - private String workCenterCode; - - @ApiParam("运行状况") - private Boolean runningStatus; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java deleted file mode 100644 index ba753cc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @Author: wangjie - * @CreateDate: 2019/9/23 8:06 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("产品包装model") -public class ProdPackageModel { - - @ApiParam("工单号") - private String workOrderNo; - - @ApiParam("生产线") - private String workCenterCode; - - @ApiParam("客户代码") - private String custCode; - - @ApiParam("班次") - private String shiftCode; - - @ApiParam("班次名称") - private String shiftName; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("单位") - private String unit; - - @ApiParam("工单数量") - private Double workOrderQty; - - @ApiParam("完成数量") - private Double completeQty; - - @ApiParam("包装规格数量") - private Double packSpecQty; - - @ApiParam("包装规格") - private String packSpec; - - @ApiParam("数量") - private Double qty; - - @ApiParam("特殊批次") - private String fixLotNo; - - @ApiParam("包装集合") - private List packageList; - - @ApiParam("打印状态文字") - private String printStrStatus; - - @ApiParam("包装层级名称") - private String packLevelName; - - @ApiParam("是否封箱名称") - private String isSealedName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java deleted file mode 100644 index 727e482..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("产品包装model") -public class ProductDataModel { - - @ApiParam("字段代码") - private String fieldCode; - - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("字段值") - private String fieldValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java deleted file mode 100644 index f2ec4a3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2020\1\13 17:23 - * @Modify: - **/ -@Data -public class QcCheckStandardModel { - - private Long id; - - @ApiParam("列头") - private String title; - - private List resultList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java deleted file mode 100644 index bdb5567..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class QueueJisModel implements Serializable { - - @ApiParam("主队列编号") - private String jisNo; - - @ApiParam("vin") - private String vinCode; - - @ApiParam("车号") - private String carNo; - - @ApiParam("排序") - private Double seq; - - @ApiParam("状态") - private Integer status; - - @ApiParam("产品配置代码") - private String prodCfgCode; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @ApiParam("明细状态") - private Integer detailStatus; - - @ApiParam("产品条码") - private String serialNumber; - - @ApiParam("明细整体状态") - private Integer finalStatus; - - @ApiParam("状态名称") - private String statusName; - - @ApiParam("明细状态名称") - private String detailStatusName; - - @ApiParam("明细整体状态名称") - private String finalStatusName; - - @ApiParam("颜色") - private String color; - - public String getStatusName() { - return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); - } - - public String getDetailStatusName() { - return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); - } - - public String getFinalStatusName() { - return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); - } - - public QueueJisModel() { - } - - public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { - this.jisNo = jisNo; - this.vinCode = vinCode; - this.carNo = carNo; - this.seq = seq; - this.status = status; - this.prodCfgCode = prodCfgCode; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.produceCategoryCode = produceCategoryCode; - this.detailStatus = detailStatus; - this.serialNumber = serialNumber; - this.finalStatus = finalStatus; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java deleted file mode 100644 index e641bcf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description : JIT队列列表Model - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-22 16:34 - * @Modify: - **/ -@Data -@Api("JIT队列列表Model") -public class QueueOrderModel implements Serializable { - private Long id; - @ApiParam("队列序号") - public Double queueSeq; - @ApiParam("队列明细序号") - public Double queDetailSeq; - @ApiParam("客户标识号") - public String custFlagNo; - @ApiParam("产品配置名称") - public String prodCfgNameRdd; - @ApiParam("产品类型名称") - public String categoryNameRdd; - @ApiParam("产品条码") - public String serialNumber; - @ApiParam("物料号") - public String partNo; - @ApiParam("物料名称") - public String partNameRdd; - @ApiParam("条码状态") - public Integer snStatus; - @ApiParam("生产类型") - public String workType; - @Transient - @ApiParam("显示颜色") - private String color; - @ApiParam("工厂代码") - private String organizeCode; - @ApiParam("展示行数") - private Integer prodNum; - @ApiParam("产线") - private String workCenterCode; - @ApiParam("工位") - private String workCellCode; - - public QueueOrderModel() { - } - - public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { - this.id = id; - this.queueSeq = queueSeq; - this.queDetailSeq = queDetailSeq; - this.custFlagNo = custFlagNo; - this.prodCfgNameRdd = prodCfgNameRdd; - this.categoryNameRdd = categoryNameRdd; - this.serialNumber = serialNumber; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.snStatus = snStatus; - this.workType = workType; - } - public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType) { - this.id = id; - this.queueSeq = queueSeq; - this.queDetailSeq = queDetailSeq; - this.custFlagNo = custFlagNo; - this.prodCfgNameRdd = prodCfgNameRdd; - this.categoryNameRdd = categoryNameRdd; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.workType = workType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java deleted file mode 100644 index 231b12c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java +++ /dev/null @@ -1,151 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.*; - -import java.util.List; - -/** - * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-29-11:58 - * @Modify: - **/ -public class RequestModel { - - private List mesDefectRecordList; // 不良/缺陷记录数据集 - - private List mesRepairRecordList; // 维修记录数据集 - - private List dismantleRecordList; // 拆解记录数据集 - - private List workOrderList; // 工单数据集 - - private List partList; // 物料数据集 - - private List queueOrderList; // 生产队列数据集 - - private Double currentSeq; // 生产队列中的当前序列号 - - private Double nextSeq; // 生产队列中的下一个序列号 - - private Integer srcStatus; // 源状态 - - private Integer destStatus; // 目的状态 - - private List orderNoList;//工单编号 - - private ActionRequestBean actionRequestBean;//工单状态 - - public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { - this.queueOrderList = queueOrderList; - this.currentSeq = currentSeq; - this.nextSeq = nextSeq; - } - - public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { - this.queueOrderList = queueOrderList; - this.srcStatus = srcStatus; - this.destStatus = destStatus; - } - - public RequestModel(List workOrderList, List partList) { - this.workOrderList = workOrderList; - this.partList = partList; - } - - public List getMesDefectRecordList() { - return mesDefectRecordList; - } - - public void setMesDefectRecordList(List mesDefectRecordList) { - this.mesDefectRecordList = mesDefectRecordList; - } - - public List getMesRepairRecordList() { - return mesRepairRecordList; - } - - public void setMesRepairRecordList(List mesRepairRecordList) { - this.mesRepairRecordList = mesRepairRecordList; - } - - public List getDismantleRecordList() { - return dismantleRecordList; - } - - public void setDismantleRecordList(List dismantleRecordList) { - this.dismantleRecordList = dismantleRecordList; - } - - public List getWorkOrderList() { - return workOrderList; - } - - public RequestModel() { - } - - public void setWorkOrderList(List workOrderList) { - this.workOrderList = workOrderList; - } - - public List getPartList() { - return partList; - } - - public void setPartList(List partList) { - this.partList = partList; - } - - public List getQueueOrderList() { - return queueOrderList; - } - - public void setQueueOrderList(List queueOrderList) { - this.queueOrderList = queueOrderList; - } - - public void setOrderNoList(List orderNoList) { - this.orderNoList = orderNoList; - } - - public List getOrderNoList() { - return orderNoList; - } - - public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; } - - public ActionRequestBean getActionRequestBean() { return actionRequestBean; } - - public Double getCurrentSeq() { - return currentSeq == null ? 0.0d : currentSeq; - } - - public void setCurrentSeq(Double currentSeq) { - this.currentSeq = currentSeq; - } - - public Double getNextSeq() { - return nextSeq == null ? 0.0d : nextSeq; - } - - public void setNextSeq(Double nextSeq) { - this.nextSeq = nextSeq; - } - - public Integer getSrcStatus() { - return srcStatus == null ? 0 : srcStatus; - } - - public void setSrcStatus(Integer srcStatus) { - this.srcStatus = srcStatus; - } - - public Integer getDestStatus() { - return destStatus == null ? 0 : destStatus; - } - - public void setDestStatus(Integer destStatus) { - this.destStatus = destStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java deleted file mode 100644 index 831a997..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description: 打印信息封装 - * @Reference: - * @Author: wangjie - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息封装") -public class SnPrintDataModel { - - @ApiParam("打印数据") - private List valueList; - - @ApiParam("打印模板及参数") - private MesLabelTemplate labelTemplate; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java deleted file mode 100644 index 0f1d4a6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: 打印信息汇总 - * @Reference: - * @Author: wangjie - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息汇总") -public class SnPrintModel extends StepPrintSnModel { - - @ApiParam("过程条码") - private SnPrintDataModel serialPrintDataModel; - - @ApiParam("产品条码") - private SnPrintDataModel prodPrintDataModel; - - @ApiParam("包装条码") - private SnPrintDataModel packPrintDataModel; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java deleted file mode 100644 index e894595..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 3:11 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("工位BOM model") -public class StationBomModel extends MesStationBom { - - @ApiParam("上料数量") - private Long cellFeedQty; - - @ApiParam("是否上料数量满足") - private Boolean isFeedSatisfied; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java deleted file mode 100644 index 978fd4b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Description : 工位结果bean - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-24 - * @Modify: - **/ -@Data -public class StationResultBean implements Serializable { - - /** - * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 - * moduleContent组件内容,taskComplete整个扫描完成 - */ - @ApiParam("业务类型") - private String busiType; - - /** - * 对于相同业务类型的数据，区分不同数据类型。 - * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， - * image-图片 - */ - @ApiParam("数据类型") - private String dataType; - - @ApiParam("执行结果信息") - private String message; - - @ApiParam("List结果集") - private List resultList; - - @ApiParam("结果对象") - private Object resultObj; - - @ApiParam("Map结果集") - public Map resultMap; - - @ApiParam("List结果集的属性") - private List dataAttrList; - - @ApiParam("图片路径") - private String imageUrl; - - @ApiParam("多个数据集") - private List> stationResultBeans; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java deleted file mode 100644 index 7b2296f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/11/12 3:50 下午 - * @Description: 下拉工步参数对象 - **/ -@Data -@Api("下拉工步参数对象") -public class StepParamsModel implements Serializable { - private static final long serialVersionUID = -6361645141217616499L; - - @ApiParam("参数代码") - private String paramCode; - - @ApiParam("参数代码") - private Map paramValues; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java deleted file mode 100644 index c7f4937..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.beans.Transient; -import java.util.List; - -/** - * @Description: 打印条码工步， 打印信息模板 - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息模板") -public class StepPrintSnModel extends MesProduceSn { - @ApiParam("打印描述") - private String printDesc; - - @ApiParam("条码") - private String barCode; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("批次号") - private String batchNo; - - @ApiParam("箱数量") - private String boxQty; - - @ApiParam("订单号") - private String orderNo; - - @ApiParam("生产日期") - private String productionTime; - - @ApiParam("包装编码") - private String packageNo; - - @ApiParam("包装规格") - private String packageSpec; - - @ApiParam("供应商") - private String supplier; - - @ApiParam("客户名称") - private String customerName; - - @ApiParam("客户零件号") - private String customerPartNo; - - @ApiParam("客户物料名称") - private String customerPartName; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("单位") - private String unit; - - @ApiParam("特殊批号") - private String fixLotNo; - - @ApiParam("生产工单号") - private String workOrderNo; - - @ApiParam("生产线代码") - private String workCenterCode; - - @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") - private Integer packLevel; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java deleted file mode 100644 index ab30bd7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import lombok.Data; - -import java.util.Collection; - -@Data -@Api("工步返回信息") -public class StepResult { - - private boolean isCompleted; - - private T data; - - private Collection dataCollection; - - private String msg; - - public static StepResult getSuccessComplete() { - return new StepResult(true,""); - } - - public static StepResult getNonComplete() { - return new StepResult(false,""); - } - - public static StepResult getSuccessComplete(String msg) { - return new StepResult(true, msg); - } - - public static StepResult getNonComplete(String msg) { - return new StepResult(false, msg); - } - - public static StepResult getSuccessData(T data, String msg) { - return new StepResult<>(true, data, msg); - } - - public static StepResult getSuccessData(Collection data, String msg) { - return new StepResult(true, data, msg); - } - - private StepResult() { - } - - private StepResult(boolean isCompleted) { - this.isCompleted = isCompleted; - } - - private StepResult(boolean isCompleted, String msg) { - this.isCompleted = isCompleted; - this.msg = msg; - } - - public StepResult(boolean isCompleted, T data, String msg) { - this.isCompleted = isCompleted; - this.data = data; - this.msg = msg; - } - - public StepResult(boolean isCompleted, Collection dataCollection, String msg) { - this.isCompleted = isCompleted; - this.dataCollection = dataCollection; - this.msg = msg; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java deleted file mode 100644 index ad0541e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-06-03-11:44 - * @Modify: - **/ - -public class TorqueModel { - private Long id; - - private Double upperLimit; - - private Double lowerLimit; - - private Double torqueValue; - - private boolean ok; - - private String color; - - public boolean isOk() { - return ok; - } - - public void setOk(boolean ok) { - this.ok = ok; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Double getUpperLimit() { - return upperLimit; - } - - public void setUpperLimit(Double upperLimit) { - this.upperLimit = (upperLimit == null ? 0 : upperLimit); - } - - public Double getLowerLimit() { - return lowerLimit; - } - - public void setLowerLimit(Double lowerLimit) { - this.lowerLimit = (lowerLimit == null ? 0 : lowerLimit); - } - - public Double getTorqueValue() { - return torqueValue; - } - - public void setTorqueValue(Double torqueValue) { - this.torqueValue = (torqueValue == null ? 0 : torqueValue); - } - - public String getColor() { - return color; - } - - public void setColor(String color) { - this.color = color; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java deleted file mode 100644 index e1e1c93..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.*; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 8:06 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("开线管控model") -public class WcCheckModel { - - @ApiParam("工作中心") - private String workCenterCode; - - @ApiParam("工单") - private String workOrder; - - @ApiParam("产品号") - private String partNo; - - @ApiParam("是否通过") - private Integer isPass; - - @ApiParam("开线信号") - private Integer onlineSignal; - - @ApiParam("开线对象") - MesWcCheckRecord onlineSignalEqu; - - @ApiParam("需要展示的数据") - private Map titleMap; - - @ApiParam("对象list和列关系") - private Map> dataColumnRelation; - - @ApiParam("重构map") - private Map> dataMap; - - public WcCheckModel initialWcCheckModel() { - WcCheckModel wcCheckModel = new WcCheckModel(); - wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); - wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); - onlineSignalEqu = new MesWcCheckRecord(); - wcCheckModel.setTitleMap(new LinkedHashMap<>()); - wcCheckModel.setDataMap(new LinkedHashMap<>()); - wcCheckModel.setDataColumnRelation(new LinkedHashMap<>()); - return wcCheckModel; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java deleted file mode 100644 index 02bca6e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.IfDismantleRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 14:14 - * @Modify: - **/ -public interface IfDismantleRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java deleted file mode 100644 index 9a4d6be..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.IfPackageDetail; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 17:47 - * @Modify: - **/ -public interface IfPackageDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java deleted file mode 100644 index 9d362f1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.IfProductOffLine; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 17:48 - * @Modify: - **/ -public interface IfProductOffLineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java deleted file mode 100644 index 5f1dbef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionIf; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 11:21 - * @Modify: - **/ -public interface MesActionIfRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java deleted file mode 100644 index 80cb307..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesAction; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesActionRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java deleted file mode 100644 index c91b713..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesAreaRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java deleted file mode 100644 index 6153d23..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeedRecord; - -/** - * @Description : 工位投料履历持久化类 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2020-06-17 09:53 - * @Modify: - **/ -public interface MesCellFeedRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java deleted file mode 100644 index 462dff4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/18 10:05 AM - * @Description: - **/ -@Repository -public interface MesCellFeedRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java deleted file mode 100644 index 6b43fa6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Repository -public interface MesConfigRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java deleted file mode 100644 index cbca918..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustProdLine; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-19-11:15 - * @Modify: - **/ -@Repository -public interface MesCustProdLineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java deleted file mode 100644 index 72e72bc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomerPart; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-20 - * @Modify: - **/ -@Repository -public interface MesCustomerPartRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java deleted file mode 100644 index c006be6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomer; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-22-16:12 - * @Modify: - **/ -@Repository -public interface MesCustomerRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java deleted file mode 100644 index d285a59..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDataObject; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:59 PM - * @Description: - **/ -public interface MesDataObjectRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java deleted file mode 100644 index 36faed5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:58 PM - * @Description: - **/ -public interface MesDatasourceRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java deleted file mode 100644 index c0ecd89..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectCause; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:04 - * @Modify: - **/ -public interface MesDefectCauseRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java deleted file mode 100644 index c8a7a7b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:05 - * @Modify: - **/ -public interface MesDefectRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java deleted file mode 100644 index 274f334..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:04 - * @Modify: - **/ -public interface MesDefectRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java deleted file mode 100644 index e093fe2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDismantleRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:06 - * @Modify: - **/ -public interface MesDismantleRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java deleted file mode 100644 index 6b15531..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEventAction; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEventActionRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java deleted file mode 100644 index cfa330f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEvent; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEventRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java deleted file mode 100644 index 0050530..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFiCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesFiCfgRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java deleted file mode 100644 index 16383bc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesFileRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java deleted file mode 100644 index da57b4f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : crish - * @CreateDate : 2019-05-15 - * @Modify: - **/ -@Repository -public interface MesKpDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java deleted file mode 100644 index 373ab6d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpsnRule; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesKpsnRuleRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java deleted file mode 100644 index ce73083..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : - **/ -public interface MesLabelTemplateParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java deleted file mode 100644 index 16f04a4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : - **/ -public interface MesLabelTemplateRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java deleted file mode 100644 index d064c63..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMethod; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesMethodRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java deleted file mode 100644 index 46e8f5d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTaskDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 18:42 - */ -@Repository -public interface MesMonitorTaskDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java deleted file mode 100644 index f87ff43..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTask; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 18:43 - */ -@Repository -public interface MesMonitorTaskRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java deleted file mode 100644 index d3b014d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberRule; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 1:22 PM - * @Description: - **/ -@Repository -public interface MesNumberRuleRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java deleted file mode 100644 index 11299b0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberSerialno; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 1:23 PM - * @Description: - **/ - -@Repository -public interface MesNumberSerialnoRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java deleted file mode 100644 index c1a67b2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:59 PM - * @Description: - **/ -public interface MesObjectCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java deleted file mode 100644 index d10efa8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPLCConfigure; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPLCConfigureRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java deleted file mode 100644 index fc409e1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackSpec; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPackSpecRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java deleted file mode 100644 index 7fd2655..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 10:33 上午 - * @Description: - **/ -public interface MesPackageDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java deleted file mode 100644 index eb7c894..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 10:39 上午 - * @Description: - **/ -public interface MesPackageRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java deleted file mode 100644 index dde5b62..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageTravel; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 2:57 下午 - * @Description: - **/ -public interface MesPackageTravelRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java deleted file mode 100644 index eb12a69..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPartCategory; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPartCategoryRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java deleted file mode 100644 index 0324dd1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPartRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java deleted file mode 100644 index 87029c6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesPatternJisRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java deleted file mode 100644 index c9e3e97..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnConnectLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnConnectLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java deleted file mode 100644 index 1ae09bf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcn; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java deleted file mode 100644 index 256e8da..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnSyncCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java deleted file mode 100644 index a217480..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncErrorLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnSyncErrorLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java deleted file mode 100644 index 111a055..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSysUserOffline; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-09-02 - * @Modify: - **/ -@Repository -public interface MesPcnSysUserOfflineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java deleted file mode 100644 index 66621f9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTaskLog; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-27 - * @Modify: - **/ -@Repository -public interface MesPcnTaskLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java deleted file mode 100644 index 68295ee..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTask; -import org.springframework.stereotype.Repository; - -/** - * @Description :mes-pcn定时任务清单 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-26 - * @Modify: - **/ -@Repository -public interface MesPcnTaskRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java deleted file mode 100644 index c4ba8c9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPlanOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:08 - * @Modify: - **/ -@Repository -public interface MesPlanOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java deleted file mode 100644 index add5aac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPlc; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/26 7:47 PM - * @Description: - **/ -@Repository -public interface MesPlcRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java deleted file mode 100644 index d931c12..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcess; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProcessRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java deleted file mode 100644 index 2b9ba19..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdBindRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdBindRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java deleted file mode 100644 index c93700b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfgDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdCfgDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java deleted file mode 100644 index 1413862..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java deleted file mode 100644 index cf70703..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdPack; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdPackRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java deleted file mode 100644 index 7a55397..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdRouteCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java deleted file mode 100644 index 93e532b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteOptParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdRouteOptParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java deleted file mode 100644 index 6827df9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdScatterCfgBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/9 0009 - 18:03 - */ -@Repository -public interface MesProdScatterCfgBomRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java deleted file mode 100644 index 50602d5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCategory; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-26-10:28 - * @Modify: - **/ -@Repository -public interface MesProduceCategoryRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java deleted file mode 100644 index 2edb306..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCtgyPicture; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:35 - * @Modify: - **/ -public interface MesProduceCtgyPictureRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java deleted file mode 100644 index e049715..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:10 - * @Modify: - **/ -@Repository -public interface MesProduceSnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java deleted file mode 100644 index 607e64c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel; -import org.springframework.stereotype.Repository; - -/** - * @Description : 条码履历Dao层接口 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 16:36 - * @Modify: - **/ -@Repository -public interface MesProduceSnTravelRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java deleted file mode 100644 index eb8debf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProductDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java deleted file mode 100644 index de434ac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductEncodeCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-04-17-17:10 - * @Modify: - **/ -@Repository -public interface MesProductEncodeCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java deleted file mode 100644 index 8c909e7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckData; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 16:43 - * @Modify: - **/ -public interface MesQcCheckDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java deleted file mode 100644 index 1348b9c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 14:58 - * @Modify: - **/ -public interface MesQcCheckStandardRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java deleted file mode 100644 index bd19fef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJisDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesQueueJisDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java deleted file mode 100644 index 8a08948..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJis; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesQueueJisRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java deleted file mode 100644 index 82bbefb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrderDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:12 - * @Modify: - **/ -@Repository -public interface MesQueueOrderDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java deleted file mode 100644 index 989e14f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:11 - * @Modify: - **/ -@Repository -public interface MesQueueOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java deleted file mode 100644 index 1f048c1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/18 10:05 AM - * @Description: - **/ -@Repository -public interface MesRawPartSnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java deleted file mode 100644 index 1325e76..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepairRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:06 - * @Modify: - **/ -public interface MesRepairRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java deleted file mode 100644 index 2e22c77..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepair; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-08-17:13 - * @Modify: - **/ -@Repository -public interface MesRepairRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java deleted file mode 100644 index f217869..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRouteProcessCell; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteProcessCellRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java deleted file mode 100644 index 5749bbd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRouteProcess; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteProcessRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java deleted file mode 100644 index 92800fd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRoute; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java deleted file mode 100644 index 0f3e5eb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrapRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:07 - * @Modify: - **/ -public interface MesScrapRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java deleted file mode 100644 index 4dbf260..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrap; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-08-17:13 - * @Modify: - **/ -@Repository -public interface MesScrapRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java deleted file mode 100644 index 7f5b1a7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShift; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-19-13:53 - * @Modify: - **/ -@Repository -public interface MesShiftRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java deleted file mode 100644 index b3cc087..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShiftRest; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-20 - * @Modify: - **/ -@Repository -public interface MesShiftRestRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java deleted file mode 100644 index f5fd71f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStationBomRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java deleted file mode 100644 index f7b386f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStepParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStepParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java deleted file mode 100644 index 5f3f562..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStepRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java deleted file mode 100644 index 6489cec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTime; -import org.springframework.stereotype.Repository; - -@Repository -public interface MesTimeRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java deleted file mode 100644 index d2be5f1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTorqueDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesTorqueDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java deleted file mode 100644 index 02911ac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTypeCfg; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\12\4 10:34 - * @Modify: - **/ -public interface MesTypeCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java deleted file mode 100644 index 71d7efa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 7:30 PM - * @Description: - **/ -public interface MesWcCheckRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java deleted file mode 100644 index cbf9cae..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheck; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 7:30 PM - * @Description: - **/ -public interface MesWcCheckRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java deleted file mode 100644 index 0e70427..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/28 12:04 PM - * @Description: - **/ -public interface MesWcEquipmentRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java deleted file mode 100644 index 672947b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellMonitorLog; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:58 PM - * @Description: - **/ -public interface MesWorkCellMonitorLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java deleted file mode 100644 index 98f4a1c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParamCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellParamCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java deleted file mode 100644 index 3a714cf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-30 - * @Modify: - **/ -@Repository -public interface MesWorkCellParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java deleted file mode 100644 index 52319d0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint; -import org.springframework.stereotype.Repository; - -/** - * @Description :工站队列Dao层接口 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 14:40 - * @Modify: - **/ -@Repository -public interface MesWorkCellPointRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java deleted file mode 100644 index ce59423..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java deleted file mode 100644 index e24b5db..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCenter; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCenterRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java deleted file mode 100644 index fea2dfb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrderLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-19-17:13 - * @Modify: - **/ -@Repository -public interface MesWorkOrderLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java deleted file mode 100644 index 40676c4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:13 - * @Modify: - **/ -@Repository -public interface MesWorkOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java deleted file mode 100644 index 8d48efd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ /dev/null @@ -1,411 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.sqlpack; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.pcn.bean.*; -import org.springframework.util.StringUtils; - -/** - * @Description: - * @Reference: Mes 条件封装 - * @Author: Crish - * @CreateDate:2019-04-22-14:58 - * @Modify: - **/ -public class MesHqlPack { - - - /** - * 通用查询条件 - * - * @param organizeCode - * @return - */ - public static DdlPackBean getAllBaseData(String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - return packBean; - } - - /** - * 通用查询条件 - * - * @param organizeCode - * @return - */ - public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - return packBean; - } - - /** - * MES PCN系统配置信息条件查询 - * - * @param mesConfig - * @return - */ - public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); - } - if (!StringUtils.isEmpty(mesConfig.getCfgName())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); - } - if (!StringUtils.isEmpty(mesConfig.getIsValid())) { - DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); - } - return packBean; - } - - /** - * 根据打印模板的模板代码查询模板信息 - * - * @param mesLabelTemplate - * @return - */ - public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); - return packBean; - } - - /** - * 获取工作中心下所有的投料数据 - * - * @param mesCellFeed - * @param org - * @return - */ - public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { - DdlPackBean packBean = getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); - return packBean; - } - - - /** - * 获取原材料扫描信息的对应工序BOM - * - * @param stationBom - * @param rawPartSn - * @return - */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { - DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); - DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); - return packBean; - } - - /** - * 生产工单查询条件封装 - * - * @param mesWorkOrder - * @return - */ - public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); - } else { - if (!StringUtils.isEmpty(mesWorkOrder.getPageType()) && "1".equals(mesWorkOrder.getPageType())) { - DdlPreparedPack.getInPackArray(new Object[]{MesPcnEnumUtil.WORK_ORDER_STATUS.OPEN.getValue(), MesPcnEnumUtil.WORK_ORDER_STATUS.PAUSE.getValue(), - MesPcnEnumUtil.WORK_ORDER_STATUS.COMPLETE.getValue()}, "workOrderStatus", packBean); - } - } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getApprovalStatus())) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getIsValid())) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); - } - - // 时间段查询 - if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesWorkOrder.getStartTimeStart(), - mesWorkOrder.getStartTimeEnd(), - "startTime", packBean, true); - } - if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesWorkOrder.getEndTimeStart(), - mesWorkOrder.getEndTimeEnd(), - "endTime", packBean, true); - } - if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesWorkOrder.getCreateDateTimeStart(), - mesWorkOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - } - return packBean; - } - - /** - * 物料信息查询条件封装 - * - * @param mesPart - * @return - */ - public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - - if (!StringUtils.isEmpty(mesPart.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); - } - if (!StringUtils.isEmpty(mesPart.getPartName())) { - DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); - } - if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) { - DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); - } - if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) { - DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); - } - if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { - DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); - } - return packBean; - } - - /** - * MES 客户信息查询条件封装 - * - * @param customer - * @return - */ - public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); - if (!StringUtils.isEmpty(customer.getCustomerCode())) { - DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); - } - if (!StringUtils.isEmpty(customer.getCustomerName())) { - DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); - } - - return packBean; - } - - /** - * MES PCN系维修信息条件查询 - * - * @param mesRepair - * @return - */ - public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesRepair.getRepairCode())) { - DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); - } - if (!StringUtils.isEmpty(mesRepair.getRepairName())) { - DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); - } - if (!StringUtils.isEmpty(mesRepair.getRepairType())) { - DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); - } - return packBean; - } - - /** - * MES PCN系维修信息条件查询 - * - * @param mesScrap - * @return - */ - public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesScrap.getScrapCode())) { - DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); - } - if (!StringUtils.isEmpty(mesScrap.getScrapName())) { - DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); - } - if (!StringUtils.isEmpty(mesScrap.getScrapType())) { - DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean); - } - return packBean; - } - - /** - * MES PCN缺陷原因信息条件查询 - * - * @param mesDefectCause - * @return - */ - public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) { - DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean); - } - if (!StringUtils.isEmpty(mesDefectCause.getDcName())) { - DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean); - } - if (!StringUtils.isEmpty(mesDefectCause.getDcType())) { - DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean); - } - return packBean; - } - - /** - * 按条件分页查询产品条码补打印数据 - * @param mesProduceSn - * @return - */ - public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { - DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); - if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { - DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); - } - - // 时间段查询 - if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesProduceSn.getCreateDateTimeStart(), - mesProduceSn.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - } - if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesProduceSn.getOutWorkCenterTimeStart(), - mesProduceSn.getOutWorkCenterTimeEnd(), - "outWorkCenterTime", packBean, true); - } - return packBean; - } - - /** - * 按条件分页查询包装条码补打印数据 - * @param mesPackage - * @return - */ - public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) { - - DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode()); - if (!StringUtils.isEmpty(mesPackage.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { - DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); - } - - // 时间段查询 - DdlPreparedPack.timeBuilder( - mesPackage.getCreateDateTimeStart(), - mesPackage.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - - return packBean; - } - - - /** - * MES班组信息查询条件封装 - * - * @param shiftGroup - * @param organizeCode - * @return - */ - public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { - - DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); - if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) { - DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); - } - if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { - DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); - } - if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean); - } - return packBean; - } - - public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { - DdlPackBean packBean = getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); - return packBean; - } - - - - /** - * 按条件分页查询类型信息数据 - * @param typeCfg - * @return - */ - public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) { - - DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode()); - if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) { - DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); - } - if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) { - DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean); - } - if (!StringUtils.isEmpty(typeCfg.getTypeCode())) { - DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean); - } - - return packBean; - } -} diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..60fc467 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-DEV-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/.DS_Store b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store deleted file mode 100644 index cc05df3..0000000 Binary files a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store and /dev/null differ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java index eb1c3c2..d347ac7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_VENDOR") @Api("供应商信息") public class BasVendor extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java new file mode 100644 index 0000000..3d4840c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_客户月度订单数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_CUST_ORDER_DATA") +@Api("IF_客户月度订单数据") +public class IfCustOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695346L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_NAME") + @ApiParam("客户名称") + private String customerName; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("订单数量") + private Integer qty = 0; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Transient + @ApiParam("年度客户月度订单集合") + private List> ifCustOrderDataMap = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java index d95ebc1..1fff7dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_DEFECT_DATA") @Api("不良信息接口数据") public class IfDefectData extends BaseBean implements Serializable { @@ -65,9 +69,10 @@ public class IfDefectData extends BaseBean implements Serializable { @Column(name = "DEFECT_ACTION_TYPE") @ApiParam("不良处理类型") - private Integer defectActionType; + private String defectActionType; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java new file mode 100644 index 0000000..7b8c9ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java @@ -0,0 +1,70 @@ +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.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_订单交付数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_DELIVER_ORDER_DATA") +@Api("IF_订单交付数据") +public class IfDeliverOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695347L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("发运数量") + private Integer qty = 0; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private Integer moveType; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 39063b7..ce62778 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -4,13 +4,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 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.Lob; import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; @@ -27,6 +29,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_DISMENTLE_RECORD") @Api("物料拆解表") public class IfDismantleRecord extends BaseBean implements Serializable { @@ -56,7 +59,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String sn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; @@ -94,7 +98,6 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") - @Lob private String errorMessage; @Column(name = "ACTION_CODE") @@ -104,4 +107,29 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java index a41617f..3ac9292 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java @@ -6,14 +6,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.*; + 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; /** @@ -26,7 +25,12 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "IF_EDI_INITIAL_DATA") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_EDI_INITIAL_DATA", indexes = { + @Index(columnList = "PROGRAM_DATA"), + @Index(columnList = "CONTENT"), + @Index(columnList = "SYNC_STATUS") +}) @Api("EDI_初始数据表") public class IfEdiInitialData extends BaseBean implements Serializable { private static final long serialVersionUID = -523843818485699827L; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java similarity index 62% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java index 367bb1c..15c072a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -1,23 +1,27 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; 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.Lob; import javax.persistence.Table; import java.io.Serializable; /** * @Description: * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 10:12 + * @Author: dominic + * @CreateDate: 2020/10/29 14:11 * @Modify: **/ @Data @@ -25,64 +29,55 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PRODUCT_OFF_LINE") -@Api("生产报工表") -public class IfProductOffLine extends BaseBean implements Serializable { +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_PACKAGE") +@Api("包装条码接口表") +public class IfPackage extends BaseBean implements Serializable { - private static final long serialVersionUID = 200629529131241418L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; + private static final long serialVersionUID = 9099416791684702129L; @Column(name = "PACKAGE_NO") - @ApiParam("包装条码") + @ApiParam("包装编号") private String packageNo; - @Column(name = "QTY") + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; + @Column(name = "PORCESS_NAME") + @ApiParam("工序名称") + private String porcessName; - @Column(name = "LOT_NO") - @ApiParam("生产批次") - private String lotNo; + @Column(name = "RK_TYPE") + @ApiParam("料架类型") + private String rkType; - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批次") - private String fixLotNo; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; @Column(name = "ACTION_DATE_TIME") @ApiParam("操作时间") private String actionDateTime; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") private String errorMessage; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; -} + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 280de6b..64587ab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; + +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.Lob; -import javax.persistence.Table; import java.io.Serializable; /** @@ -26,7 +26,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PACKAGE_DETAIL") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_PACKAGE_DETAIL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PART_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "IF_CODE"}) +}) @Api("包装明细表") public class IfPackageDetail extends BaseBean implements Serializable { @@ -55,7 +61,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @ApiParam("包装批次") private String lotNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -115,4 +122,9 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; + + //枚举：MesPcnEnumUtil.IF_SYNC_STATUS + @Column(name = "SYNC_FLAG") + @ApiParam("同步标识(同步工具使用)") + private Integer syncFlag; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java new file mode 100644 index 0000000..feb6f08 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java @@ -0,0 +1,56 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : 物料校验客户标签关系 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/3/22 13:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_PART_CHECK_CUSTOMER_LABEL") +@Api("IF_物料校验客户标签关系") +public class IfPartCheckCustomerLabel extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "IS_CHECK") + @ApiParam("是否校验") + private Integer isCheck; + + @Column(name = "SYNC_STATUS") + @ColumnDefault("10") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + @Lob + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java new file mode 100644 index 0000000..17d59c1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java @@ -0,0 +1,56 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : 物料校验客户标签明细 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/3/22 13:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_PART_CHECK_CUSTOMER_LABEL_DETAIL") +@Api("IF_物料校验客户标签明细") +public class IfPartCheckCustomerLabelDetail extends BaseBean { + + @Column(name = "PACKAGE_NO") + @ApiParam("托条码") + private String packageNo; + + @Column(name = "CUSTOMER_LABEL") + @ApiParam("客户标签") + private String customerLabel; + + @Column(name = "SYNC_STATUS") + @ColumnDefault("10") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + @Lob + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java similarity index 50% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java index eb147e3..d9e1baf 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java @@ -1,39 +1,38 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; 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.Lob; import javax.persistence.Table; import java.io.Serializable; -import java.math.BigDecimal; /** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\14 19:36 - * @Modify: - **/ + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "IF_DISMENTLE_RECORD") -@Api("物料拆解表") -public class IfDismantleRecord extends BaseBean implements Serializable { +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_PART_PULL") +@Api("IF_物料拉动") +public class IfPartPull extends BaseBean implements Serializable { - private static final long serialVersionUID = -6010207359066736962L; - @Column(name = "DISMANTLE_ID") - @ApiParam("拆解编号") - private String dismantleId; + private static final long serialVersionUID = -2733956307324895596L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") @@ -43,49 +42,30 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @ApiParam("工位") private String workCellCode; + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + @Column(name = "PARENT_PART_NO") @ApiParam("产品物料编码") private String parentPartNo; - @Column(name = "PARENT_PART_NAME") - @ApiParam("产品物料名称") - private String parentPartName; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Double qty; - - @Column(name = "DISMANTLE_QTY") - @ApiParam("拆解数") - private BigDecimal dismantleQty; - @Column(name = "ITEM_PART_NO") @ApiParam("子物料编码") private String itemPartNo; - @Column(name = "ITEM_PART_NAME") - @ApiParam("子物料名称") - private String itemPartName; - - @Column(name = "OK_QTY") - @ApiParam("合格数") - private BigDecimal okQty; - - @Column(name = "MISS_QTY") - @ApiParam("缺失数") - private BigDecimal missQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数") - private BigDecimal scrapQty; + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("拉动数量") + private Double qty; - @Column(name = "LOT_NO") - @ApiParam("批次") - private String lotNo; + @Column(name = "ORGANIZTION_CODE") + @ApiParam("工厂代码") + private String organizationCode; @Column(name = "SYNC_STATUS") @ApiParam("同步状态") @@ -93,6 +73,7 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 2be9e5b..03cd270 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -3,15 +3,15 @@ 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.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +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.Lob; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,9 +26,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PRODUCT_OFF_LINE") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_PRODUCT_OFF_LINE", uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "ITEM_PART_NO"}) +}) +@NoArgsConstructor +@AllArgsConstructor @Api("生产报工表") -public class IfProductOffLine extends BaseBean implements Serializable { +public class IfProductOffLine extends BaseBean implements Serializable { private static final long serialVersionUID = -4960147948435537306L; @Column(name = "PART_NO") @@ -43,7 +48,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("包装条码") private String packageNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -67,7 +73,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料用量") private Double itemQty; @@ -97,7 +104,6 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") - @Lob private String errorMessage; @Column(name = "ACTION_CODE") @@ -131,4 +137,48 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus = 10; + + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲状态") + private String jisBackflushStatus; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "BASE_MODULE") + @ApiParam("BaseModule零件号") + private String baseModule; + + @Column(name = "QUEUE_GROUP_FLAG") + @ApiParam("分组标识") + private String queueGroupFlag; + + public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) { + this.partNo = partNo; + this.packageNo = packageNo; + this.qty = qty; + this.workCenterCode = workCenterCode; + this.qcStatus = qcStatus; + } + + public IfProductOffLine(String workCenterCode, String partNo, String partName, String itemPartNo, String itemPartName, String packageNo, Double qty, String createDatetime, String workOrderNo) { + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partName = partName; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.packageNo = packageNo; + this.qty = qty; + this.createDatetime = createDatetime; + this.workOrderNo = workOrderNo; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 74de05a..f96c3b2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_QC_ORDER") @Api("IF_质检单") public class IfQcOrder extends BaseBean implements Serializable { @@ -38,7 +42,8 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; @@ -102,4 +107,9 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("客户发运地") private String custDelieryLocation; + //枚举：MesPcnEnumUtil.IF_SYNC_STATUS + @Column(name = "SYNC_FLAG") + @ApiParam("同步标识(同步工具使用)") + private Integer syncFlag; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java index 7972aa2..0526aee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_QC_RESULT") @Api("IF_质检结果") public class IfQcResult extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index 42e7bfb..266168a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_QUEUE_SHIPPING") @Api("JIT发运数据同步") public class IfQueueShipping extends BaseBean implements Serializable { @@ -55,7 +59,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -93,7 +98,6 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") - @Lob private String errorMessage; @Column(name = "ACTION_CODE") @@ -116,7 +120,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料物料用量") private Double itemQty; @@ -143,4 +148,12 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "DOCK_NO") @ApiParam("道口") private String dockNo; + + @Column(name = "VERSION") + @ApiParam("版本号") + private String version; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java index bb50de6..e252fe6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_RAW_PART_DATA") @Api("原料上线数据") public class IfRawPartData extends BaseBean implements Serializable { @@ -46,7 +50,8 @@ public class IfRawPartData extends BaseBean implements Serializable { @ApiParam("原料条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java index 221abea..a4c58f9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_WMS_PPM") @Api("WMS PPM 接口表") public class IfWmsPpm extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java index d58ab5f..e33b8df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ACTION") @Api("mes系统业务动作") public class MesAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java index 7f2a912..cd71f07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ACTION_IF") @Api("动作接口配置") public class MesActionIf extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java index 68d952f..fc699d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ACTION_METHOD") @Api("系统业务动作方法") public class MesActionMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java index fb1dcd3..0d4ae9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_AGV_STOP_RECORD") @Api("MES_停机记录表") public class MesAgvStopRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java new file mode 100644 index 0000000..4384878 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ANALYSIS_RULE") +@Api("MES_解析规则") +public class MesAnalysisRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; + + @Column(name = "ANALYSIS_RULE_CODE") + @ApiParam("解析规则") + private String analysisRuleCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; +} 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 856d009..465d4ee 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,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_AREA") @Api("生产区域") public class MesArea extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java index 2f35bf8..3374913 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java @@ -8,7 +8,12 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -23,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BLIND_HISTORY") @Api("MES_盲检记录") public class MesBlindHistory extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java index 147e91c..28fca0a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BLIND_RULE") @Api("MES_盲检规则") public class MesBlindRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java index b82bbae..0ee410e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BLIND_TOPIC_SETTING") @Api("MES_盲检问题设置") public class MesBlindTopicSetting extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java index 7893a30..62f911d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD") @Api("MES_看板") public class MesBoard extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java new file mode 100644 index 0000000..f1868e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java @@ -0,0 +1,57 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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 java.io.Serializable; + +/** + * @Description :mes看板车间配置 + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-11-09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_AREA") +@Api("mes看板车间配置") +public class MesBoardArea extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4592603687011665216L; + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "PLAN_PASS_YIELD", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam("目标达成率") + private Double planPassYield; + + @Column(name = "YIELD_DIFF_VALUE", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam("上下偏差值") + private Double yieldDiffValue; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java similarity index 53% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java index a434107..28ceb7b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java @@ -1,9 +1,11 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -14,29 +16,26 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description :工作单元参数配置 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:49 下午 * @Modify: - **/ + */ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_PARAM_CFG") -@Api("工作单元参数配置") -public class MesWorkCellParamCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 1739991089354361293L; +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_CUSTOM_PARAM_CFG") +@Api("MES_看板自定义参数配置") +public class MesBoardCustomParamCfg extends BaseBean implements Serializable { - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; + private static final long serialVersionUID = 3932883827194753734L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; @Column(name = "PARAM_CODE") @ApiParam("参数代码") @@ -49,8 +48,4 @@ public class MesWorkCellParamCfg extends BaseBean implements Serializable { @Column(name = "PARAM_VALUE") @ApiParam("参数值") private String paramValue; - - @Column(name = "IS_CHECK") - @ApiParam("是否必须校验") - private Integer isCheck; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java new file mode 100644 index 0000000..c3aa9a3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java @@ -0,0 +1,47 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_CUSTOMER_DATA") +@Api("MES_看板客户相关信息") +public class MesBoardCustomerData extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3871945569470777555L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "COMPLAIN_PLAN_QTY") + @ApiParam("客户抱怨目标数量") + private Integer complainPlanQty; + + @Column(name = "COMPLAIN_ACTUAL_QTY") + @ApiParam("客户抱怨实际数量") + private Integer complainActualQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java new file mode 100644 index 0000000..b8a1442 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java @@ -0,0 +1,56 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/1 5:55 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_DISPLAY") +@Api("MES_看板跑马灯") +public class MesBoardDisplay extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1537754345697889680L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "DISPLAY_CONTENT") + @ApiParam("显示内容") + private String displayContent; + + @Column(name = "IS_ROLL") + @ApiParam("是否滚动") + private Integer isRoll; + + @Column(name = "ROLL_SPEED") + @ApiParam("滚动速度") + private Integer rollSpeed; + + @Transient + @ApiParam("跑马灯字体颜色") + private String fontColor; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 16462e9..45b2ecf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -5,7 +5,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; 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; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_EQU_DETAIL") @Api("MES_看板设备明细") public class MesBoardEquDetail extends BaseBean implements Serializable { @@ -44,11 +48,13 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "纵坐标") private Double yAxes = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java index a4f9a61..78b99c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_EQU_STATUS") @Api("MES_看板设备状态") public class MesBoardEquStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java new file mode 100644 index 0000000..5281d85 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -0,0 +1,92 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_LINE") +@Api("看板产线配置") +public class MesBoardLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 5212593630787939081L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "PLAN_OEE") + @ApiParam("目标OEE") + private Double planOee; + + @Column(name = "PLAN_TAKT") + @ApiParam("计划节拍") + private Double planTakt; + + @Column(name = "PASS_PERCENT_MAX") + @ApiParam("良品率上限") + private Double passPercentMax; + + @Column(name = "PASS_PERCENT_MIN") + @ApiParam("良品率下限") + private Double passPercentMin; + + @Column(name = "CAR_RUN_TIME") + @ApiParam("小车运行时间（分）") + private Double carRunTime; + + @Column(name = "TEST_CAR_SUM") + @ApiParam("调试车数") + private Integer testCarSum; + + @Column(name = "PLAN_FIRST_PASS_YIELD") + @ApiParam("一次良品率目标值") + private Double planFirstPassYield; + + @Column(name = "PLAN_PASS_YIELD") + @ApiParam("最终良品率目标值") + private Double planPassYield; + + /** + * 是否展示： 1--展示 ，2--不展示 + */ + @Column(name = "IS_DISPLAY") + @ApiParam("是否展示") + private Integer isDisplay; + + @Column(name = "OEE_RED_LINE_VALUE") + @ApiParam("OEE红线值") + private String oeeRedLineValue; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java new file mode 100644 index 0000000..aa1a5fe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java @@ -0,0 +1,56 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_LINE_COORDS_MATRIX") +@Api("MES_看板产线坐标") +public class MesBoardLineCoordsMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = -7823702941907604215L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "X_AXIS") + @ApiParam("X坐标") + private String xAxis; + + @Column(name = "Y_AXIS") + @ApiParam("Y坐标") + private String yAxis; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java new file mode 100644 index 0000000..fc0c63c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java @@ -0,0 +1,76 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_LINE_MATRIX") +@Api("MES_看板产线矩阵") +public class MesBoardLineMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = 4414374274261870347L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "PICTURE_URL") + @ApiParam("产线图片路径") + private String pictureUrl; + + @Column(name = "USER_FIRST") + @ApiParam("用户编号1") + private String userFirst; + + @Column(name = "USER_SECOND") + @ApiParam("用户编号2") + private String userSecond; + + @Column(name = "USER_THIRD") + @ApiParam("用户编号3") + private String userThird; + + @Column(name = "USER_FORTH") + @ApiParam("用户编号4") + private String userForth; + + @Column(name = "USER_FIFTH") + @ApiParam("用户编号5") + private String userFifth; + + @Column(name = "USER_SIXTH") + @ApiParam("用户编号6") + private String userSixth; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java new file mode 100644 index 0000000..9a7304d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java @@ -0,0 +1,64 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_LINE_STAFF_MATRIX") +@Api("MES_看板产线员工能力矩阵") +public class MesBoardLineStaffMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = 1889056360071546259L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位代码") + private String workCellCode; + + @Column(name = "USER_CODE") + @ApiParam("员工编号") + private String userCode; + + @Column(name = "X_AXIS") + @ApiParam("X坐标") + private Double xAxis; + + @Column(name = "Y_AXIS") + @ApiParam("Y坐标") + private Double yAxis; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java new file mode 100644 index 0000000..59057d5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java @@ -0,0 +1,121 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板麦格纳评定项 + * @Reference : + * @Author : adair + * @CreateDate : 2020-10-19 17:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="MES_BOARD_MAFACT_ASSESSMENT") +@Api("MES_看板麦格纳评定项") +public class MesBoardMafactAssessment extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7260899228359202210L; + + @Column(name="BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name="ENG_ADV_QUALITY") + @ApiParam("ENG_ADV_QUALITY") + private String engAdvQuality; + + @Column(name="MANAGEMENT") + @ApiParam("MANAGEMENT") + private String manageMent; + + @Column(name="MAT_LOG_SUP") + @ApiParam("MAT_LOG_SUP") + private String matLogSup; + + @Column(name="MFG_EXC") + @ApiParam("MFG_EXC") + private String mfgExc; + + @Column(name="QUALITY") + @ApiParam("QUALITY") + private String quality; + + @Column(name = "EHS") + @ApiParam("EHS") + private String ehs; + + @Column(name = "COST") + @ApiParam("COST") + private String cost; + + @Column(name = "HR") + @ApiParam("HR") + private String hr; + + @Column(name = "JAN") + @ApiParam("JAN") + private String jan; + + @Column(name = "FEB") + @ApiParam("FEB") + private String feb; + + @Column(name = "MAR") + @ApiParam("MAR") + private String mar; + + @Column(name = "APR") + @ApiParam("APR") + private String apr; + + @Column(name = "MAY") + @ApiParam("MAY") + private String may; + + @Column(name = "JUN") + @ApiParam("JUN") + private String jun; + + @Column(name = "JUL") + @ApiParam("JUL") + private String jul; + + @Column(name = "AUG") + @ApiParam("AUG") + private String aug; + + @Column(name = "SEP") + @ApiParam("SEP") + private String sep; + + @Column(name = "OCT") + @ApiParam("OCT") + private String oct; + + @Column(name = "NOV") + @ApiParam("NOV") + private String nov; + + @Column(name = "DECEMBER") + @ApiParam("DECEMBER") + private String december; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java index cfca7b3..8ea7818 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_MONITOR_OBJECT") @Api("MES_看板监控对象") public class MesBoardMonitorObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java index ae43578..00e2194 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_PICTURE") @Api("MES_看板图片") public class MesBoardPicture extends BaseBean implements Serializable { @@ -37,4 +40,8 @@ public class MesBoardPicture extends BaseBean implements Serializable { @Column(name = "PICTURE_URL") @ApiParam("图片路径") private String pictureUrl; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 842f52f..59e3159 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_PLAN_CAPACITY") @Api("MES_看板计划产能") public class MesBoardPlanCapacity extends BaseBean implements Serializable { @@ -56,11 +60,36 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @ApiParam("计划产量") private Integer planCapacity; + @Column(name = "MONTH_PLAN_CAPACITY") + @ApiParam("月计划产量") + private Integer monthPlanCapacity; + + @Column(name = "HOUR_CAPACITY") + @ApiParam("时段产能") + private Integer hourCapacity; + + @Column(name = "STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("停机时间") + private Double stopTime; + + @Column(name = "ACTUAL_CAPACITY") + @ApiParam("今日产量") + private Integer actualCapacity; + + @Column(name = "PLAN_TAKT") + @ApiParam("计划节拍") + private Integer planTakt; + + @Column(name = "IS_MANUAL") + @ApiParam("是否手工展示") + private Integer isManual; + @Transient @ApiParam("班次名称") private String shiftName; @Transient @ApiParam("看板时段计划产量") - private List boardShiftSectionCapacities; + private List boardShiftSectionCapacities; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java index 4c1f609..4d9f5be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_SHIFT") @Api("MES_看板班次") public class MesBoardShift extends BaseBean implements Serializable { @@ -41,4 +44,8 @@ public class MesBoardShift extends BaseBean implements Serializable { @Column(name = "SHIFT_NAME") @ApiParam("班次名称") private String shiftName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java index e9138cf..9555a82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_SHIFT_SECTION") @Api("MES_看板班次时段") public class MesBoardShiftSection extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java similarity index 84% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java index 2b2e211..582f004 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,9 +27,10 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_SHIFT_SECTION_CAP") @Api("MES_看板时段计划产量") -public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable { +public class MesBoardShiftSectionCap extends BaseBean implements Serializable { private static final long serialVersionUID = -1184108324734484237L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java new file mode 100644 index 0000000..eac7da9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java @@ -0,0 +1,67 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_SUBMENU") +@Api("MES_看板子菜单") +public class MesBoardSubmenu extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6544735793917822548L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "ITEM_NAME") + @ApiParam("子项名称") + private String itemName; + + @Column(name = "ICON") + @ApiParam("ICO图标") + private String icon; + + @Column(name = "SEQ") + @ApiParam("顺序号") + private Integer seq; + + /** + * 10-图片 20-视频 + */ + @Column(name = "SHOW_TYPE") + @ApiParam("展示类型") + private Integer showType; + + @Column(name = "PICTURE_URL") + @ApiParam("图片路径") + private String pictureUrl; + + @Column(name = "VIDEO_URL") + @ApiParam("视频路径") + private String videoUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java new file mode 100644 index 0000000..4136113 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java @@ -0,0 +1,47 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOARD_SWITCH_CFG") +@Api("MES_看板切换配置") +public class MesBoardSwitchCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -9101785840595985385L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "SWITCH_INTERVAL") + @ApiParam("屏切换频次") + private Integer switchInterval; + + @Column(name = "LINE_SWITCH_INTERVAL") + @ApiParam("产线切换频次") + private Integer lineSwitchInterval; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java index 7ca60bc..3e45c9d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_TYPE") @Api("MES_看板类型") public class MesBoardType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java index 786c128..c095ace 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_TYPE_BASE_CFG") @Api("MES_看板类型基础配置") public class MesBoardTypeBaseCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java index 59d5305..5f7ba11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; 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; @@ -30,6 +32,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_BOARD_WORK_CELL") @Api("MES_看板工位信息") public class MesBoardWorkCell extends BaseBean implements Serializable { @@ -47,11 +50,13 @@ public class MesBoardWorkCell extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("纵坐标") private Double yAxes = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 700a5cb..6095463 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -6,15 +6,15 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -29,7 +29,10 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_BOM") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BOM", indexes = { + @Index(columnList = "PART_NO") +}) @Api("BOM清单") public class MesBom extends BaseBean implements Serializable { private static final long serialVersionUID = 6781011059554785782L; @@ -85,6 +88,28 @@ public class MesBom extends BaseBean implements Serializable { @ApiParam("BOM代码") private String bomCode; + @Transient + @ApiParam(value = "过程条码") + public String serialNumber; + + @Transient + @ApiParam(value = "已拆解数量") + public Double scrapQty = 0d; + + @Transient + @ApiParam("合格数") + private Double okQty = 0d; + + @Transient + @ApiParam("缺失数") + private Double missQty = 0d; + + @Transient + @ApiParam("报废数") + private Double wasteQty = 0d; + + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java new file mode 100644 index 0000000..5a1bed1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java @@ -0,0 +1,43 @@ +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.*; +import java.io.Serializable; + +/** + * @Description :BP业务对比表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BP_BUSINESS") +@Api("BP业务对比表") +public class MesBpBusiness extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053666347L; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("预测数量") + private Double qty = 0d; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 62e0e18..8cc2d91 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BUTTON_STATUS") @Api("按钮状态配置表") public class MesButtonStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java new file mode 100644 index 0000000..1059142 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java @@ -0,0 +1,47 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/9/6 1:25 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BYPASS_MAPPING") +@Api("MES_BYPASS项映射关系") +public class MesBypassMapping extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6362769913660089402L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "BYPASS_SEQ") + @ApiParam("BYPASS项序号") + private Integer bypassSeq; + + @Column(name = "CHECK_NAME") + @ApiParam("检测项描述") + private String checkName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java index e250191..bbbf3ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CACHA_QUEUE") @Api("MES缓存队列") public class MesCachaQueue extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a7e233a..826f54d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CELL_FEED") @Api("工位投料信息") public class MesCellFeed extends BaseBean implements Serializable { @@ -60,7 +64,8 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; @@ -72,6 +77,10 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Column(name = "RACK_NO") + @ApiParam("料箱编号") + private String rackNo; + @Transient @ApiParam(value = "原料类型名称") private String rawTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index 9056293..51a5a51 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CELL_FEED_RECORD", indexes = { @Index(columnList = "ORDER_NO") }) @@ -59,7 +63,8 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; @@ -71,6 +76,10 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Column(name = "RACK_NO") + @ApiParam("料箱编号") + private String rackNo; + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java new file mode 100644 index 0000000..6aec6eb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java @@ -0,0 +1,50 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/11 14:29 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_CHECK_DATA_CFG", indexes = { + @Index(columnList = "CHECK_CFG_NO") +}) +@Api("检测数据源配置") +public class MesCheckDataCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5608847087804566577L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + + +} 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 d385b72..edad745 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CONFIG") @Api("mes配置表") public class MesConfig extends BaseBean implements Serializable { 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 12e6ad0..70ef63e 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 @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CONTAINER") @Api("MES_容器类型") public class MesContainer extends BaseBean { @@ -40,4 +43,28 @@ public class MesContainer extends BaseBean { @Column(name = "USE_STATUS") @ApiParam(value = "使用状态") private String useStatus; + + @Column(name = "IP_ADDRESS") + @ApiParam(value = "IP") + private String ipAddress; + + @Column(name = "PORT") + @ApiParam(value = "端口") + private String port; + + @Column(name = "UNLOCK_DO") + @ApiParam(value = "接收DO") + private String unlockDo; + + @Column(name = "RED_LIGHT_DO") + @ApiParam(value = "红灯DO") + private String redLightDo; + + @Column(name = "TIME_SECOND") + @ApiParam(value = "处理时间(秒)") + private String timeSecond; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus = 10; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java new file mode 100644 index 0000000..b1ecc13 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java @@ -0,0 +1,47 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_容器位置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 17:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_CONTAINER_LOCATION") +@Api("MES_容器位置") +public class MesContainerLocation extends BaseBean implements Serializable { + private static final long serialVersionUID = 8181007288150974903L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "LOCATION_CAPACITY") + @ApiParam(value = "默认容量") + private String locationCapacity; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java new file mode 100644 index 0000000..0e5f898 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java @@ -0,0 +1,55 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_CONTAINER_SN_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PART_NO"), + @Index(columnList = "CT_NO") +}) +@Api("容器条码记录表") +public class MesContainerSnRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -303802118993255101L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "CT_NO") + @ApiParam("容器号") + private String ctNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java index b317f3c..51e7f3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CONTAINER_TYPE") @Api("MES_容器类型") public class MesContainerType extends BaseBean { @@ -52,4 +55,8 @@ public class MesContainerType extends BaseBean { @Column(name = "LIMIT_UOM") @ApiParam(value = "期限单位") private String limitUom; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus = 10; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java new file mode 100644 index 0000000..1b1819f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -0,0 +1,67 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: MES控制计划-主表（子表：质量标准MES_QUALITY_STANDARD） + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_CONTROL_PLAN") +@Api("中航控制计划主表") +public class MesControlPlan extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_NAME") + @ApiParam("客户名称") + private String custName; + + @Column(name = "VERSION") + @ApiParam("版本号") + private Integer version; + + @Column(name = "AUDIT_TYPE") + @ApiParam("审核状态") + private Integer auditType; + + @Column(name = "IS_ENABLE") + @ApiParam("是否启用") + private Integer isEnable; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 8382b3e..b0ce622 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index 6224656..c3b4d99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CUST_PROD_LINE") @Api("客户产线代码") public class MesCustProdLine extends BaseBean implements Serializable { @@ -45,4 +48,16 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "CUST_PROD_LINE_FLAG") + @ApiParam("客户产线标识") + private String custProdLineFlag; + + @Column(name = "DOCK_NO") + @ApiParam("dock") + private String dockNo; } 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 129d45e..9ff2531 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CUSTOMER") @Api("客户信息") public class MesCustomer extends BaseBean implements Serializable { @@ -57,4 +60,8 @@ public class MesCustomer extends BaseBean implements Serializable { @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") private String custDeliveryLocation; + + @Column(name = "IS_BI_DISPLAY") + @ApiParam("是否BI显示") + private Integer isBiDisplay = 2; } 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 83396d1..39b12bc 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 @@ -6,12 +6,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; 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.*; import java.io.Serializable; /** @@ -26,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CUSTOMER_PART") @Api("客户零件关系") public class MesCustomerPart extends BaseBean implements Serializable { @@ -39,14 +39,31 @@ public class MesCustomerPart extends BaseBean implements Serializable { private String partNo; @Column(name = "CUSTOMER_PART_NO") - @ApiParam("客户零件号") + @ApiParam("客户物料号") private String customerPartNo; @Column(name = "CUSTOMER_PART_NAME") - @ApiParam("客户零件描述") + @ApiParam("客户物料名称") private String customerPartName; + @Column(name = "CUSTOMER_PART_COLOR") + @ApiParam("客户物料颜色") + private String customerPartColor; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("用量") + private Double qty; + @Column(name = "CUSTOMER_CFG_CODE") - @ApiParam("客戶配置代碼") + @ApiParam("客户配置代码") private String customerCfgCode; + + @Column(name = "CUSTOMER_MARK") + @ApiParam("客户代号") + private String customerMark; + + @Column(name = "CUSTOMER_LATCH") + @ApiParam("客户抬头") + private String customerLatch; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java new file mode 100644 index 0000000..d8bd8ce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java @@ -0,0 +1,63 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_客户条码规则 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_CUSTOMER_SN_RULE") +@Api("MES_客户条码规则") +public class MesCustomerSnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -3928160156339420471L; + + @Column(name = "CUSTOMER_CODE") + @ApiParam(value = "客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam(value = "客户零件号") + private String customerPartNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + private String partNo; + + @Column(name = "LENGTH") + @ApiParam(value = "长度") + private Integer length; + + @Column(name = "FROM1") + @ApiParam(value = "起始1") + private Integer from1; + + @Column(name = "TO1") + @ApiParam(value = "至1") + private Integer to1; + + @Column(name = "FIX1") + @ApiParam(value = "内容1") + private String fix1; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java index f727900..8f45501 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java @@ -7,14 +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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; import java.util.List; @@ -30,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DATA_AUTH") @Api("数据权限") public class MesDataAuth extends BaseBean implements Serializable { @@ -54,7 +54,8 @@ public class MesDataAuth extends BaseBean implements Serializable { @ApiParam("数据对象名称") private String dataObjectName; - @Column(name = "FILTER_RULE", columnDefinition = "TEXT") + @Lob + @Column(name = "FILTER_RULE") @ApiParam("过滤规则") private String filterRule; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java new file mode 100644 index 0000000..5d69c4c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java @@ -0,0 +1,80 @@ +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.*; +import java.io.Serializable; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_DATA_MIGRATION_CFG") +@Api("MES数据迁移配置表") +public class MesDataMigrationCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6445732389643648643L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN节点名称代码") + private String pcnCode; + + @Column(name = "MIG_NAME") + @ApiParam("名称") + private String migName; + + @Column(name = "REMARK") + @ApiParam("描述") + private String remark; + + @Column(name = "SRC_TABLE_NAME") + @ApiParam("来源表名") + private String srcTableName; + + @Column(name = "SRC_QUERY_CONDITIONS") + @ApiParam("来源表查询条件") + private String srcQueryConditions; + + @Column(name = "PROCESS_QTY") + @ApiParam(value = "每次处理行数", example = "0") + private Integer processQty; + + @Column(name = "DEST_TABLE_NAME") + @ApiParam("目标表名") + private String destTableName; + + @Column(name = "IS_PHYSICAL_DELETE") + @ApiParam(value = "是否物理删除", example = "0") + private Integer isPhysicalDelete; + + //枚举：CommonEnumUtil.DATA_SOURCE_TYPE + @Column(name = "DATASOURCE_TYPE") + @ApiParam(value = "数据源类型") + private String dataSourceType; + + @Column(name = "LAST_EXECUTION_TIME") + @ApiParam("末次迁移时间") + private String lastExecutionTime; + + @Column(name = "LAST_MIGRATION_QTY") + @ApiParam(value = "末次迁移记录数", example = "0") + private Integer lastMigrationQty; + + + @Transient + @ApiParam(value = "开始时间") + private String mcStartTime; + + @Transient + @ApiParam(value = "结束时间") + private String mcEndTime; + +} 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 af4d758..5f382f0 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DATA_OBJECT") @Api("数据对象") public class MesDataObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java index f422957..a6b7d04 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DATA_WARNING") @Api("数据预警配置") public class MesDataWarning extends BaseBean implements Serializable { @@ -56,7 +59,7 @@ public class MesDataWarning extends BaseBean implements Serializable { private Integer informMode; @Lob - @Column(name = "INFORM_USER") + @Column(name = "INFORM_USER",columnDefinition = "TEXT") @ApiParam("通知对象") private String informUser; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index b603553..fbea393 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DATASOURCE") @Api("地址清单") public class MesDatasource extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java new file mode 100644 index 0000000..71152d1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -0,0 +1,82 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: MES-中航DB数据复核不通过记录表 + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_DB_CHECK_RECORD") +@Api("中航复核异常记录表") +public class MesDbCheckRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6727925715356900171L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "ERROR_FILED_CODE") + @ApiParam("异常取值字段") + private String errorFiledCode; + + @Column(name = "ERROR_FILED_DESC") + @ApiParam("异常取值字段描述") + private String errorFiledDesc; + + //10数字、20字符串 + @Column(name = "ERROR_FILED_TYPE") + @ApiParam("异常取值字段类型") + private String errorFiledType; + + @Column(name = "ERROR_FILED_VALUE") + @ApiParam("异常取值字段值") + private String errorFiledValue; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码（第三方库表名）") + private String objectCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + + @Transient + @ApiParam("按钮名称") + private String btnName; + + @Transient + @ApiParam("按钮颜色") + private String btnColor; + + @Transient + @ApiParam("按钮类别") + private String btnType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java new file mode 100644 index 0000000..fe10ed1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java @@ -0,0 +1,68 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: MES-中航DB数据检查配置表 + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_DB_DATA_CHECK") +@Api("中航DB数据检查配置表") +public class MesDbDataCheck extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6889751438239451959L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码（第三方库表名）") + private String objectCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QC_FILED_CODE") + @ApiParam("质检取值字段") + private String qcFiledCode; + + @Column(name = "QC_FILED_DESC") + @ApiParam("质检取值字段描述") + private String qcFiledDesc; + + @Column(name = "QC_FILED_TYPE") + @ApiParam("质检取值字段类型") + private String qcFiledType; + + @Column(name = "QC_FILED_VALUE") + @ApiParam("缺陷类型合格值") + private String qcFiledValue; + + +} 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 a4a2dca..c724e84 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DEFECT") @Api("缺陷表") public class MesDefect extends BaseBean implements Serializable { @@ -48,6 +51,10 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("项目代码") private String prodCfgTypeCode; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + @Column(name = "DEFECT_FLAG_VALUE") @ApiParam("缺陷标识值") private String defectFlagValue; @@ -61,8 +68,13 @@ public class MesDefect extends BaseBean implements Serializable { private String defectLocation; @Transient + @ApiParam("颜色值") + private String colorValue; + + @Transient @ApiParam("缺陷类型子集") private List mesDefectList; + public MesDefect() { } @@ -73,4 +85,10 @@ public class MesDefect extends BaseBean implements Serializable { this.defectType = defectType; this.defectTypeName = defectTypeName; } + + public MesDefect(String defectType, String defectCode, String defectName) { + this.defectType = defectType; + this.defectCode = defectCode; + this.defectName = defectName; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java index abc53be..360f5c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DEFECT_CAUSE") @Api("缺陷原因表") public class MesDefectCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java new file mode 100644 index 0000000..0fac108 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\13 09:59 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_DEFECT_LOCATION") +@Api("产品缺陷位置") +public class MesDefectLocation extends BaseBean implements Serializable { + + @Column(name = "PPT_CODE") + @ApiParam("产品类型代码") + private String pptCode; + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷位置名称") + private String defectName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index fbd81ad..c334517 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +27,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DEFECT_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "CREATE_DATE_TIME") @@ -82,7 +86,12 @@ public class MesDefectRecord extends BaseBean implements Serializable { @Column(name = "DEFECT_ACTION_TYPE") @ApiParam("不良处理类型") - private Integer defectActionType; + private String defectActionType; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; @Transient private List mesDefectList; @@ -91,7 +100,98 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("后移数量") private Integer backwardNum; + @Transient + @ApiParam("质量状态") + private Integer qcStatus; + + @Transient + @ApiParam("缺陷类型名称") + private String defectActionTypeName; + + @Transient + @ApiParam("缺陷数量") + private Integer defectQty; + + @ApiParam("维修状态名称") + private String repairStatusName; + + @Transient + @ApiParam("产品二维码") + private String productSn; + + @Transient + @ApiParam("措施代码") + private String repairCode; + + @Transient + @ApiParam("措施描述") + private String repairName; + + @Transient + @ApiParam("缺陷原因代码") + private String dcCode; + + @Transient + @ApiParam("缺陷原因描述") + private String dcName; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } + + public MesDefectRecord() { + + } + + public MesDefectRecord(String partNo, String partName, String workOrderNo, String defectActionType, + String defectCode, String defectName, Integer defectQty) { + this.partNo = partNo; + this.partName = partName; + this.workOrderNo = workOrderNo; + this.defectActionType = defectActionType; + this.defectCode = defectCode; + this.defectName = defectName; + this.defectQty = defectQty; + } + + public MesDefectRecord(String partNo, String workOrderNo, String partName, String workCenterCode, + String workCellCode, String serialNumber, String modifyUser, String modifyDatetime) { + this.partNo = partNo; + this.workOrderNo = workOrderNo; + this.partName = partName; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.serialNumber = serialNumber; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } + + public MesDefectRecord(Long id, String serialNumber, String workOrderNo, String partNo, String partName, String defectCode, + String defectName, String defectLocation, String sideLocation, Integer repairStatus, String workCenterCode, + String workCellCode, String memo, String defectActionType, Double qty, String repairCode, String repairName, + String dcCode, String dcName, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.serialNumber = serialNumber; + this.workOrderNo = workOrderNo; + this.partNo = partNo; + this.partName = partName; + this.defectCode = defectCode; + this.defectName = defectName; + this.defectLocation = defectLocation; + this.sideLocation = sideLocation; + this.repairStatus = repairStatus; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.memo = memo; + this.defectActionType = defectActionType; + this.qty = qty; + this.repairCode = repairCode; + this.repairName = repairName; + this.dcCode = dcCode; + this.dcName = dcName; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index 6a682d7..fa0eb9a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +27,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DISMANTLE_RECORD", indexes = { @Index(columnList = "SN"), @Index(columnList = "CREATE_DATE_TIME") @@ -60,7 +64,8 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @ApiParam("生产工单号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java index f21e756..25a7a94 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EDI_DATA") @Api("EDI数据") public class MesEdiData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java index 5e4db8a..8d7de06 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EDI_PARSER_CONFIG") @Api("EDI解析配置表") public class MesEdiParserConfig extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java index 67b5bdd..2444c2d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ENCODE_RULE_MAP") @Api("MES_编码规则映射表") public class MesEncodeRuleMap extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java new file mode 100644 index 0000000..c2c9575 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java @@ -0,0 +1,52 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_ENUM") +@Api("MES_枚举表") +public class MesEnum extends BaseBean implements Serializable { + + private static final long serialVersionUID = 368174781823424116L; + + @Column(name = "ENUM_CODE") + @ApiParam("枚举代码") + private String enumCode; + + @Column(name = "ENUM_NAME") + @ApiParam("枚举名称") + private String enumName; + + @Column(name = "ENUM_VALUE") + @ApiParam("枚举值") + private String enumValue; + + @Column(name = "ENUM_VALUE_DESC") + @ApiParam("枚举值描述") + private String enumValueDesc; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java new file mode 100644 index 0000000..24e841e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java @@ -0,0 +1,46 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/16 2:42 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_ALARM_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("设备自动报警日志") +public class MesEquAlarmLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -494552645021304934L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "MESSAGE") + @ApiParam("异常信息") + private String message; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java index d631542..69dd9c4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_FAULT_CAUSE") @Api("MES_设备故障原因") public class MesEquFaultCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java index 2d65481..8218d0f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_FAULT_METHOD") @Api("MES_设备故障处理措施") public class MesEquFaultMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java index 44fcf64..12ba1c4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_FAULT_PHENOMENON") @Api("MES_设备故障现象") public class MesEquFaultPhenomenon extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index 2bcd8d3..b394f65 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_EQU_NOTIFY_OBJECT_CFG") @Api("设备通知对象配置") public class MesEquNotifyObjectCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 8c1b09f..b08353f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK", indexes = { @Index(columnList = "TASK_NO") }, uniqueConstraints = { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index e164c36..69ee2b9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_DETAIL", indexes = { @Index(columnList = "EQUIPMENT_CODE") }, uniqueConstraints = { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java new file mode 100644 index 0000000..97c9310 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java @@ -0,0 +1,50 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:47 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_DETAIL_STANDARD") +@Api("设备作业任务要求") +public class MesEquTaskDetailStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8033976649492744091L; + + @Column(name = "TASK_DETAIL_ID") + @ApiParam("任务明细ID") + private Long taskDetailId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java index 53438d6..99331e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_EQU_TASK_NOTIFY_CFG") @Api("设备作业通知配置") public class MesEquTaskNotifyCfg extends BaseBean implements Serializable { @@ -40,7 +43,7 @@ public class MesEquTaskNotifyCfg extends BaseBean implements Serializable { private Integer notifyType; @Column(name="NOTIFY_CONDITION") - @ApiParam("通知条件（小时）") + @ApiParam("通知条件（分钟）") private Integer notifyCondition; @Column(name="NOTIFY_OBJECT_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 7e86112..b19137b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -9,11 +9,9 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; +import java.util.List; /** * @Description :设备周期作业计划 @@ -27,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_PLAN") @Api("设备周期作业计划") public class MesEquTaskPlan extends BaseBean implements Serializable { @@ -43,9 +42,9 @@ public class MesEquTaskPlan extends BaseBean implements Serializable { @ApiParam("作业类型") private Integer taskType; - @Column(name = "TASK_CYCLE") - @ApiParam("周期(天)") - private Integer taskCycle; + @Column(name = "PLAN_CFG_CODE") + @ApiParam("计划配置代码") + private String planCfgCode; @Column(name = "LAST_TIME") @ApiParam("上一执行时间") @@ -75,4 +74,8 @@ public class MesEquTaskPlan extends BaseBean implements Serializable { @ApiParam("作业任务编号") private String taskNo; + @Transient + @ApiParam("设备作业要求") + private List equTaskStandards; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java new file mode 100644 index 0000000..9d0dd79 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :设备计划配置 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2020-10-15 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_PLAN_CFG") +@Api("设备周期作业计划配置") +public class MesEquTaskPlanCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 7734079474434307857L; + + @Column(name = "PLAN_CFG_CODE") + @ApiParam("计划配置代码") + private String planCfgCode; + + @Column(name = "BACKGROUND_COLOR") + @ApiParam("显示背景色") + private String backgroundColor; + + @Column(name = "COLOR") + @ApiParam("字体颜色") + private String color; + + @Column(name = "CYCLE") + @ApiParam("周期(天)") + private Integer taskCycle; + + @Column(name = "DISPLAY_TEXT") + @ApiParam("显示文字") + private String displayText; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java new file mode 100644 index 0000000..71b4157 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java @@ -0,0 +1,50 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: 设备周期计划作业要求 + * @Author: jokelin + * @Date: 2021/1/25 10:43 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_PLAN_STANDARD") +@Api("设备周期计划作业要求") +public class MesEquTaskPlanStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8284644034068953809L; + + @Column(name = "PLAN_ID") + @ApiParam("计划ID") + private Long planId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java index 8d4a7b8..157e1e7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_REPAIR_RECORD", indexes = { @Index(columnList = "EQUIPMENT_CODE") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java index 7e79763..7e228d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_STANDARD") @Api("设备作业要求") public class MesEquTaskStandard extends BaseBean implements Serializable { @@ -55,6 +58,14 @@ public class MesEquTaskStandard extends BaseBean implements Serializable { @ApiParam("操作指导") private String actionGuide; + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("操作指导文件路径") + private String actionGuideUrl; + + @Column(name = "FILE_ID") + @ApiParam("操作指导文件id") + private Long fileId; + @Transient @ApiParam(value = "生产线") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index e506922..bb98aa8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_STANDARD_RECORD", indexes = { @Index(columnList = "EQUIPMENT_CODE") }) @@ -59,6 +62,10 @@ public class MesEquTaskStandardRecord extends BaseBean implements Serializable { @ApiParam("操作指导") private String actionGuide; + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("操作指导") + private String actionGuideUrl; + @Column(name = "CHECK_VALUE") @ApiParam("检测值") private String checkValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index b33ac9b..b055268 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQUIPMENT") @Api("生产设备") public class MesEquipment extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java index 38d4717..7337cac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQUIPMENT_TOOLING") @Api("MES_设备工装关系") public class MesEquipmentTooling extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java similarity index 72% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java index df432f3..92059ce 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -18,7 +20,7 @@ import javax.persistence.Transient; import java.io.Serializable; /** - * @Description :生产设备 + * @Description :设备运行履历表 * @Reference : * @Author : jack.jia * @CreateDate : 2019-04-02 @@ -29,10 +31,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQUIPMENT") -@Api("生产设备") -public class MesEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 7269069290035250108L; +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQUIPMENT_TRAVEL") +@Api("设备运行履历表") +public class MesEquipmentTravel extends BaseBean implements Serializable { + + private static final long serialVersionUID = -419342647505833190L; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; @@ -81,17 +86,16 @@ public class MesEquipment extends BaseBean implements Serializable { @ApiParam("连接类型") private Integer connectType; - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; + @Column(name = "CHECK_MODEL") + @ApiParam("作业校验模式") + private Integer checkModel; + + @Column(name = "STATUS_START_TIME") + @ApiParam("状态开始时间") + private String statusStartTime; - @Transient - @ApiParam(value = "名称") - private String name; + @Column(name = "STATUS_END_TIME") + @ApiParam("状态结束时间") + private String statusEndTime; - // 默认值 -1 - @Transient - @ApiParam(value = "父节点", access = "父节点", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java index c20de53..5d1a172 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") public class MesEsop extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java index ae69773..21636fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EVENT") @Api("系统业务事件") public class MesEvent extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java index 6e6c529..7fe4c36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java @@ -6,6 +6,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import java.io.Serializable; @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EVENT_ACTION") @Api("系统业务事件动作") public class MesEventAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java new file mode 100644 index 0000000..2204302 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java @@ -0,0 +1,52 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EXCEPTION_ALERT_CFG") +@Api("MES_异常提醒配置") +public class MesExceptionAlertCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895221L; + + @Column(name = "SRC_MENU_CODE") + @ApiParam("来源模块代码") + private String srcMenuCode; + + @Column(name = "SRC_MENU_NAME") + @ApiParam("来源模块名称") + private String srcMenuName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "USER_CODE_GROUP") + @ApiParam("提醒人员集合") + private String userCodeGroup; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java new file mode 100644 index 0000000..fae28e5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EXCEPTION_WINDOW_RECORD") +@Api("MES_弹窗异常提醒记录") +public class MesExceptionWindowRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895345L; + + @Column(name = "SRC_MENU_CODE") + @ApiParam("来源模块代码") + private String srcMenuCode; + + @Column(name = "USER_CODE") + @ApiParam("提醒人员") + private String userCode; + + @Column(name = "MESSAGE_TYPE") + @ApiParam("消息类型") + private Integer messageType; + + @Column(name = "MESSAGE_HEAD") + @ApiParam("提示表头") + private String messageHead; + + @Column(name = "MESSAGE_CONTENT") + @ApiParam("提示内容") + private String messageContent; + + @Column(name = "STATUS") + @ApiParam("处理状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java index 33b0024..59571ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EXTEND_OBJECT_CFG") @Api("扩展对象结构") public class MesExtendObjectCfg extends BaseBean implements Serializable { @@ -61,4 +64,8 @@ public class MesExtendObjectCfg extends BaseBean implements Serializable { @Column(name = "FIELD_DESC") @ApiParam("扩展字段描述") private String fieldDesc; + + @Column(name = "ORIGINAL_FIELD_CODE") + @ApiParam("原始字段代码") + private String originalFieldCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java index a78fc9f..e9cb5cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FAULT_CAUSE") @Api("mes故障原因表") public class MesFaultCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java index 4a0e758..3281e50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FAULT_METHOD") @Api("MES_故障处理措施") public class MesFaultMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index d66b12b..fee295d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FAULT_PHENOMENON") @Api("mes故障现象表") public class MesFaultPhenomenon extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index 3bbe40e..9ef660c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FI_CFG") @Api("首检件配置") public class MesFiCfg extends BaseBean implements Serializable { @@ -41,7 +45,8 @@ public class MesFiCfg extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java index e5e7b26..586a8cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FILE") @Api("文件表") public class MesFile extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java new file mode 100644 index 0000000..40df439 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -0,0 +1,56 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_FURNACE_LOCATION") +@Api("MES_炉内模式位置信息") +public class MesFurnaceLocation extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404126L; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "orientation") + @ApiParam("方向") + private String orientation; + + @Column(name = "SEQ") + @ApiParam("推荐顺序") + private Integer seq; + + @Transient + @ApiParam("容器编号") + private String ctNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java new file mode 100644 index 0000000..c8f37b2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java @@ -0,0 +1,55 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_FURNACE_LOCATION_DETAIL") +@Api("MES_炉内占位信息") +public class MesFurnaceLocationDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818212133126L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java new file mode 100644 index 0000000..342a0de --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_GENERATE_QC_ORDER") +@Api("待生成检验单") +public class MesGenerateQcOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 14873669015484197L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "IS_GENERATED") + @ApiParam("是否生成了末检单") + private Integer isGenerated = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "GENERATE_TIME") + @ApiParam("生成时间") + private String generateTime; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java index 83e625f..6e0b5ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_GUN_CALIBRATION_RECORD") @Api("校枪记录表") public class MesGunCalibrationRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java new file mode 100644 index 0000000..0f83b65 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/8/3 17:51 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_HNC_AGV_RUNNING") +@Api("延锋海纳川agv运行状态表") +public class MesHncAgvRunning extends BaseBean implements Serializable { + private static final long serialVersionUID = 4293079676019967513L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TIME_OUT") + @ApiParam("倒计时超时") + private Integer timeOut; + + @Column(name = "DELAY_HELP") + @ApiParam("延时帮助") + private Integer delayHelp; + + @Column(name = "EMERGENCY_STOP") + @ApiParam("紧急停止") + private Integer emergencyStop; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java new file mode 100644 index 0000000..e1b40ba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 2:55 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_HOLIDAY_VACTION") +@Api("节假日") +public class MesHolidayVacation extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1620451254243818560L; + @Column(name = "YEAR") + @ApiParam("年") + private String year; + + @Column(name = "MONTH") + @ApiParam("月") + private String month; + + @Column(name = "DAY") + @ApiParam("日") + private String day; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java index 7ef9e84..d3c4a6f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_IF") @Api("接口清单") public class MesIf extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java index 25b58db..2cee1b9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_JIT_ISSUE_CFG") @Api("MES_客户JIT队列下达配置") public class MesJitIssueCfg extends BaseBean implements Serializable { @@ -47,6 +50,10 @@ public class MesJitIssueCfg extends BaseBean implements Serializable { @ApiParam("缓存类型") private Integer cfgType; + @Column(name = "SEQ") + @ApiParam("排序号") + private Integer seq; + @Transient @ApiParam("当前JIT缓存数") private Integer currentJitCacheNum; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java index 5f98f5e..80bf60d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java @@ -4,13 +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.*; + 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; /** @@ -24,7 +24,12 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_JIT_LOCK_CACHE") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_JIT_LOCK_CACHE", indexes = { + @Index(columnList = "JIT_ACTUAL_NO"), + @Index(columnList = "WO_TYPE"), + @Index(columnList = "STATUS") +}) @Api("MES_JIT队列锁定池") public class MesJitLockCache extends BaseBean implements Serializable { @@ -49,4 +54,8 @@ public class MesJitLockCache extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("状态") private Integer status; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java index d764ed1..834816f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java @@ -4,13 +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.*; + 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; /** @@ -24,7 +24,12 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_JIT_ORDER_CACHE") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_JIT_ORDER_CACHE", indexes = { + @Index(columnList = "JIT_ACTUAL_NO"), + @Index(columnList = "WO_TYPE"), + @Index(columnList = "STATUS") +}) @Api("MES_JIT队列订单池") public class MesJitOrderCache extends BaseBean implements Serializable { private static final long serialVersionUID = -613326904053045367L; @@ -52,4 +57,8 @@ public class MesJitOrderCache extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("序号") private Integer seq; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java index e036e8a..b76e424 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_KEY_ACTION") @Api("关键动作") public class MesKeyAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index b17f81d..bca4d77 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_KEY_DATA") @Api("设备关键数据") public class MesKeyData extends BaseBean implements Serializable { @@ -37,11 +41,13 @@ public class MesKeyData extends BaseBean implements Serializable { @ApiParam("关键数据名称") private String keyDataName; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index 752cdd2..b47da7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_KP_DATA") @Api("物料关键数据关系") public class MesKpData extends BaseBean implements Serializable { @@ -47,11 +51,13 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("关键数据数量") private Integer keyDataCount; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; @@ -101,12 +107,32 @@ public class MesKpData extends BaseBean implements Serializable { @Transient @ApiParam("实采个数") - private Integer actualNum; + private Integer actualNum = 0; @Transient @ApiParam("记录颜色") private String color; + @Transient + @ApiParam("特殊码") + private String specificSn; + + @Transient + @ApiParam("过程条码") + private String serialNumber; + + @Transient + @ApiParam("采集结果") + private Integer result; + + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("数据范围") + private String torqueValRange; + public double getKeyDataCountVal() { return this.keyDataCount == null ? 0 : this.keyDataCount; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java new file mode 100644 index 0000000..4188057 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java @@ -0,0 +1,123 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :物料关键数据关系记录 + * @Reference : + * @Author : crish + * @CreateDate : 2019-05-15 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_KP_DATA_RECORD") +@Api("物料关键数据关系记录") +public class MesKpDataRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 8243089140216459544L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name = "KEY_DATA_NAME") + @ApiParam("关键数据名称") + private String keyDataName; + + @Column(name = "KEY_DATA_COUNT") + @ApiParam("关键数据数量") + private Integer keyDataCount; + + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数据上限") + private Double upperLimit; + + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数据下限") + private Double lowerLimit; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TORQUE_GROUP") + @ApiParam("扭矩组") + private String torqueGroup; + + @Column(name = "TORQUE_GROUP_SEQ") + @ApiParam("扭矩组顺序") + private Integer torqueGroupSeq; + + @Column(name = "TORQUE") + @ApiParam("扭矩项") + private String torque; + + @Column(name = "TORQUE_SEQ") + @ApiParam("扭矩项顺序") + private Integer torqueSeq; + + @Column(name = "JOB_ID") + @ApiParam("JOB_ID") + private Integer jobId; + + @Column(name = "LAST_TIGHTENING_ID") + @ApiParam("最后一次扭矩id") + private Long lastTighteningId; + + @Column(name = "TORQUE_VALUE") + @ApiParam("扭矩值") + private Double torqueValue; + + @Column(name = "RESULT") + @ApiParam("采集结果") + private Integer result; + + @Column(name = "ACTUAL_NUM") + @ApiParam("实采个数") + private Integer actualNum; + + @Column(name = "SPECIFIC_SN") + @ApiParam("特殊码") + private String specificSn; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + + public double getKeyDataCountVal() { + return this.keyDataCount == null ? 0 : this.keyDataCount; + } + + public double getUpperLimitVal() { + return this.upperLimit == null ? 0.0d : this.upperLimit; + } + + public double getLowerLimitVal() { + return this.lowerLimit == null ? 0.0d : this.lowerLimit; + } +} 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 e0c9fca..4236f7c 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_KPSN_RULE") @Api("关键件条码校验规则") public class MesKpsnRule extends BaseBean implements Serializable { 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 793f30f..bc9f9f9 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 @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean implements Serializable { @@ -46,6 +49,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable { @ApiParam("方法代码") private String methodCode; + @Column(name = "BATCH_METHOD_CODE") + @ApiParam("批量方法代码") + private String batchMethodCode; + @ApiParam(value = "第二个模板内容") private String otherTemplateContent; 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 36fb0a3..94828e2 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 @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_LABEL_TEMPLATE_PARAM") @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/MesLineFaultRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java new file mode 100644 index 0000000..b914dd8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java @@ -0,0 +1,46 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/10/27 13:29 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_LINE_FAULT_RECORD") +@Api("产线故障记录表") +public class MesLineFaultRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6108659377329720059L; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "FAULT_TIME") + @ApiParam("故障时长（分）") + private Long faultTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java new file mode 100644 index 0000000..274931c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java @@ -0,0 +1,70 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/29 17:25 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_LINE_OPERATION") +@Api(value = "产线 开线或停线") +public class MesLineOperation extends BaseBean implements Serializable { + private static final long serialVersionUID = -710375930652577157L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private Integer objectType; + + /** + * MesDataSource dsCode 或者plcCode + */ + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OP_TYPE") + @ApiParam("操作类型 开线、停线") + private Integer opType; + + /** + * 仅db jdbc 进行行更新 example:update a set b=:b + */ + @Column(name = "DB_OP_CMD") + @ApiParam("db操作指令") + private String dbOpCmd; + + /** + * 反写plc的值 + */ + @Column(name = "PLC_OP_VALUE") + @ApiParam("plc更新值") + private String plcOpValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java new file mode 100644 index 0000000..109e4d1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java @@ -0,0 +1,74 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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; + +/** + * @Description :MES_库位信息 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_LOCATION") +@Api("MES_库位信息") +public class MesLocation extends BaseBean implements Serializable { + private static final long serialVersionUID = -896118285166769048L; + @Column(name = "LOCATION_CODE") + @ApiParam("库位代码") + private String locationCode; + + @Column(name = "LOCATION_NAME") + @ApiParam("库位名称") + private String locationName; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "MAX_QTY") + @ApiParam("最大存储量") + private Integer maxQty = 0; + + @Column(name = "IS_SMALL_SIZE") + @ApiParam("是否小尺寸物料") + private Integer isSmallSize = 1; + + @Transient + @ApiParam("物料名称") + private String partNameRdd; + + @Transient + @ApiParam("包装编号集合") + private String packageNoList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java new file mode 100644 index 0000000..58216c2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java @@ -0,0 +1,37 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "MES_LOG") +@Api("MES_日志表") +public class MesLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 4089347882308864216L; + + @Column(name = "METHOD_NAME") + @ApiParam(value = "方法名") + private String methodName; + + @Column(name = "LOG") + @ApiParam(value = "日志") + private String log; + + @Column(name = "RESULT") + @ApiParam(value = "更新结果") + private String result; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java index 6a2d772..687770a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,9 +29,10 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_LOOP_QC_GENERATE_DETAIL") @Api("MES_巡检项生成明细") -public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { +public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -5412635747424111476L; @Column(name = "RELATION_ORDER_NO") @@ -44,9 +47,17 @@ public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { @ApiParam("检测项") private String checkItem; - @Column(name = "LASR_TIME") + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + @Column(name = "LAST_TIME") @ApiParam("末次时间") - private String lasrTime; + private String lastTime; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; @ApiParam(value = "物料号") @Transient 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 4b08276..f931891 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_METHOD") @Api("系统业务方法") public class MesMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java index 224a78c..a2e0a22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_MODEL_GRADE") @Api("MES_车型等级") public class MesModelGrade extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java index 13b98ce..9b1b305 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_MONITOR_TASK") @Api("监听任务") public class MesMonitorTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index 36ff11f..fb88903 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_MONITOR_TASK_DETAIL") @Api("监听任务明细") public class MesMonitorTaskDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java index 34186bd..5de215b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_MOULD_PART") @Api("MES_模具_零件对照表") public class MesMouldPart extends BaseBean implements Serializable { @@ -38,4 +42,13 @@ public class MesMouldPart extends BaseBean implements Serializable { @Column(name = "MOULD_CODE") @ApiParam("模具代码") private String mouldCode; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "MOULD_TYPE") + @ApiParam("模具类型") + private String mouldType; } 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 9ff7458..95710bd 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_NUMBER_RULE") @Api("条码生成规则") public class MesNumberRule extends BaseBean implements Serializable { @@ -51,9 +54,38 @@ public class MesNumberRule extends BaseBean implements Serializable { @Column(name = "SERIALNO_INCREMENT") @ApiParam("增量") - private Integer serialnoIncrement; + private Integer serialnoIncrement = 1; + + @Column(name = "BEGIN_VAL") + @ApiParam("起始值") + private Integer beginVal = 1; + + @Column(name = "END_VAL") + @ApiParam("最大值") + private Integer endVal; @Column(name = "IS_CYCLE") @ApiParam("最大值后循环") private Integer isCycle; + + @Column(name = "IMPL_CLASS") + @ApiParam("最大值后不循环的实现类") + private String implClass; + + @Column(name = "SPILT_RULE") + @ApiParam("拼接固定字符,多个逗号分隔") + private String spiltRule; + + public Integer getBeginVal() { + return this.beginVal == null ? 1 : this.beginVal; + } + + public Integer getSerialnoIncrement() { + return this.serialnoIncrement == null ? 1 : this.serialnoIncrement; + } + + public Integer getSerialnoLength() { + return this.serialnoLength == null ? 1 : this.serialnoLength; + } + } 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 d717036..c40c38a 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_NUMBER_SERIALNO") @Api("编码序号") public class MesNumberSerialno extends BaseBean implements Serializable { 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 a63724c..92cfc51 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OBJECT_CFG") @Api("对象结构") public class MesObjectCfg extends BaseBean implements Serializable { 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 10e85f2..dbdd627 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OBJECT_DAO") @Api("MES_对象与dao对应关系") public class MesObjectDao extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 0fedc5b..9c1869e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OEE") @Api("MES_OEE数据") public class MesOee extends BaseBean implements Serializable { @@ -68,11 +72,13 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总生产时间") private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总停机时间") private Double totalStopTime; @@ -92,22 +98,36 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("时间开动率") private Double timeRate; - @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("性能开动率") private Double taktRate; - @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("良品率") private Double qualifiedRate; - @Column(name = "OEE", columnDefinition = "decimal(18,4)") + @Column(name = "OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE") private Double oee; + @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("OEE目标值") + private Double targetOee; + + @Column(name = "MIN_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("OEE警戒值") + private Double minOee; + @Column(name = "BUSI_DATA") @ApiParam("自定义数据") private String busiData; @@ -127,4 +147,8 @@ public class MesOee extends BaseBean implements Serializable { @Transient @ApiParam("手工录入集合") private List attributes; + + @Transient + @ApiParam("自定义数据-非手工录入") + private String busiDataNoManual; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java index bc7b401..ceaa2fc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OFF_LINE_RECORD") @Api("MES_产品下线记录") public class MesOffLineRecord extends BaseBean implements Serializable { @@ -55,7 +59,8 @@ public class MesOffLineRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java index 99cc4bb..9b52ea8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OPERATE_OBJECT") @Api("MES_运算对象") public class MesOperateObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java index 9a340e4..ee21d82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE") @Api("MES_运算对象属性") public class MesOperateObjectAttribute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java index a70cac7..4766422 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OPERATE_OBJECT_CFG") @Api("MES_运算对象属性配置") public class MesOperateObjectCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java index d752e8c..e2ceb0b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") @Deprecated diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index dac14a4..c59072c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PACK_SPEC") @Api("包装规格") public class MesPackSpec extends BaseBean implements Serializable { @@ -40,22 +43,22 @@ public class MesPackSpec extends BaseBean implements Serializable { @ApiParam("包装规格名称") private String specName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量", example = "0") private Double qty = 0d; - @Column(name = "QTY2") + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量2", example = "0") private Double qty2; - @Column(name = "QTY3") + @Column(name = "QTY3", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量3", example = "0") private Double qty3; - @Column(name = "QTY4") + @Column(name = "QTY4", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量4", example = "0") private Double qty4; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index a46c53d..d0ed327 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -5,12 +5,17 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @Author: Wynne.Lu @@ -22,7 +27,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PACKAGE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "WORK_ORDER_NO"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "IS_SEALED") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) }) @@ -42,11 +55,13 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "PACK_SPEC_QTY") + @Column(name = "PACK_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("包装规格数量") private Double packSpecQty; @@ -76,7 +91,7 @@ public class MesPackage extends BaseBean implements Serializable { @Column(name = "PACK_LEVEL") @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") - private Integer packLevel; + private Integer packLevel = 1; @Column(name = "WORK_ORDER_NO") @ApiParam("生产工单号") @@ -86,6 +101,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + @Column(name = "MEMO") @ApiParam("备注") private String memo; @@ -94,6 +113,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; + @Column(name = "IN_LOCATION_TIME") + @ApiParam("入库时间") + private String inLocationTime; + @Transient @ApiParam("封箱状态") private String sealStatus; @@ -128,9 +151,81 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("包装二维码") private String qrCode; + @Column(name = "LOCATION_CODE") + @ApiParam("库位代码") + private String locationCode; + + @Column(name = "ERP_WORK_CENTER_CODE") + @ApiParam("erp工作中心") + private String erpWorkCenterCode; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Transient + @ApiParam("目标库位代码") + private String destLocationCode; + + @Transient + @ApiParam("不良处理类型") + private String defectActionType; + + @Transient + @ApiParam("明细总数") + private Integer detailTotal = 0; + + @Transient + @ApiParam("托包规数量") + private Double qty2; + + @Transient + @ApiParam("过程条码") + private String serialNumber; + + @Transient + @ApiParam("班组") + private String shiftGroup; + + @Transient + @ApiParam("客户名称") + private String custName; + + @Transient + @ApiParam("汇总数量") + private Integer gatherQty = 0; + + @Transient + @ApiParam("包装编号集合") + private List packageNoList = new ArrayList<>(); + + @Transient + @ApiParam(value = "生产线名称") + private String workCenterName; + + @Transient + @ApiParam("工序名称") + private String processName; + + @Transient + @ApiParam("产品条码") + private String productSn; + public MesPackage() { } + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getQty2Val() { + return this.qty2 == null ? 0.0d : this.qty2; + } + + public double getPackSpecQtyVal() { + return this.packSpecQty == null ? 0.0d : this.packSpecQty; + } + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { this.packageNo = packageNo; this.partNo = partNo; @@ -138,4 +233,63 @@ public class MesPackage extends BaseBean implements Serializable { this.qty = qty; this.packSpecQty = packSpecQty; } + + public MesPackage(String partNo, String partNameRdd,String packageNo, Double qty, String defectActionType, String createDatetime) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.packageNo = packageNo; + this.qty = qty; + this.defectActionType = defectActionType; + this.createDatetime = createDatetime; + } + + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo) { + this.packageNo = packageNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.packSpecQty = packSpecQty; + this.isSealed = isSealed; + this.ctNo = ctNo; + } + + public MesPackage(String partNo, String partNameRdd, String workCenterCode, String workOrderNo, + String packageNo, String lotNo, String custCode, String shiftGroup) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.workOrderNo = workOrderNo; + this.packageNo = packageNo; + this.lotNo = lotNo; + this.custCode = custCode; + this.shiftGroup = shiftGroup; + } + + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty,Double packSpecQty, String unit,String lotNo, String fixLotNo,String packSpec,Integer isSealed, Integer printStatus,Integer packLevel,String workOrderNo, String workCenterCode, String workCellCode,String memo, String custCode, String inLocationTime, String ctNo,String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo) { + this.packageNo = packageNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.packSpecQty=packSpecQty; + this.unit = unit; + this.lotNo=lotNo; + this.fixLotNo = fixLotNo; + this.packSpec=packSpec; + this.isSealed=isSealed; + this.printStatus = printStatus; + this.packLevel=packLevel; + this.workOrderNo=workOrderNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.memo=memo; + this.custCode = custCode; + this.inLocationTime = inLocationTime; + this.ctNo = ctNo; + this.sampleType=sampleType; + this.packageLabelTemplate = packageLabelTemplate; + this.qrCode = qrCode; + this.locationCode = locationCode; + this.erpWorkCenterCode = erpWorkCenterCode; + this.fnLocationNo = fnLocationNo; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 6da48a8..a9c9324 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -22,9 +24,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PACKAGE_DETAIL", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PART_NO"), + @Index(columnList = "PACKAGE_NO2"), + @Index(columnList = "ORGANIZE_CODE,PACKAGE_NO,SERIAL_NUMBER"), + @Index(columnList = "PACKAGE_NO,SERIAL_NUMBER") }) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { @@ -34,6 +41,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; @@ -58,5 +69,14 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码4") private String packageNo4; + @Transient + @ApiParam("批次") + private String lotNo; + + @Transient + @ApiParam("产品条码") + private String productSn; + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java new file mode 100644 index 0000000..d3dab83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java @@ -0,0 +1,76 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/10 5:39 PM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_QUEUE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "CT_NO") +}) +@Api("MES_包装队列") +public class MesPackageQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7427832962272134299L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameAdd; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ApiParam("数量") + private Double qty; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java new file mode 100644 index 0000000..56b8b00 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java @@ -0,0 +1,78 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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; + +/** + * @Description :MES_出入库事务信息 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PACKAGE_TRANS") +@Api("MES_出入库事务") +public class MesPackageTrans extends BaseBean implements Serializable { + private static final long serialVersionUID = -89611828516676432L; + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "LOCATION_CODE") + @ApiParam("库位代码") + private String locationCode; + + @Column(name = "TRANS_TYPE") + @ApiParam("事务类型") + private Integer transType = 10; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status = 10; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 1b9e494..b463dcc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -5,14 +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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,6 +24,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean implements Serializable { @@ -34,6 +34,10 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; @@ -54,5 +58,23 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码4") private String packageNo4; + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + @Column(name = "QR_CODE") + @ApiParam("包装二维码") + private String qrCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 817a07c..b3c48f6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART") @Api("物料信息") public class MesPart extends BaseBean implements Serializable { @@ -48,9 +52,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("零件规格") private String partSpec; - @Column(name = "PART_SPEC_QTY") + @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("标准包规数量") - private Double partSpecQty; + private Double partSpecQty = 0d; @Column(name = "CATEGORY_CODE1") @ApiParam("分类1") @@ -76,21 +81,21 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("默认工作中心") private String defaultWorkCenter; - @Column(name = "PRODUCE_CTGY_CODE") + @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "varchar(225) default ''") @ApiParam("产品类型代码") private String produceCategoryCode; @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private Integer processMatchType; + private Integer processMatchType = 0; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") - private Integer packageMatchType; + private Integer packageMatchType = 0; @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") - private Integer productMatchType; + private Integer productMatchType = 0; @Column(name = "PPT_CODE") @ApiParam("产品类型代码") @@ -98,19 +103,23 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PART_TRAIT") @ApiParam("物料特性") - private Integer partTrait; + private Integer partTrait = 0; @Column(name = "COLOR_CODE") @ApiParam("颜色代码") private String colorCode; + @Column(name = "COLOR_NAME") + @ApiParam("颜色名称") + private String colorName; + @Column(name = "SHELVES_AMOUNT") @ApiParam("挂架数") - private Integer shelvesAmount; + private Integer shelvesAmount = 0; @Column(name = "QUANTITY_PER_RACK") @ApiParam("挂架可放零件数") - private Integer quantityPerRack; + private Integer quantityPerRack = 0; @Column(name = "PAINT_TANK_CODE") @ApiParam("供漆罐代码") @@ -120,6 +129,35 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("打磨件物料号") private String prePartNo; + @Column(name = "IS_SMALL_SIZE") + @ApiParam("是否小尺寸物料") + private Integer isSmallSize = 1; + + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "包装数量") + private Double qty2; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "VERSION_NO") + @ApiParam("版本号") + private String versionNo; + + @Column(name = "VARIANT") + @ApiParam("variant") + private String variant; + + @Column(name = "PACK_MOTH") + @ApiParam("packmoth") + private String packMoth; + + @Column(name = "SERIAL_NO") + @ApiParam("零件流水号") + private String serialNo; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; @@ -139,4 +177,20 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("分类名称") private String categoryName; + + @Transient + @ApiParam("拉动数量") + private Double pullQty; + + @Transient + @ApiParam("BOM用量") + private Double bomQty = 0d; + + @Transient + @ApiParam("客户零件号") + private String custPartNo; + + @Transient + @ApiParam("是否绑定关键件") + private Integer isBindKey; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java similarity index 52% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java index 94f495f..83be007 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -14,32 +14,27 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/16 0016 - 15:50 + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: */ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART_FORMULA") -@Api("MES_物料配方") -public class MesPartFormula extends BaseBean implements Serializable { +@Table(name = "MES_PART_ANALYSIS_RULE") +@Api("MES_物料解析规则配置") +public class MesPartAnalysisRule extends BaseBean implements Serializable { - private static final long serialVersionUID = 3120650997069271308L; + private static final long serialVersionUID = 7877300316848838443L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name = "FORMULA_CONTENT") - @ApiParam("配方内容") - private String formulaContent; - - @Column(name = "FORMULA_TYPE") - @ApiParam("配方类型") - private Integer formulaType; - + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java new file mode 100644 index 0000000..ca4c442 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java @@ -0,0 +1,52 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: 特殊物料 + * @Author: jokelin + * @Date: 2021/3/24 3:10 PM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PART_CAR_MODEL") +@Api("车型零件关系表") +public class MesPartCarModel extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4039513102671811231L; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("零件名称") + private String partNameRdd; + + @Column(name = "VEHICLE_CODE") + @ApiParam("车型代码") + private String vehicleCode; + + @Column(name = "VEHICLE_NAME") + @ApiParam("车型名称") + private String vehicleName; + + @Column(name = "SERIAL_NO") + @ApiParam("车型流水号") + private String serialNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java index 9553053..3073723 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_CATEGORY") @Api("零件种类") public class MesPartCategory extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 8cbe1c3..0c41f5c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_CHECK") @Api("物料校验项") public class MesPartCheck extends BaseBean implements Serializable { @@ -53,8 +56,16 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("记录数量表达式") private String recordNumSpelExpress; + @Column(name = "DATA_TYPE") + @ApiParam("数据查询类型") + private Integer dataType = 1; + + @Column(name = "LIMIT_SPEL_EXPRESS") + @ApiParam("限定检测表达式") + private String limitSpelExpress; + @Column(name = "RECORD_NUM_DESC") - @ApiParam("校验表达式描述") + @ApiParam("合格标准描述") private String recordNumDesc; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java index 578b4c6..fbf7029 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_COLOR") @Api("MES_产品颜色") public class MesPartColor extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java new file mode 100644 index 0000000..01036e5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java @@ -0,0 +1,55 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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 : MES_产品容器容量配置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PART_CONTAINER_CAPACITY") +@Api("MES_产品容器容量配置") +public class MesPartContainerCapacity extends BaseBean { + + private static final long serialVersionUID = 6438819635320965628L; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "CT_QTY") + @ApiParam(value = "容量") + private Integer ctQty; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus = 10; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java index 87bcffe..3c782f6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_FORMULA") @Api("MES_物料配方") public class MesPartFormula extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java new file mode 100644 index 0000000..873c9da --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java @@ -0,0 +1,47 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: + * @Author: Jessica + * @Date: 2020/11/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PART_FURNACE") +@Api("MES_物料上炉模式") +public class MesPartFurnace extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404111L; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "orientation") + @ApiParam("方向") + private String orientation; + + @Column(name = "MODEL_IMG_URL") + @ApiParam("模式图片路径") + private String modelImgUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index a399ef3..efb8dc6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_OBJECT") @Api("物料对象配置表") public class MesPartObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java index c5c1b75..4ebc140 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -19,6 +21,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "MES_PART_PROD_CFG_TYPE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("MES_物料项目关系") public class MesPartProdCfgType extends BaseBean implements Serializable { private static final long serialVersionUID = -640972198237355570L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java index e680c19..7ebc256 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_PRODUCE_TYPE") @Api("产品生产类型") public class MesPartProduceType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java index 4b756ee..54d95cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_SAMPLE") @Api("产品样本配置") public class MesPartSample extends BaseBean implements Serializable { @@ -37,7 +41,8 @@ public class MesPartSample extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index ac42795..c356655 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_SCHEDULE_BOM") @Api("生产排程清单") public class MesPartScheduleBom extends BaseBean implements Serializable { @@ -37,7 +41,8 @@ public class MesPartScheduleBom extends BaseBean implements Serializable { @ApiParam("关联物料号") private String itemPartNo; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSpecific.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSpecific.java new file mode 100644 index 0000000..cc61e36 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSpecific.java @@ -0,0 +1,60 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: 特殊物料 + * @Author: jokelin + * @Date: 2021/3/24 3:10 PM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PART_SPECIFIC") +@Api("特殊物料关系信息") +public class MesPartSpecific extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4039513102671816031L; + + @Column(name = "PART_NO") + @ApiParam("父零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("父零件名称") + private String partName; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子零件") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子零件名称") + private String itemPartName; + + @Column(name = "TORQUE_SN") + @ApiParam("特殊码") + private String specificSn; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 2d24638..8c9277e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -3,14 +3,19 @@ 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.AllArgsConstructor; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; 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; /** @@ -23,7 +28,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_STOCK_SCHEDULE") @Api("MES_库存排程配置") public class MesPartStockSchedule extends BaseBean implements Serializable { @@ -36,7 +44,11 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @Column(name = "MIN_CAPACITY") @ApiParam("最小库存") - private Integer minCapacity; + private Integer minCapacity = 0; + + @Column(name = "MAX_CAPACITY") + @ApiParam("最大库存") + private Integer maxCapacity = 0; @Column(name = "TOTAL_CAPACITY") @ApiParam("总容量") @@ -57,4 +69,40 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @Column(name = "TOTAL_PLAN_QTY") @ApiParam("JSP总数") private Integer totalPlanQty; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "IS_SMALL_SIZE") + @ApiParam("是否小尺寸物料") + private Integer isSmallSize = 1; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STOCK_QTY") + @ApiParam("排程实时库存") + private Integer stockQty; + + @Column(name = "MIN_GEN_LOT") + @ApiParam("最小下达批次") + private Integer minGenLot; + + @Transient + @ApiParam("已下达箱数") + private Integer alreadyLandedNum; + + @Transient + @ApiParam("当前库存") + private Integer currentStock; + + @Transient + @ApiParam("物料名称") + private String partName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java index c738fc7..3aac5d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PLAN_TAKT") @Api("MES_生产节拍") public class MesPartTakt extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index 627f7c1..0f38fc6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") public class MesPatternJis extends BaseBean implements Serializable { 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 445fe79..cd4b446 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN") @Api("PCN节点") public class MesPcn extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java index 2385ff4..08db563 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class MesPcnConnectLog extends BaseBean implements Serializable { 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 cc636ce..f9b7fa0 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") public class MesPcnSyncCfg extends BaseBean implements Serializable { @@ -80,6 +83,10 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable { @ApiParam(value = "同步的时候是否区分工厂") private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @Column(name = "IGNORE_FIELDS") + @ApiParam(value = "同步的时候部分字段不同步") + private String ignoreFields; + @Transient @ApiParam("同步方式") private String syncPatternName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java index 2b79271..28f3db7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_SYNC_ERRORLOG") @Api("MES_PCN同步异常日志") public class MesPcnSyncErrorLog extends BaseBean implements Serializable { 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 b5d583b..b72573b 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,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_SYS_USER_OFFLINE") @Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class MesPcnSysUserOffline extends BaseBean implements Serializable { @@ -68,4 +71,8 @@ public class MesPcnSysUserOffline extends BaseBean implements Serializable { @ApiParam(value ="模块" , access ="模块") private String moduleList; + @Column(name="STATUS") + @ApiParam(value ="状态" , access ="状态") + private Integer status; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java new file mode 100644 index 0000000..025275e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java @@ -0,0 +1,60 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PCN_SYSTEM_CFG") +@Api("MES_PCN_系统配置") +public class MesPcnSystemCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324811596L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "SYS_NAME") + @ApiParam("系统名称") + private String sysName; + + @Column(name = "COMPANY") + @ApiParam("公司名称") + private String company; + + @Column(name = "SYS_LOG") + @ApiParam("系统LOG") + private String sysLog; + + @Column(name = "MAIN_LOG") + @ApiParam("主页LOG") + private String mainLog; + + @Column(name = "COPYRIGHT") + @ApiParam("版权信息") + private String copyright; + + @Transient + @ApiParam("LOG存放地址") + private String logUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index f22f371..84b51ed 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") public class MesPcnTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java index a9d885f..3f28426 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_TASK_LOG") @Api("mes-pcn定时任务工作清单同步记录") public class MesPcnTaskLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index d5f6ed3..988a97b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -5,7 +5,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) @@ -52,11 +56,13 @@ public class MesPlanOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "PLAN_QTY") + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划数量") private Double planQty; - @Column(name = "DECOMPOSE_QTY") + @Column(name = "DECOMPOSE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("分解数量") private Double decomposeQty; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java similarity index 55% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java index f128453..e301e30 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java @@ -1,10 +1,11 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -15,33 +16,37 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/10 8:37 PM * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:03 + * @Modify: **/ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_FI_CFG") -@Api("首检件配置") -public class MesFiCfg extends BaseBean implements Serializable { +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PLAN_TAKT") +@Api("产线节拍表") +public class MesPlanTakt extends BaseBean implements Serializable { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; - private static final long serialVersionUID = 1791614973371037158L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; + @Column(name = "PLAN_TAKT") + @ApiParam("节拍") + private Integer planTakt; - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 4e09969..e0db0e9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -6,14 +6,13 @@ import cn.estsh.i3plus.pojo.mes.model.ProductDataModel; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; import java.util.List; @@ -29,7 +28,11 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PLC", indexes = { + @Index(columnList = "PLC_CODE"), + @Index(columnList = "TAG_ADDRESS") +}) @Api("PLC配置表") public class MesPlc extends BaseBean implements Serializable { private static final long serialVersionUID = -7172265186837551268L; @@ -86,6 +89,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("PLC配置") private String plcCfg; + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + private Integer busiType; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlcDataRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlcDataRecord.java new file mode 100644 index 0000000..ff0e1e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlcDataRecord.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.model.ProductDataModel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate:2019\10\9 0009 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PLC_DATA_RECORD", indexes = { + @Index(columnList = "PLC_CODE") +}) +@Api("PLC数据记录表") +public class MesPlcDataRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8789141495695469898L; + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "PLC_VLAUE") + @ApiParam("PLC型号") + private String plcValue; + +} 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 661059a..fcee248 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROCESS") @Api("工序") public class MesProcess extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 94ceddd..c845a51 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_BIND_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "KP_SN"), @@ -68,7 +71,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String kpSn; - @Column(name = "KP_QTY") + @Column(name = "KP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "原材料数量", example = "0") private Double kpQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index 6a40ee7..1198b4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_CFG") @Api("产品配置") public class MesProdCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index f769488..90acf1a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_CFG_DETAIL") @Api("产品配置明细") public class MesProdCfgDetail extends BaseBean implements Serializable { @@ -44,6 +47,14 @@ public class MesProdCfgDetail extends BaseBean implements Serializable { @ApiParam("是否虚零件") private Integer isVirtual; + @Column(name = "IS_LEFT_PART") + @ApiParam("是否左零件") + private Integer isLeftPart; + + @Column(name = "PRINTER_NAME") + @ApiParam("打印机名称") + private String printerName; + @Transient @ApiParam("零件名称") private String partName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java index 419799b..b184cea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_CFG_TYPE") @Api("项目") public class MesProdCfgType extends BaseBean implements Serializable { @@ -37,4 +40,12 @@ public class MesProdCfgType extends BaseBean implements Serializable { @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") private String prodCfgTypeName; + + @Column(name = "PCT_VERSION") + @ApiParam("项目版本") + private String pctVersion; + + @Column(name = "DWG_VERSION") + @ApiParam("图纸版本") + private String dwgVersion; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java index 5bcc4c8..d26de9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_MODEL_CFG") @Api("MES_产品车型配置") public class MesProdModelCfg extends BaseBean implements Serializable { 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 e632e1e..89bd66a 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,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_PACK") @Api("产品包装关系") public class MesProdPack extends BaseBean implements Serializable { 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 5fb24e8..9aef4c6 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_ROUTE_CFG") @Api("产品类流程配置表") public class MesProdRouteCfg extends BaseBean implements Serializable { @@ -43,7 +46,7 @@ public class MesProdRouteCfg extends BaseBean implements Serializable { private String routeCode; @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") + @ApiParam("流程类型 10-扫描类型 20-监控类型 30-状态机类型") private Integer routeType; @Column(name = "PPT_CODE") 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 3bfe3b7..1e38879 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 @@ -4,14 +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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +25,12 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_OPT_PARAM") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PROD_ROUTE_OPT_PARAM", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "PROCESS_CODE"), + @Index(columnList = "STEP_CODE") +}) @Api("产品流程配置操作参数表") public class MesProdRouteOptParam extends BaseBean implements Serializable { private static final long serialVersionUID = -5043197912658757665L; @@ -82,7 +86,6 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工步展示名称") private String stepDisplayName; - @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") private String paramAttribute; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java index 0ccadd4..72ab24e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_SCATTER_CFG_BOM") @Api("散件产品配置明细") public class MesProdScatterCfgBom extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java index 097c8d3..6d430f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_SCATTER_DETAIL") @Api("MES_散件产品配置关系") public class MesProdScatterDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index c4eae0c..901c690 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_WORK_CENTER") @Api("产品工作中心配置") public class MesProdWorkCenter extends BaseBean implements Serializable { @@ -44,7 +48,20 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("是否默认") private Integer isDefault; - @Column(name = "PART_SN") - @ApiParam("料箱条码") - private String partSn; + @Column(name = "RACK_NO") + @ApiParam("料箱编号") + private String rackNo; + + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("目标合格率") + private Double targetPassRate; + + @Column(name = "PRIORITY_ORDER") + @ApiParam("优先级顺序") + private Integer priorityOder = 0; + + @ApiParam("物料名称") + private String partName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java index 853652c..42c6375 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_CATEGORY") @Api("MES_产品位置") public class MesProduceCategory extends BaseBean implements Serializable { @@ -41,4 +44,8 @@ public class MesProduceCategory extends BaseBean implements Serializable { @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; + + @Column(name = "PRODUCE_CTGY_DESC") + @ApiParam("产品类型描述") + private String produceCategoryDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index ba53ce5..d6b1807 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_CTGY_PICTURE") @Api("产品类型图片表") public class MesProduceCtgyPicture extends BaseBean implements Serializable { @@ -39,6 +42,10 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable { @ApiParam("面位") private String sideLocation; + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + @Column(name = "FILE_ID") @ApiParam("文件id") private Long fileId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java index 51f3b81..06a43c3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -22,6 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_ERROR_RECORD") @Api("生产异常操作记录") public class MesProduceErrorRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java index 21fbfe9..3e2cf41 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_GROUP") @Api("MES_生产组") public class MesProduceGroup extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java index 0648f2c..b769bf2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_GROUP_CFG") @Api("MES_生产组配置") public class MesProduceGroupCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 7fead57..f946878 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,10 +27,14 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "PART_NO") + @Index(columnList = "MODIFY_DATE_TIME"), + @Index(columnList = "PART_NO"), + @Index(columnList = "WORK_ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) }) @@ -51,7 +58,8 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -123,7 +131,6 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; - @Column(name = "TRAY_NO") @ApiParam("托盘号") private String trayNo; @@ -148,10 +155,13 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("生产批次") private String lotNo; -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public transient Integer lockVersion; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; @Transient @ApiParam("返回信息") @@ -185,11 +195,63 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码打印状态名称") private String printStatusName; + @Transient + @ApiParam("设备代码") + private String equipmentCode; + + @Transient + @ApiParam("设备名称") + private String equipmentName; + + @Transient + @ApiParam("电检结果") + private String electricResult; + + @Transient + @ApiParam("包规数量") + private Double packageQty; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + @Transient + @ApiParam("缺陷代码") + private String defectCode; + + @Transient + @ApiParam("缺陷名称") + private String defectName; + + @Transient + @ApiParam("维修状态") + private Integer repairStatus; + + @Transient + @ApiParam("颜色名称") + private String colorName; + + @Transient + @ApiParam("物料版本号") + private String versionNo; + + @Transient + @ApiParam("配方内容") + private String formulaContent; + + @Transient + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Transient + @ApiParam("组内编号") + private Integer groupNo; + + @Transient + @ApiParam("总数") + private long sumQty; + public MesProduceSn() { } @@ -199,6 +261,56 @@ public class MesProduceSn extends BaseBean implements Serializable { this.qty = qty; } + + public MesProduceSn(String workCenterCode, String partNo, String partNameRdd, long sumQty) { + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sumQty = sumQty; + } + + public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus, + Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode, + String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo, + String custSn, String custPartNo, String custCode, Integer snType, String trayNo, Integer operateType, + String processLabelTemplate, String prodLabelTemplate, String custLabelTemplate, String lotNo, + String defectActionType, String vinCode, String versionNo, String createUser, String createDatetime) { + this.id = id; + this.serialNumber = serialNumber; + this.productSn = productSn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.qcStatus = qcStatus; + this.snStatus = snStatus; + this.printCount = printCount; + this.printStatus = printStatus; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.routeCode = routeCode; + this.processCode = processCode; + this.nextProcessCode = nextProcessCode; + this.inWorkCenterTime = inWorkCenterTime; + this.outWorkCenterTime = outWorkCenterTime; + this.shippingTime = shippingTime; + this.workOrderNo = workOrderNo; + this.custSn = custSn; + this.custPartNo = custPartNo; + this.custCode = custCode; + this.snType = snType; + this.trayNo = trayNo; + this.operateType = operateType; + this.processLabelTemplate = processLabelTemplate; + this.prodLabelTemplate = prodLabelTemplate; + this.custLabelTemplate = custLabelTemplate; + this.lotNo = lotNo; + this.defectActionType = defectActionType; + this.vinCode = vinCode; + this.versionNo = versionNo; + this.createUser = createUser; + this.createDatetime = createDatetime; + } + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index fb90102..4721ce4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,12 +26,16 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO"), - @Index(columnList = "MODIFY_DATE_TIME") + @Index(columnList = "MODIFY_DATE_TIME"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "WORK_ORDER_NO") }) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean implements Serializable { @@ -50,7 +57,8 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -126,10 +134,34 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("托盘号") private String trayNo; + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + + @Column(name = "PROCESS_LABEL_TEMPLATE") + @ApiParam("过程标签模板") + private String processLabelTemplate; + + @Column(name = "PROD_LABEL_TEMPLATE") + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Column(name = "CUST_LABEL_TEMPLATE") + @ApiParam("客户标签模板") + private String custLabelTemplate; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + @Transient @ApiParam("返回信息") private String resultMsg; @@ -158,6 +190,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("条码类型名称") private String snTypeName; + @Transient + @ApiParam("节拍时间") + private Integer cycleTime = 0; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index cd951ae..025a99d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCT_DATA", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @@ -108,6 +111,10 @@ public class MesProductData extends BaseBean implements Serializable { @ApiParam("数据组号") private String groupNo; + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + @Json4Es @Lob @Column(name = "LINE_DATA") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java index 0622673..99999ec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCT_ENCODE_CFG") @Api("产品编码配置") public class MesProductEncodeCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index a068cce..5f44783 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_CHECK_DATA", indexes = { @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "SN"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 1b6ee58..54215ab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") public class MesQcCheckStandard extends BaseBean implements Serializable { @@ -64,18 +68,6 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("频率") private String checkFrequency; - @Transient - @ApiParam("物料名称") - private String partName; - - @Transient - @ApiParam("检测结果") - private String checkResult; - - @Transient - @ApiParam("检测值") - private String checkValue; - @Column(name = "CHECK_ITEM_TYPE") @ApiParam("检测项类型") private String checkItemType; @@ -86,20 +78,62 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private Integer isConcession = 0; + private Integer isConcession; @Column(name = "NUMBER_FLAG") @ApiParam("数量标识") private String numberFlag; - @Column(name = "MAXIMUM") + @Column(name = "QTY") + @ApiParam("检测数量") + private Integer qty; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + @Column(name = "DATA_SOURCE") + @ApiParam("数据来源") + private String dataSource; + + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("检测值类型") + private String checkValueType; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("检测结果") + private String checkResult; + + @Transient + @ApiParam("检测值") + private String checkValue; + @Transient @ApiParam("检测类型名称") private String checkTypeName; @@ -115,6 +149,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("备注") private String memo; + @Transient + @ApiParam("序号") + private Integer seq; + public MesQcCheckStandard() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 925d075..113c25f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -14,6 +17,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -27,9 +31,10 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_ORDER") @Api("MES_检验单") -public class MesQcOrder extends BaseBean implements Serializable { +public class MesQcOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -5412635747424111476L; @Column(name = "ORDER_NO") @@ -48,11 +53,13 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; - @Column(name = "FINISH_QTY") + @Column(name = "FINISH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已检数量") private Double finishQty = 0D; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; @@ -84,9 +91,9 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("状态") private Integer status; - @Column(name = "CHECK_REULST") + @Column(name = "CHECK_RESULT") @ApiParam("检测整体结果") - private Integer checkReulst = 0; + private Integer checkResult = 0; @Column(name = "MEMO") @ApiParam("备注") @@ -108,9 +115,26 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("产线") private String workCenterCode; + @Column(name = "SAMPLE_TYPE") + @ApiParam("样本类型") + private Integer sampleType; + + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + @Column(name = "ON_SITE_FREQUENCY") + @ApiParam("巡检次数") + private Integer onSiteFrequency = 1; + + @Deprecated @ApiParam(value = "检测结果") @Transient - private String reulstStatus; + private String resultStatus; + + @ApiParam(value = "显示按钮") + @Transient + private List buttons; @ApiParam(value = "产品条码") @Transient @@ -128,4 +152,27 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("本批次生产总数") private Double locSrcLotNoQty; + @Transient + @ApiParam("客户名称") + private String customerName; + + @Transient + @ApiParam("班次") + private String shiftName; + + @Transient + @ApiParam("班长") + private String squadLeader; + + @Transient + @ApiParam("质检单集合") + private List orderNoList; + + @Transient + @ApiParam("控制计划编号") + private String controlPlanId; + + @Transient + @ApiParam("班组") + private String shiftGroupName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java index 4e3ceb7..3e62216 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_ORDER_ACCESSORY") @Api("MES_检验单附件") public class MesQcOrderAccessory extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java new file mode 100644 index 0000000..2b963a2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 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 java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QC_ORDER_APPROVAL_STATUS") +@Api("检测单审批状态表") +public class MesQcOrderApprovalStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = -3157480917343280506L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("计划数量") + private Double planQty; + + @Column(name = "CHECK_TYPE") + @ApiParam("检验类型") + private Integer checkType; + + @Column(name = "QC_USER") + @ApiParam("检查人") + private String qcUser; + + @Column(name = "CHECK_RESULT") + @ApiParam("检验结果") + private String checkResult; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测") + private Integer isKeyCheckItem; + + @Column(name = "QUALITY_APPROVAL_STATUS") + @ApiParam("质量经理审批状态") + private Integer qualityApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "QUALITY_CHOICE") + @ApiParam("质量经理审批状态") + private Integer qualityChoice; + + @Column(name = "PRODUCE_APPROVAL_STATUS") + @ApiParam("生产经理审批状态") + private Integer produceApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "PRODUCE_CHOICE") + @ApiParam("生产经理审批状态") + private Integer produceChoice; + + @Column(name = "APPROVAL_STATUS") + @ApiParam("生产经理审批状态") + private Integer approvalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index c78132b..b824074 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -14,6 +17,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -27,9 +31,10 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_ORDER_DETAIL") @Api("MES_检验单明细") -public class MesQcOrderDetail extends BaseBean implements Serializable { +public class MesQcOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -5412635747424111476L; @Column(name = "ORDER_NO") @@ -64,10 +69,6 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("是否允许让步") private Integer isConcession = 0; - @Column(name = "CHECK_REULST") - @ApiParam("判定结果") - private Integer checkReulst = 0; - @Column(name = "ITEM_NO") @ApiParam("检验行号") private Integer itemNo = 0; @@ -76,23 +77,70 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "CHECK_VALUE") - @ApiParam("检测值") - private String checkValue; + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty = 0; - @ApiParam(value = "已完成数量") - @Transient + @Column(name = "FINISH_QTY") + @ApiParam("已检数量") private Integer finishQty = 0; - @ApiParam(value = "检测项类型名称") - @Transient - private String businessTypeName; - - @Column(name = "MAXIMUM") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "DATA_SOURCE") + @ApiParam("数据源") + private String dataSource; + + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("检测值类型") + private String checkValueType; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam(value = "检测项类型名称") + @Transient + private String businessTypeName; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + @Transient + @ApiParam("判定结果") + private Integer checkResult = 0; + + @Transient + @ApiParam("检测值") + private String checkValue = ""; + + @Transient + @ApiParam("质检单检测记录id") + private Long qcOrderRecordId; + + @Transient + @ApiParam("质检单集合") + private List orderNoList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java new file mode 100644 index 0000000..18b932d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java @@ -0,0 +1,66 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: MES_QC_ORDER_DETAIL表的明细表 + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QC_ORDER_RECORD", indexes = { + @Index(columnList = "QC_ORDER_DETAIL_ID"), + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "ORDER_NO") +}) +@Api("MES_检验单检验记录") +public class MesQcOrderRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -5245624982023882232L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_RESULT") + @ApiParam("判定结果") + private Integer checkResult = 0; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "CHECK_SEQ") + @ApiParam("检测顺序") + private Integer checkSeq; + + @Column(name = "QC_ORDER_DETAIL_ID") + @ApiParam("质检单明细id") + private Long qcOrderDetailId; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java new file mode 100644 index 0000000..e791bdb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -0,0 +1,128 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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 java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description: MES质量标准-明细表（主表：控制计划MES_CONTROL_PLAN） + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUALITY_STANDARD") +@Api("中航质量标准明细表") +public class MesQualityStandard extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "CONTROL_PLAN_ID") + @ApiParam("控制计划表主键ID") + private Long controlPlanId; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "VERSION") + @ApiParam("版本") + private Integer version; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private Integer isConcession; + + @Column(name = "CHECK_INTERVAL") + @ApiParam("间隔时间") + private Integer checkInterval = 0; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @Column(name = "NUMBER_FLAG") + @ApiParam("个数标识") + private String numberFlag; + + @Column(name = "QTY") + @ApiParam("检测数量") + private Integer qty; + + //任务单类型,动态枚举 + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @Column(name = "DATA_SOURCE") + @ApiParam("数据来源") + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("检验值类型") + private String checkValueType; + + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("公差上限") + private Double maximum = 0d; + + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("公差下限") + private Double minimum = 0d; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java index 1ad2431..b202dce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUALITY_STANDARD_CFG") @Api("质量标准配置") public class MesQualityStandardCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java similarity index 54% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java index e6da731..46a5850 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -9,94 +9,80 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; -import java.io.Serializable; -import java.util.List; /** * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:33 + * @Author: jokelin + * @Date: 2021/3/4 7:16 PM * @Modify: - **/ + */ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD", indexes = { +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUARANTINE_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "PART_NO") }) -@Api("维修信息记录表") -public class MesRepairRecord extends BaseBean implements Serializable { +@Api("隔离记录表") +public class MesQuarantineRecord extends BaseBean { + private static final long serialVersionUID = -4667731056014803186L; - private static final long serialVersionUID = -2453726410779076150L; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "PART_NO") - @ApiParam("产品物料号") + @ApiParam("零件号") private String partNo; @Column(name = "PART_NAME") - @ApiParam("物料名称") + @ApiParam("零件名称") private String partName; + @Column(name = "QTY") + @ApiParam("用量") + private Integer qty; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "SIDE_LOCATION") - @ApiParam("产品面位") - private String sideLocation; - - @Column(name = "DEFECT_LOCATION") - @ApiParam("缺陷位置") - private String defectLocation; + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; @Column(name = "REPAIR_CODE") @ApiParam("维修代码") private String repairCode; - @Column(name = "REPAIR_NAME") - @ApiParam("维修名称") - private String repairName; + @Column(name = "QUARANTINE_NO") + @ApiParam("隔离单号") + private String quarantineNo; - @Column(name = "DC_CODE") - @ApiParam("缺陷原因代码") - private String dcCode; + @Column(name = "SCRAP_No") + @ApiParam("报废单号") + private String scrapNo; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; @Column(name = "DC_NAME") - @ApiParam("缺陷原因描述") + @ApiParam("缺陷原因名称") private String dcName; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Transient - @ApiParam("备注") - private String spareMemo; - - @Transient - @ApiParam("不良记录id") - private Long defectRecordId; - - @Transient - @ApiParam("缺陷集合") - private List mesDefectList; + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java index 1c1795f..58ef9c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_GROUP_COUNT") @Api("MES_队列分组计数") public class MesQueueGroupCount extends BaseBean implements Serializable { @@ -51,4 +54,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable { @Column(name = "GROUP_SIDE") @ApiParam("料架摆放位置") private String groupSide; + + @Transient + @ApiParam("分组序号") + private String groupSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java index dd39bd2..0d7e542 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_GROUP_RULE") @Api("MES_队列分组规则") public class MesQueueGroupRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 4a6ca87..bc44cc1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIS") @Api("JIS发运队列") public class MesQueueJis extends BaseBean implements Serializable { @@ -48,7 +52,8 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("车号") private String carNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index 8c8e9bf..494266a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIS_DETAIL") @Api("JIS发运队列明细") public class MesQueueJisDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 47cd239..a07c327 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -5,14 +5,13 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; +import java.util.Date; /** * @Description : @@ -26,7 +25,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_ACTUAL") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUEUE_JIT_ACTUAL", indexes = { + @Index(columnList = "JIS_ACTUAL_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "VIN_CODE"), + @Index(columnList = "JIT_SEQ") +}) @NoArgsConstructor @AllArgsConstructor @Builder @@ -50,9 +55,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") - private String seq; + private Double seq; @Column(name = "STATUS") @ApiParam("状态") @@ -86,6 +92,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("JIT排序号") private String jitSeq; + @Column(name = "JIA_SEQ") + @ApiParam("JIA排序号") + private String jiaSeq; + @Column(name = "SUPPLIER_CODE") @ApiParam("供应商代码") private String supplierCode; @@ -130,6 +140,22 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("工单类型") private Integer woType; + @Column(name = "OFFLINE_TIME") + @ApiParam("下线时间") + private String offlineTime; + + @Column(name = "NOTICE_SIGN") + @ApiParam("通知标识") + private Integer noticeSign = 10; + + @Column(name = "RELATION_VIN_CODE") + @ApiParam("替换vin") + private String relationVinCode; + + @Transient + @ApiParam("创建时间") + private String cdtTruncated; + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; @@ -154,4 +180,20 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "下达按钮编号") public String buttonCode; + @Transient + @ApiParam(value = "零件号") + public String partNo; + + @Transient + @ApiParam(value = "客户零件号") + public String custPartNo; + + @Transient + @ApiParam(value = "qty") + public Integer qty; + + @Transient + @ApiParam("工单类型") + private String woTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index cde084a..4ece2f1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -4,12 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +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.*; import java.io.Serializable; /** @@ -27,7 +26,13 @@ import java.io.Serializable; @AllArgsConstructor @Builder @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM", indexes = { + @Index(columnList = "JIS_ACTUAL_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "PRODUCE_CTGY_CODE"), + @Index(columnList = "PART_NO") +}) @Api("客户JIT生产队列散件清单") public class MesQueueJitActualBom extends BaseBean implements Serializable { private static final long serialVersionUID = 1604529847020812472L; @@ -52,7 +57,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; @@ -63,4 +69,12 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @Column(name = "PART_COLOR_VALUE") @ApiParam("零件色值") private String partColorValue; + + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("收货日期") + private String receiptDate; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 1d1c468..ac002dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -7,10 +7,7 @@ import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,10 +22,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@NoArgsConstructor +@Inheritance(strategy = InheritanceType.JOINED) @AllArgsConstructor @Builder -@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL") +@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL", indexes = { + @Index(columnList = "JIS_ACTUAL_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "PART_NO"), + @Index(columnList = "PRODUCE_CTGY_CODE") +}) @Api("MES_客户JIT生产队列明细") public class MesQueueJitActualDetail extends BaseBean implements Serializable { @@ -97,7 +99,45 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("组件编号") private String assyNo; + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus = "BACKFLUSH"; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty = 2; + @Transient @ApiParam("工单类型") private Integer woType; + + @Transient + @ApiParam("子物料名称") + private String itemPartNo; + + @Transient + @ApiParam("数量") + private long qty; + + @Transient + @ApiParam("是否拆解件") + private Integer isDisPart; + + public MesQueueJitActualDetail() { + + } + + public MesQueueJitActualDetail(String partNo, String itemPartNo, long qty) { + this.partNo = partNo; + this.itemPartNo = itemPartNo; + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index b55af50..44ccdd1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -4,15 +4,14 @@ 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 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.Lob; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -27,7 +26,12 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_PLAN") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUEUE_JIT_PLAN", indexes = { + @Index(columnList = "JIS_PLAN_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "VIN_CODE") +}) @Api("MES_客户JIT预装队列") public class MesQueueJitPlan extends BaseBean implements Serializable { @@ -53,7 +57,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @ApiParam("选配码") private String vehicleCode; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划排序号") private Double seq; @@ -116,4 +121,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Transient @ApiParam("计划上线结束时间") private String planEndDate; + + @Transient + @ApiParam("替换vin") + private String relationVinCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index 5177ba9..ad8be6a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -4,12 +4,16 @@ 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 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.Index; import javax.persistence.Table; import java.io.Serializable; @@ -25,7 +29,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_PLAN_BOM") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUEUE_JIT_PLAN_BOM", indexes = { + @Index(columnList = "JIS_PLAN_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "PRODUCE_CTGY_CODE"), + @Index(columnList = "PART_NO") +}) @Api("MES_客户JIT预装队列BOM") public class MesQueueJitPlanBom extends BaseBean implements Serializable { @@ -51,7 +61,8 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @ApiParam("道口") private String dockNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index d290454..ca66e1a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -4,13 +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 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.*; import java.io.Serializable; /** @@ -25,7 +25,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL", indexes = { + @Index(columnList = "JIS_PLAN_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "PRODUCE_CTGY_CODE"), + @Index(columnList = "PART_NO") +}) @Api("MES_客户JIT预装队列明细") public class MesQueueJitPlanDetail extends BaseBean implements Serializable { @@ -58,4 +64,26 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { @Column(name = "FORMULA_CONTENT") @ApiParam("配方内容") private String formulaContent; + + @Transient + @ApiParam("工单类型") + private Integer woType; + + @Transient + @ApiParam("子物料名称") + private String itemPartNo; + + @Transient + @ApiParam("数量") + private long qty; + + public MesQueueJitPlanDetail() { + + } + + public MesQueueJitPlanDetail(String partNo, String itemPartNo, long qty) { + this.partNo = partNo; + this.itemPartNo = itemPartNo; + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index bd996b0..aecb239 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,8 +26,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER", indexes = { - @Index(columnList = "CUST_FLAG_NO") + @Index(columnList = "CUST_FLAG_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) }) @@ -52,7 +58,8 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("产品配置名称") private String prodCfgNameRdd; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; @@ -112,6 +119,26 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("等级代码") private String gradeCode; + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "GROUP_NO") + @ApiParam("分组号") + private String groupNo; + @Transient @ApiParam("起始车号") private String custFlagNoStart; @@ -136,6 +163,36 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("产品颜色") private String colorName; + @Transient + @ApiParam("零件号") + private String partNo; + + @Transient + @ApiParam("零件名称") + private String partNameRdd; + + @Transient + @ApiParam("箱数") + private Integer boxQty; + + @Transient + @ApiParam("开始时间") + private String startTime; + + @Transient + @ApiParam("结束时间") + private String endTime; + + @Transient + @ApiParam("数量") + private Double qty; + + @Transient + @ApiParam("已生产数量") + private Double finsihQty; + + public MesQueueOrder(){} + public int getStatusVal() { return this.status == null ? 0 : this.status; } @@ -144,4 +201,44 @@ public class MesQueueOrder extends BaseBean implements Serializable { return this.seq == null ? 0.0d : this.seq; } + public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + Integer queueType,Integer status,String createUser, + String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo) { + this.seq = seq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.boxQty = boxQty; + this.queueType = queueType; + this.status = status; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.workType = workType; + this.orderNo = orderNo; + } + public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty, + Integer queueType,Integer status,String createUser, + String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, + String workCenterCode, String workCellCode, Double qty, Double finsihQty, String groupNo) { + this.id = id; + this.seq = seq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.boxQty = boxQty; + this.queueType = queueType; + this.status = status; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.workType = workType; + this.orderNo = orderNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.qty = qty; + this.finsihQty = finsihQty; + this.groupNo = groupNo; + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index 5a00f18..ebf2f29 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -4,13 +4,14 @@ 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 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.*; import java.io.Serializable; /** @@ -25,7 +26,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_BOM") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUEUE_ORDER_BOM", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "PRODUCE_CTGY_CODE") +}) @Api("MES_生产队列散件清单") public class MesQueueOrderBom extends BaseBean implements Serializable { @@ -50,7 +57,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; @@ -61,4 +69,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @Column(name = "OPTION_TYPE") @ApiParam("选配类型") private Integer optionType; + + @Transient + @ApiParam("物料类型3") + private String categoryCode3; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 96d6044..3816fc1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,10 +26,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { - @Index(columnList = "ORDER_NO") + @Index(columnList = "ORDER_NO"), + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "QUEUE_GROUP_NO"), + @Index(columnList = "PRODUCE_CATEGORY_CODE") }, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"}) }) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { @@ -48,11 +55,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -64,7 +73,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("生产类型") private String workType; - @Column(name = "PRODUCE_CATEGORY_CODE") + @Column(name = "PRODUCE_CATEGORY_CODE", nullable = false) @ApiParam("产品位置") private String produceCategoryCode; @@ -112,7 +121,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("队列序号") private Double queueSeq; - @Column(name = "FINSIH_QTY") + @Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已生产数量") private Double finsihQty; @@ -120,6 +130,22 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("料架摆放位置") private String groupSide; + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty; + + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus; + @Transient @ApiParam("Vin") private String vinCode; @@ -177,8 +203,16 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { private Integer masterStatus; @Transient - @ApiParam("产品条码") - private String productSn; + @ApiParam("队列类型") + private Integer queueType; + + @Transient + @ApiParam("等级名称") + private String gradeName; + + @Transient + @ApiParam("客户产线代码") + private String custProdLineCode; public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; @@ -192,6 +226,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { return this.qty == null ? 0.0d : this.qty; } + public double getFinsihQtyVal() { + return this.finsihQty == null ? 0.0d : this.finsihQty; + } + public int getStatusVal() { return this.status == null ? 0 : this.status; } @@ -207,7 +245,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode, Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime, - String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) { + String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor, + String gradeCode,String assyNo,Integer queueType) { this.orderNo = orderNo; this.vinCode = vinCode; this.partNo = partNo; @@ -224,5 +263,23 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.produceColor = produceColor; this.gradeCode = gradeCode; this.assyNo = assyNo; + this.queueType = queueType; + } + + public MesQueueOrderDetail(Long id, String orderNo, String vinCode, String produceCategoryCode, String productSn, String serialNumber, + String groupSeq, String queueGroupNo, Integer groupNo, String groupSide, String jisBackflushStatus, + String modifyUser) { + this.id = id; + this.orderNo = orderNo; + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; + this.productSn = productSn; + this.serialNumber = serialNumber; + this.groupSeq = groupSeq; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.groupSide = groupSide; + this.jisBackflushStatus = jisBackflushStatus; + this.modifyUser = modifyUser; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java new file mode 100644 index 0000000..01a4829 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java @@ -0,0 +1,148 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUEUE_ORDER_DETAIL_RECORD", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "QUEUE_GROUP_NO"), + @Index(columnList = "PRODUCE_CATEGORY_CODE") +}) +@Api("生产队列明细记录表") +public class MesQueueOrderDetailRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 7840873844253353896L; + + @Column(name = "ORDER_NO") + @ApiParam("主队列编号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("队列明细序号") + private Double seq; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "WORK_TYPE") + @ApiParam("生产类型") + private String workType; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CATEGORY_NAME_RDD") + @ApiParam("产品位置名称") + private String produceCategoryNameRdd; + + @Column(name = "PPT_CODE") + @ApiParam("产品类型名称") + private String pptCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + + @Column(name = "IS_GROUP_PRINTED") + @ApiParam("料架是否已打印") + private Integer isGroupPrinted = 2; + + @Column(name = "PRODUCE_COLOR") + @ApiParam("产品颜色") + private String produceColor; + + @Column(name = "PRODUCE_COLOR_CODE") + @ApiParam("产品颜色代码") + private String produceColorCode; + + @Column(name = "OPTION_CODE") + @ApiParam("选项代码") + private String optionCode; + + @Column(name = "ASSY_NO") + @ApiParam("组件编号") + private String assyNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + + @Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("已生产数量") + private Double finsihQty; + + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; + + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty; + + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java index bc23151..c0dfe79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_SHIPPING") @Api("MES_JIT发运队列") public class MesQueueShipping extends BaseBean implements Serializable { @@ -51,7 +55,8 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index 6f0005e..4a37695 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_SHIPPING_DETAIL") @Api("MES_JIT发运队列明细") public class MesQueueShippingDetail extends BaseBean implements Serializable { @@ -67,11 +71,13 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; - @Column(name = "qty") + @Column(name = "qty", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index ee3e3b5..f7cd693 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") public class MesRawPartSn extends BaseBean implements Serializable { @@ -48,7 +52,8 @@ public class MesRawPartSn extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double rawQty; @@ -68,6 +73,10 @@ public class MesRawPartSn extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java similarity index 57% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java index feeef17..3bd0d01 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java @@ -1,10 +1,11 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -15,19 +16,22 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 2:31 PM * @Description: - **/ + * @CreateDate: 2020/10/26 + * @Author: simon.song + */ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_EQUIPMENT") -@Api("工作单元设备关系表") -public class MesWcEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 2088600237918553286L; +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_REAL_TIME_TAKT") +@Api("MES_实时节拍") +public class MesRealTimeTakt extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2910474711746286558L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; @@ -36,8 +40,8 @@ public class MesWcEquipment extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; + @Column(name = "REAL_TIME_TAKT") + @ApiParam("实时节拍") + private String realTimeTakt; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java index 4c75791..541aa11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_REPAIR") @Api("维修") public class MesRepair extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index d717a56..29f3a67 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_REPAIR_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "CREATE_DATE_TIME"), @@ -85,6 +88,7 @@ public class MesRepairRecord extends BaseBean implements Serializable { @ApiParam("工位") private String workCellCode; + @Lob @Column(name = "MEMO") @ApiParam("备注") private String memo; @@ -93,11 +97,15 @@ public class MesRepairRecord extends BaseBean implements Serializable { @ApiParam("备注") private String spareMemo; - @Transient + @Column(name = "DEFECT_RECORD_ID") @ApiParam("不良记录id") private Long defectRecordId; @Transient @ApiParam("缺陷集合") private List mesDefectList; + + @Transient + @ApiParam("质量状态") + private Integer qcStatus; } 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 a0a107d..116e8ba 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 @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ROUTE") @Api("流程表") public class MesRoute extends BaseBean implements Serializable { @@ -42,7 +45,7 @@ public class MesRoute extends BaseBean implements Serializable { private String position; @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") + @ApiParam("流程类型 10-扫描类型 20-监控类型 30-状态机类型") private Integer routeType; @Transient 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 70d3b44..201b6d7 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ROUTE_PROCESS") @Api("流程工序关系") public class MesRouteProcess extends BaseBean implements Serializable { 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 b677ede..809725a 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ROUTE_PROCESS_CELL") @Api("工序工作单元对照") public class MesRouteProcessCell extends BaseBean implements Serializable { @@ -55,4 +58,8 @@ public class MesRouteProcessCell extends BaseBean implements Serializable { @ApiParam("工序代码名称") private String processCodeName; + @Transient + @ApiParam("正在生产队列数量") + private Integer genningNum; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java index 5a75ba4..6efc1ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ROUTE_PROCESS_STEP") @Api("流程工序工步关系") public class MesRouteProcessStep extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java index 780af83..9d025c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "MES_ROUTE_STATUS") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态") public class MesRouteStatus extends BaseBean implements Serializable { private static final long serialVersionUID = 4988786372428896721L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java index 7642f27..d8fb95d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "MES_SCATTER_BOM_CFG") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("MES_散件BOM配置") public class MesScatterBomCfg extends BaseBean implements Serializable { @@ -85,4 +88,8 @@ public class MesScatterBomCfg extends BaseBean implements Serializable { @Column(name = "RECIPE_SEQ") @ApiParam("配方序号") private String recipeSeq; + + @Column(name = "CHANGE_NO") + @ApiParam("change No") + private String changeNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java index 44a5022..c657bc2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCATTER_CFG_DETAIL") @Api("MES_散件配置报文关系") public class MesScatterCfgDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java index fd2e7c3..1e8c51e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCATTER_PART_CFG_BOM") @Api("MES_车型散件配置清单") public class MesScatterPartCfgBom extends BaseBean implements Serializable { @@ -64,7 +67,7 @@ public class MesScatterPartCfgBom extends BaseBean implements Serializable { @ApiParam("零件标志值") private String partFlagValue; - @Column(name = "QTY", columnDefinition = "decimal(18,3)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "用量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index 1144a04..6f941e9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCATTER_PART_PROD_CFG") @Api("MES_散件零件生产配置") public class MesScatterPartProdCfg extends BaseBean implements Serializable { @@ -162,15 +166,21 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @ApiParam("是否截至顺序号") private Integer isEndSeq; - @Column(name = "MULTIMEDIA_PLUG_QTY") + @Column(name = "MULTIMEDIA_PLUG_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("多媒体插头数量") private Double multimediaPlusQty; - @Column(name = "QUALIFIED_COUNT") + @Column(name = "QUALIFIED_COUNT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("应收合格数") private Double qualifiedCount; @Column(name = "IS_CHECK") @ApiParam("是否复核校验") private Integer isCheck; + + @Column(name = "PICK_QTY") + @ApiParam("拣货数量") + private Integer pickQty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java similarity index 52% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java index fd9c366..fc19844 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java @@ -1,9 +1,11 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -14,32 +16,31 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/16 0016 - 15:09 + * @Description: + * @Author: jokelin + * @Date: 2020/8/29 5:11 下午 + * @Modify: */ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CACHA_QUEUE") -@Api("MES缓存队列") -public class MesCachaQueue extends BaseBean implements Serializable { +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_SCHEDULING_RECORD") +@Api("MES_排程记录表") +public class MesSchedulingRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 5841185737664839362L; - private static final long serialVersionUID = 8272649623030195332L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") + @ApiParam("产品条码") private String serialNumber; @Column(name = "STATUS") @ApiParam("状态") private Integer status; - - @Column(name = "CACHA_TYPE") - @ApiParam("缓存类型") - private String cachaType; - -} \ No newline at end of file +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java index 0478394..c887cdd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCRAP") @Api("报废原因") public class MesScrap extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 8263d3e..9ff4d6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCRAP_RECORD", indexes = { @Index(columnList = "CREATE_DATE_TIME") }) @@ -69,7 +73,8 @@ public class MesScrapRecord extends BaseBean implements Serializable { @ApiParam("工单编号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java index 945aa56..55b3700 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCRIPT_PERSISTENCE") @Api("动态脚本") public class MesScriptPersistence extends BaseBean implements Serializable { 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 3fd79bb..b83f6cd 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,9 +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 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; @@ -26,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean implements Serializable { @@ -51,14 +56,25 @@ public class MesShift extends BaseBean implements Serializable { @ApiParam("下班时间") private String endTime; - @Column(name = "WORK_TIMES") + @Column(name = "WORK_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("作业时长") private Double workTimes; - @Column(name="SHIFT_SEQ") + @Column(name = "SHIFT_SEQ") @ApiParam("班次顺序") private Integer shiftSeq; + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Transient + private String queryBeginTime; + + @Transient + private String queryEndTime; + public int getShiftSeqVal() { return this.shiftSeq == null ? 0 : this.shiftSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java index 0403694..58f6f99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT_CLASS") @Api("MES_班制表") public class MesShiftClass extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java index bd588d7..d20a9be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT_CLASS_DETAIL") @Api("MES_班制班次表") public class MesShiftClassDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 6a01945..829b908 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -11,6 +13,7 @@ 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; /** @@ -25,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT_GROUP") @Api("班组") public class MesShiftGroup extends BaseBean implements Serializable { @@ -45,4 +49,12 @@ public class MesShiftGroup extends BaseBean implements Serializable { @Column(name = "SQUAD_LEADER") @ApiParam("班长") private String squadLeader; + + @Column(name = "USER_EMP_NO") + @ApiParam(value = "工号") + private String userEmpNo; + + @Column(name = "SHIFT_NUM") + @ApiParam("班组人数") + private String shiftNum; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index ef567e2..08c1095 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT_REST") @Api("班次休息信息") public class MesShiftRest extends BaseBean implements Serializable { @@ -43,7 +47,16 @@ public class MesShiftRest extends BaseBean implements Serializable { @ApiParam("开始时间") private String startTime; - @Column(name = "REST_TIMES") + @Column(name = "REST_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("休息时长") private Double restTimes; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="REST_DESC") + @ApiParam("班休描述") + private String restDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java index d22f305..9afd745 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SKILLS") @Api("MES_技能表") public class MesSkills extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java index 521d413..0cba794 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SM_ROUTE_OPT_PARAM") @Api("产品流程状态机配置操作参数表") public class MesSmRouteOptParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java index d54028c..b725934 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SN_PHOTO_RELATION") @Api("条码照片关系") public class MesSnPhotoRelation extends BaseBean implements Serializable { @@ -31,9 +34,9 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable { private static final long serialVersionUID = -3062206473345277360L; @Column(name = "SERIAL_NUMBER") - @ApiParam("条码") - private String serialNumber; - + @ApiParam("过程条码") + private String serialNumber; + //TODO 北京麦格纳使用，如要变更此字段需要更改对应业务代码 @Column(name = "PHOTO_PATH") @ApiParam("照片路径") private String photoPath; @@ -42,4 +45,21 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable { @ApiParam("照片名称") private String photoName; + @Column(name = "PHOTO_URL") + @ApiParam("照片访问地址") + private String photoUrl; + + @Column(name = "PHOTO_ORIGINAL_PATH") + @ApiParam("照片原始路径") + private String photoOriginalPath; + + @Column(name = "PHOTO_TRANSFER_PATH") + @ApiParam("照片转存路径") + private String photoTransferPath; + + @Column(name = "PHOTO_TARGET_PATH") + @ApiParam("照片目标路径") + private String photoTargetPath; + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java new file mode 100644 index 0000000..641f583 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java @@ -0,0 +1,57 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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 java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/8/24 17:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_SPC_CONTROL_COEFFICIENT") +@Api("MES_SPC控制图系数") +public class MesSpcControlCoefficient extends BaseBean implements Serializable { + private static final long serialVersionUID = -2790965693171941915L; + + @Column(name = "SINGLE_GROUP_QTY") + @ApiParam("子组容量") + private Integer singleGroupQty; + + @Column(name = "COEFFICIENT_TYPE") + @ApiParam("系数类型") + private String coefficientType; + + @Column(name = "COEFFICIENT_CODE") + @ApiParam("系数代码") + private String coefficientCode; + + @Column(name = "COEFFICIENT_DESC") + @ApiParam("系数描述") + private String coefficientDesc; + + @Column(name = "COEFFICIENT_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("系数值") + private Double coefficientValue; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java new file mode 100644 index 0000000..7ed0599 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java @@ -0,0 +1,81 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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 java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/8/24 17:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_SPC_KEY_DATA") +@Api("MES_SPC关键数据") +public class MesSpcKeyData extends BaseBean implements Serializable { + private static final long serialVersionUID = 2255345691671062029L; + + @Column(name = "KD_CODE") + @ApiParam("关键数据代码") + private String kdCode; + + @Column(name = "KD_NAME") + @ApiParam("关键数据名称") + private String kdName; + + @Column(name = "NOMINAL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("公称值") + private Double nominalValue; + + @Column(name = "SPEC_USL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("规格上限") + private Double specUsl; + + @Column(name = "SPEC_LSL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("规格下限") + private Double specLsl; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "OBJECT_TYPE") + @ApiParam("取值对象类型") + private Integer objectType; + + @Column(name = "OBJECT_CODE") + @ApiParam("取值对象") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("取值字段") + private String fieldCode; + + @Column(name = "KD_CONDITION") + @ApiParam("取值条件") + private String kdCondition; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java new file mode 100644 index 0000000..a3f7d91 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : 员工信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_STAFF") +@Api("员工信息") +public class MesStaff extends BaseBean implements Serializable { + private static final long serialVersionUID = -8330599945613548761L; + + @Column(name = "USER_CODE") + @ApiParam("员工编号") + private String userCode; + + @Column(name = "USER_NAME") + @ApiParam("姓名") + private String userName; + + @Column(name = "PICTURE_URL") + @ApiParam("照片路径") + private String pictureUrl; + + @Column(name = "SKILL_LEVEL") + @ApiParam("技能等级") + private Integer skillLevel; + + @Transient + private Double xAxis; + + @Transient + private Double yAxis; + + @Transient + private String workCellCode; +} 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 63d6212..6362acd 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STATE_MACHINE") @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 5bc6718..b3600b0 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.model.StepResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,6 +21,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STATE_MACHINE_STATUS") @Api("MES状态机步骤") public class MesStateMachineStatus extends BaseBean implements Serializable { @@ -34,10 +31,6 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("状态机代码") private String smCode; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - @Column(name = "STATUS_CODE") @ApiParam("状态代码") private String statusCode; @@ -50,6 +43,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("状态名称") private String statusName; + @Column(name = "NEXT_STATUS_NAME") + @ApiParam("下一状态名称") + private String nextStatusName; + @Column(name = "TRIGGER_TYPE") @ApiParam("触发类型 10=内部触发 20=外部触发") private Integer triggerType; @@ -74,14 +71,26 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("离开调用") private Long outAmgId; - @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0") - @ApiParam("状态类型 10=初始化状态") + @Column(name = "STATUS_TYPE") + @ApiParam("状态类型 10=初始化状态 20=执行中状态 99=回退状态 40=结束状态") private Integer statusType; @Column(name = "SEQ") @ApiParam("状态点顺序") private Integer seq; + @Column(name = "IS_INIT") + @ApiParam("是否初始化") + private Integer isInit = 1; + + @Transient + @ApiParam("流程代码") + private String routeCode; + + @Transient + @ApiParam("工序代码") + private String processCode; + @Transient @ApiParam("状态点是否完成") private boolean isComplete; @@ -95,6 +104,37 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { private String color; @Transient - @ApiParam("状态执行情况") - private StepResult stepResult; + @ApiParam("进入触发方法时默认校验外部触发") + private boolean isCheckOuterTrigger = true; + + @Transient + @ApiParam("客制化下个状态点的触发事件") + private String nextTriggerEvent; + + + public MesStateMachineStatus() { + } + + public MesStateMachineStatus(Long id, String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType, + String triggerEvent, String triggerWhere, Long triggerAmgId, Long inAmgId, Long outAmgId, Integer statusType, Integer seq, + Integer isInit, String routeCode, String processCode) { + this.id = id; + this.smCode = smCode; + this.statusCode = statusCode; + this.nextStatus = nextStatus; + this.statusName = statusName; + this.nextStatusName = nextStatusName; + this.triggerType = triggerType; + this.triggerEvent = triggerEvent; + this.triggerWhere = triggerWhere; + this.triggerAmgId = triggerAmgId; + this.inAmgId = inAmgId; + this.outAmgId = outAmgId; + this.statusType = statusType; + this.seq = seq; + this.isInit = isInit; + this.routeCode = routeCode; + this.processCode = processCode; + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java similarity index 57% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java index 169af24..613a5bd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -14,9 +14,9 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description :产品流程配置操作参数表 + * @Description :状态机工步参数配置表 * @Reference : - * @Author : jack.jia + * @Author : wangjie * @CreateDate : 2019-04-02 * @Modify: **/ @@ -25,21 +25,21 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_OPT_PARAM") -@Api("产品流程配置操作参数表") -public class MesProdRouteOptParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -932364659894292000L; - @Column(name = "PROD_ROUTE_CFG_ID") - @ApiParam("产品流程ID") - private Long prodRouteCfgId; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; +@Table(name = "MES_STATE_MACHINE_STEP") +@Api("状态机工步参数配置表") +public class MesStateMachineStep extends BaseBean implements Serializable { + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "AMG_ID") + @ApiParam("工步集代码") + private Long amgId; @Column(name = "STEP_CODE") @ApiParam("工步代码") @@ -53,13 +53,18 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工步参数代码") private String paramCode; + @Column(name = "PARAM_TYPE") + @ApiParam("工步参数类型") + private Integer paramType; + @Column(name = "PARAM_VALUE") @ApiParam("工步参数值") private String paramValue; - public long getProdRouteCfgIdVal() { - return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId; - } + @Column(name = "PARAM_ATTRIBUTE") + @ApiParam("参数属性") + private String paramAttribute; + public int getStepSeq() { return this.stepSeq == null ? 0 : this.stepSeq; @@ -68,4 +73,8 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { public void setStepSeq(int stepSeq) { this.stepSeq = stepSeq; } + + public int getParamTypeVal() { + return this.paramType == null ? 0 : this.paramType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 85e63bf..00a3cce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STATION_BOM") @Api("工位物料清单") public class MesStationBom extends BaseBean implements Serializable { @@ -57,7 +60,7 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") private Double qty; @@ -82,6 +85,19 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "匹配规则") private Integer matchRule; + @Column(name = "BIND_PART_TYPE") + @ApiParam(value = "绑定物料类型") + private Integer bindPartType = 20; + + @Column(name = "FEED_WARNING_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "投料预警值") + private Double feedWarningQty; + + @Transient + @ApiParam("标准包规数量") + private Double partSpecQty = 0d; + @Transient @ApiParam("是否已绑定") private Boolean isBind; @@ -143,9 +159,21 @@ public class MesStationBom extends BaseBean implements Serializable { private Integer length; @Transient + @ApiParam("缺陷代码") + private String defectCode; + + @Transient @ApiParam("校验内容") private String checkContent; + @Transient + @ApiParam("客户零件号") + private String custPartNo; + + @Transient + @ApiParam("配方项") + private String recipeItem; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } 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 bad1874..87ca767 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STEP") @Api("工步") public class MesStep extends BaseBean implements Serializable { @@ -51,6 +54,10 @@ public class MesStep extends BaseBean implements Serializable { @ApiParam("工步对象") private String stepObject; + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + /** * 工位扫描业务所需使用字段 */ 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 48bfc7a..cf5da7a 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STEP_GROUP") @Api("工步集") public class MesStepGroup extends BaseBean implements Serializable { @@ -33,7 +36,7 @@ public class MesStepGroup extends BaseBean implements Serializable { private Long amgId; @Column(name = "STEP_CODE") - @ApiParam("组件集代码") + @ApiParam("工步代码") private String stepCode; @Column(name = "SEQ") 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 dd0d6b0..c9409c9 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,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.util.Map; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STEP_PARAM") @Api("工步参数") public class MesStepParam extends BaseBean implements Serializable { @@ -65,13 +68,17 @@ public class MesStepParam extends BaseBean implements Serializable { @ApiParam("参数对象") private String objectCode; + @Column(name = "IS_NEED") + @ApiParam("是否必需") + private Integer isNeed = 1; + @Column(name = "TYPE") @ApiParam("type") private Integer type = 0; - @Transient - @ApiParam("可选值的数据") - private List> enumList; + @Column(name = "OBJECT_WHERE") + @ApiParam("参数对象查询条件") + private String objectWhere; @Transient @ApiParam("key的值") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java index 05466cb..b539cbc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SUB_PART") @Api("替代料") public class MesSubPart extends BaseBean implements Serializable { @@ -36,4 +39,7 @@ public class MesSubPart extends BaseBean implements Serializable { @ApiParam("替代料") private String subPartNo; + @Column(name = "SUB_FLAG") + @ApiParam("替代料标识") + private String subFlag; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java index 11a7383..7156d25 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SYNC_DEAD_LETTER", indexes = { @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"), @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java new file mode 100644 index 0000000..311f058 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java @@ -0,0 +1,69 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/27 15:59 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_TAKT_ALARM_CONTINUOUS_CONFIG", indexes = { + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("节拍故障等级配置表") +public class MesTaktAlarmContinuousConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = -1046263075313178823L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "CONTINUOUS_DETERMINE") + @ApiParam("连续判断的等级代码") + private String continuousDetermine; + + @Column(name = "CONTINUOUS_SECOND") + @ApiParam("连续秒数") + private Integer continuousSecond; + + @Column(name = "CONTINUOUS_COUNT") + @ApiParam("发生次数") + private Integer continuousCount; + + @Column(name = "IS_STOP_LINE") + @ApiParam("是否停线") + private Integer isStopLine; + + @Column(name = "IS_TRIGGER_ANDON") + @ApiParam("是否触发安灯") + private Integer isTriggerAndon; + + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private Integer objectType; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java new file mode 100644 index 0000000..029df49 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/27 15:59 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_TAKT_LEVEL_CONFIG", indexes = { + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("节拍故障等级配置表") +public class MesTaktAlarmLevelConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = -3550230985173772736L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "LEVEL_CODE") + @ApiParam("等级代码") + private String levelCode; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Column(name = "IS_STOP_LINE") + @ApiParam("是否停线") + private Integer isStopLine; + + @Column(name = "IS_TRIGGER_ANDON") + @ApiParam("是否触发安灯") + private Integer isTriggerAndon; + + @Column(name = "ANDON_API_TYPE") + @ApiParam("安灯接口类型") + private Integer andonApiType; + + @Column(name = "MIN_MULTIPLE") + @ApiParam("最小倍数") + private Double minMultiple; + + @Column(name = "MAX_MULTIPLE") + @ApiParam("最大倍数") + private Double maxMultiple; + + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private Integer objectType; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java new file mode 100644 index 0000000..a59492f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/27 15:59 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_TAKT_ALARM_RECORD", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "START_TIME") +}) +@Api("节拍故障报警记录") +public class MesTaktAlarmRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 3267756779912298635L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name = "TAKT_SECOND") + @ApiParam("节拍 秒数") + private Integer taktSecond; + + @Column(name = "LEVEL_CODE") + @ApiParam("异常等级") + private String levelCode; + + @Column(name = "IS_PROCESSED") + @ApiParam("是否完成") + private Integer isProcessed = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java index 11da3c6..7723322 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -19,6 +21,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TIME") @Api("工步参数") public class MesTime extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java index e436ea3..22bbb6c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TOOLING") @Api("MES工装类型") public class MesTooling extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java index ee236fc..e014cf8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TOOLING_ACTION_RECORD") @Api("MES_工装操作记录") public class MesToolingActionRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java index 2deb16a..4ac87d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TOOLING_DETAIL") @Api("MES_工装明细") public class MesToolingDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java index 56743f5..b5bedc5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean implements Serializable { @@ -35,15 +39,18 @@ public class MesTorqueDetail extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大值") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小值") private Double lowerLimit; - @Column(name = "TORQUE_DETAIL_VALUE") + @Column(name = "TORQUE_DETAIL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("扭矩值") private Double torqueValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index 9f87ea7..42858d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TYPE_CFG") @Api("类型信息表") public class MesTypeCfg extends BaseBean implements Serializable { @@ -45,4 +48,16 @@ public class MesTypeCfg extends BaseBean implements Serializable { @Column(name = "BUSINESS_TYPE_NAME") @ApiParam("业务类型名称") private String businessTypeName; + + @Column(name = "COLOR_VALUE") + @ApiParam("颜色值") + private String colorValue; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java index 276699a..5d340b5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_USER_SKILL") @Api("MES_人员技能表") public class MesUserSkill extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java index d8ecd5d..0ae6853 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WC_CHECK") @Api("开线检查") public class MesWcCheck extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java index 36a9394..bf6f943 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WC_CHECK_RECORD", indexes = { @Index(columnList = "CREATE_DATE_TIME") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java new file mode 100644 index 0000000..c15873c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WC_CURRENT_STATUS") +@Api("工位实时状态表") +public class MesWcCurrentStatus extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4224360275760211780L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "VIN_CODE") + @ApiParam("当前VIN号") + private String vinCode; + + @Column(name = "LAST_VIN_CODE") + @ApiParam("上一VIN号") + private String lastVinCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java index a3ab8a2..7814690 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WC_EQUIPMENT") @Api("工作单元设备关系表") public class MesWcEquipment extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java index 68b7ee0..6107f00 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WINDOW") @Api("MES_看板界面") public class MesWindow extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java index f51864f..dfd0af0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WINDOW_MODULE") @Api("MES_界面组件配置") public class MesWindowModule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java index 4add812..61bef35 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WINDOW_MODULE_PARAM") @Api("MES_界面组件参数配置") public class MesWindowModuleParam extends BaseBean implements Serializable { 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 f275899..d257687 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,7 +6,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL") @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { @@ -66,6 +70,19 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工作单元端口") private String workCellPort; + @Column(name = "GRADE") + @ApiParam("工位等级") + private Integer grade; + + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("目标合格率") + private Double targetPassRate; + + @Column(name = "STAND_TAKT") + @ApiParam("标准节拍") + private Integer standTakt; + @Transient @ApiParam(value = "子集列表") private List childTreeList; @@ -84,4 +101,8 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工位类型名称") private String workCellTypeName; + @Transient + @ApiParam("安灯呼叫状态") + private Integer andonQueueStatus; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java similarity index 76% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java index 025ae54..21b5ba5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java @@ -1,9 +1,11 @@ -package cn.estsh.i3plus.pojo.mes.bean.template; +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_DEFECT") @Api("MES_工位缺陷") public class MesWorkCellDefect extends BaseBean implements Serializable { @@ -47,7 +50,15 @@ public class MesWorkCellDefect extends BaseBean implements Serializable { @ApiParam("物料集") private String partAssemble; + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "DEFECT_TYPE") + @ApiParam("缺陷类型") + private String defectType; + @Transient @ApiParam("缺陷名称") - private String defectCodeName; + private String defectName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java index aede8be..911ed12 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,8 +28,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_MODULE") -@Api("作业程序组件参数") +@Api("工作单元组件配置") public class MesWorkCellModule extends BaseBean implements Serializable { private static final long serialVersionUID = -3537487776977917751L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java index 2bb4bcf..6ab124d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_MODULE_PARAM", indexes = { @Index(columnList = "CREATE_DATE_TIME") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index 324db04..72d2cc4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -22,6 +24,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "WORK_CENTER_CODE") @@ -58,7 +61,6 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable { @ApiParam("流程") private String routeCOde; - @Lob @Column(name = "MESSAGE") @ApiParam("异常信息") private String message; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java index c5aaec2..92314e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") public class MesWorkCellParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index 2b85a2b..820118f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_PARAM_CFG") @Api("工作单元参数配置") public class MesWorkCellParamCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 9ab0cb3..dd254da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -6,14 +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 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 javax.persistence.*; import java.io.Serializable; import java.util.List; @@ -29,7 +29,14 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_POINT") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WORK_CELL_POINT", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "QUEUE_SEQ"), + @Index(columnList = "QUEUE_DETAIL_SEQ") +}) @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { @@ -42,11 +49,13 @@ public class MesWorkCellPoint extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 91a7275..1f8e24f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -4,14 +4,14 @@ 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 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 javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +26,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_POINT_GROUP") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WORK_CELL_POINT_GROUP", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "QUEUE_GROUP_NO"), + @Index(columnList = "ORDER_NO") +}) @Api("工站分组队列") public class MesWorkCellPointGroup extends BaseBean implements Serializable { @@ -51,11 +58,13 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("主队列编号") private String orderNo; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; @@ -75,6 +84,10 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; + @Transient @ApiParam("显示颜色") private String color; @@ -87,6 +100,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("产品位置代码") private String produceCategoryCode; + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Transient + @ApiParam("状态") + private String statusName; + public double getQueueSeqVal() { return this.queueSeq == null ? 0 : this.queueSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java index 153521a..c7e7c7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_SKILL") @Api("MES_工位技能表") public class MesWorkCellSkill extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java new file mode 100644 index 0000000..870d363 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 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 java.io.Serializable; + +/** + * @Description :配置表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WORK_CELL_STATUS") +@Api("工位运行状态") +public class MesWorkCellStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 102975351699481524L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TIME_OUT_STATUS") + @ApiParam("超时状态") + private Integer timeOutStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "DELAY_HELP_STATUS") + @ApiParam("延迟帮助状态") + private Integer delayHelpStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "EMERGENCY_STOP_STATUS") + @ApiParam("紧急停止状态") + private Integer emergencyStopStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "FINISH_COUNT") + @ApiParam("完成数量") + private Integer finishCount = 0; + + +} 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 a80febf..91703ac 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,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CENTER") @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { @@ -71,6 +74,22 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("工位监控模式") private Integer monitorType; + @Column(name = "PLAN_TAKT") + @ApiParam("节拍") + private Integer planTakt; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + @Column(name = "IS_EQU_MONITOR") + @ApiParam("是否需要设备自动报警") + private Integer isEquMonitor; + + @Column(name = "IS_TEMPORARY") + @ApiParam("是否临时开线") + private Integer isTemporary = 2; + @Transient @ApiParam(value = "子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java similarity index 58% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java index 2200ceb..e7a6ce1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java @@ -1,15 +1,20 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; import java.io.Serializable; /** @@ -22,21 +27,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { - @Index(columnList = "CREATE_DATE_TIME") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WORK_CENTER_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "WORK_CENTER_CODE") }) @Api("工位监控异常信息") -public class MesWorkCellMonitorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -5634446206963213556L; +public class MesWorkCenterMonitorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 1432794181428753903L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; @@ -45,20 +48,19 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable { @ApiParam("工单") private String workOrderNo; - @Column(name = "STEP_CODE") - @ApiParam("工步") - private String stepCode; - @Column(name = "PROCESS_CODE") @ApiParam("工序") private String processCode; @Column(name = "ROUTE_CODE") @ApiParam("流程") - private String routeCOde; + private String routeCode; - @Lob @Column(name = "MESSAGE") @ApiParam("异常信息") private String message; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + private Integer busiType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java index d431ff4..8e9546a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORKDAY") @Api("MES_工作日历表") public class MesWorkDay extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java index 37f87bf..2bd3e0f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_MODULE") @Api("作业程序组件") public class MesWorkModule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java index 08699c4..561e245 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_MODULE_PARAM") @Api("作业程序组件参数") public class MesWorkModuleParam extends BaseBean implements Serializable { 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 677525f..6d92fb6 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,14 +5,16 @@ 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; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description: @@ -26,10 +28,15 @@ import java.util.Map; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}, - uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) - }) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WORK_ORDER", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "AREA_CODE"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WO_STATUS") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +}) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; @@ -50,23 +57,28 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -76,7 +88,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Column(name = "IS_PULL") @ApiParam("是否投料") - private Integer isPull = 2; + private Integer isPull = 1; @Column(name = "WO_TYPE") @ApiParam("工单类型") @@ -146,15 +158,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty; @@ -183,11 +198,19 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("父阶物料号") private String parentPartNo; + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + @Column(name = "SORT_SEQ") + @ApiParam("排序序号") + private String sortSeq; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") @@ -290,6 +313,135 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户集合") private List custList; + @Transient + @ApiParam("工位完成数量") + private Integer stationCompleteQty = 0; + + @Transient + @ApiParam("客户物料号") + private String customerPartNo; + + @Transient + @ApiParam("客户物料名称") + private String customerPartName; + + @Transient + @ApiParam("客户物料颜色") + private String customerPartColor; + + @Transient + @ApiParam("项目名称") + private String prodCfgTypeName; + + @Transient + @ApiParam("颜色代码") + private String colorCode; + + @Transient + @ApiParam("挂架数") + private Integer shelvesAmount; + + @Transient + @ApiParam("供漆罐代码") + private String paintTankCode; + + @Transient + @ApiParam("计划报表标识") + private String reportFormCode; + + @Transient + @ApiParam("一检数量") + private Integer firstInspectionQty; + + @Transient + @ApiParam("二检数量") + private Integer secondInspectionQty; + + @Transient + @ApiParam("子零件") + private String itemPartNo; + + @Transient + @ApiParam(value = "子零件数量", example = "0") + private Double itemQty = 0d; + + @Transient + @ApiParam(value = "子零件总数", example = "0") + private Double itemQtyCount = 0d; + + @Transient + @ApiParam("是否虚拟件") + private Integer isFictive = 2; + + @Transient + @ApiParam("行颜色") + private String rowColor; + + @Transient + @ApiParam("一检数量") + private Integer endCheckQty; + + @Transient + @ApiParam("打包数量") + private Integer finalInspectionQty; + + @Transient + @ApiParam("已报工数量") + private Integer productOffLineQty; + + @Transient + @ApiParam("生产节拍") + private Integer takt; + + @Transient + @ApiParam("容器号") + private String ctNo; + + /********************** 动态冗余字段（界面维护大写） *********************************/ + + @Transient + @ApiParam("基准时间") + private String standardDate; + + @Transient + @ApiParam("圈数") + private Integer rounds; + + @Transient + @ApiParam("节拍") + private String chainSpeed; + + @Transient + @ApiParam("小车号") + private String smallCarNo; + + @Transient + @ApiParam("小车数量") + private String smallCarAmount; + + @Transient + @ApiParam("标包") + private String standardPackage; + + @Transient + @ApiParam("包规代码") + private String packageGauge; + + @Transient + @ApiParam("反喷标识") + private String reverseSprayMark; + + @Transient + @ApiParam("模具编号集合") + private String mouldCodeList; + + @Transient + @ApiParam("不良数量") + private Integer ngQty; + + + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -322,4 +474,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { return this.approvalStatus == null ? 0 : this.approvalStatus; } + public MesWorkOrder() { + } + + public MesWorkOrder(String orderNo, String startTime, String workCenterCode, Double qty, + String partNo, String partNameRdd, String itemPartNo, Double itemQty) { + this.orderNo = orderNo; + this.startTime = startTime; + this.workCenterCode = workCenterCode; + this.qty = qty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.itemPartNo = itemPartNo; + this.itemQty = itemQty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 6213888..b58e654 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -4,7 +4,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_ORDER_LOG", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "CREATE_DATE_TIME") @@ -47,23 +51,28 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -71,6 +80,10 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("工单状态") private Integer workOrderStatus; + @Column(name = "IS_PULL") + @ApiParam("是否投料") + private Integer isPull = 1; + @Column(name = "WO_TYPE") @ApiParam("工单类型") private Integer workOrderType; @@ -139,15 +152,18 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty; @@ -176,6 +192,14 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("父阶物料号") private String parentPartNo; + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name = "SORT_SEQ") + @ApiParam("排序序号") + private String sortSeq; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java new file mode 100644 index 0000000..12105de --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java @@ -0,0 +1,60 @@ +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 javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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; + +/** + * @Description :MES_工单启动池 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WORK_START_CACHE") +@Api("MES_工单启动池") +public class MesWorkStartCache extends BaseBean implements Serializable { + private static final long serialVersionUID = 4320604250440221045L; + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "PAUSE_TIME") + @ApiParam("暂停时间") + private String pauseTime; + + @Column(name = "ACTUAL_START_TIME") + @ApiParam("实际启动时间") + private String actualStartTime; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java index a043ec9..7fe740a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_IMPORT_TEMPLATE") @Api("导入模板信息") public class BasImportTemplate extends BaseBean{ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java index 736b6ba..b0be4c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_IMPORT_TEMPLATE_DETAILS") @Api("导入模板明细信息") public class BasImportTemplateDetails extends BaseBean{ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java index 76123e8..409f31b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java @@ -9,7 +9,9 @@ public class MesInterfaceEnumUtil { SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"); + WMS2MES(40, "WMS2MES", "WMS --> MES"), + MES2SAP(50, "MES2SAP", "MES --> SAP"), + SAP2MES(60, "SAP2MES", "SAP --> MES"); private int value; private String name; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java index f61a055..c798811 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java @@ -4,11 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; -import javax.script.CompiledScript; /** * 脚本持久化实体类 @@ -20,39 +20,47 @@ import javax.script.CompiledScript; @Entity @DynamicInsert @DynamicUpdate +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE") +@Table(name = "MES_SCRIPT_PERSISTENCE", indexes = { + @Index(columnList = "SCRIPT_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; + // 脚本的中文名称 @Column(name = "SCRIPT_NAME", length = 50) private String scriptName; + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 @Column(name = "SCRIPT_TYPE") - private int scriptType; + private Integer scriptType; + // 脚本编写的语言 // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby @Column(name = "LANGUAGE_TYPE") - private int languageType; + private Integer languageType; + // 脚本的具体内容 @Lob - @Column(name = "SCRIPT_CONTENT") + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") private String scriptContent; + // 脚本的描述，包含脚本的用法，参数说明等 @Column(name = "SCRIPT_REMARK", length = 2000) private String scriptRemark; + // 编译后的脚本内容，通过预编译加快脚本的运行速度 @Transient - private CompiledScript compiledScript; - - public EngineScriptPersistence() { - } + private Object compiledScript; // 构造方法，便于批量创建数据 - public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType, + public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType, String scriptContent, String scriptRemark) { this.id = id; this.scriptNo = scriptNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java new file mode 100644 index 0000000..85ff399 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.engine.script; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * 脚本持久化历史记录 + * + * @author jason.niu + * @since 2020-04-29 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRIPT_PERSISTENCE_HISTORY") +@Api("系统动态脚本") +public class EngineScriptPersistenceHistory extends BaseBean { + + private static final long serialVersionUID = 7201021903118622899L; + // 脚本调用的唯一编号，例如：WMS_PDA_0001 + @Column(name = "SCRIPT_NO", length = 50) + private String scriptNo; + + // 脚本的中文名称 + @Column(name = "SCRIPT_NAME", length = 50) + private String scriptName; + + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 + @Column(name = "SCRIPT_TYPE") + private Integer scriptType; + + // 脚本编写的语言 + // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + @Column(name = "LANGUAGE_TYPE") + private Integer languageType; + + // 脚本的具体内容 + @Lob + @Column(name = "SCRIPT_CONTENT") + private String scriptContent; + + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private Object compiledScript; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java new file mode 100644 index 0000000..2a6ab3e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.engine.script; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 脚本执行日志 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-29 + * @Modify: + **/ +@Data +@Api("插件日志") +public class ScriptLoggerModel { + @ApiParam("工厂") + private Boolean error; + + @ApiParam("日志内容") + private String context; + + @ApiParam("日志打印日期") + private String printDate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java new file mode 100644 index 0000000..7c8b17f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmContinuousConfig; +import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmLevelConfig; +import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmRecord; +import lombok.Data; + +import java.util.List; +import java.util.concurrent.Delayed; +import java.util.concurrent.TimeUnit; + +/** + * @author Wynne.Lu + * @date 2020/9/28 13:26 + * @desc + */ +@Data +public class AlarmMessage implements Delayed { + + private MesTaktAlarmRecord taktAlarmRecord; + + private List levelConfigs; + + private List continuousConfigs; + + private long time; + + public AlarmMessage(MesTaktAlarmRecord taktAlarmRecord, List levelConfigs, + List continuousConfigs, long time, TimeUnit unit) { + this.taktAlarmRecord = taktAlarmRecord; + this.levelConfigs = levelConfigs; + this.continuousConfigs = continuousConfigs; + this.time = System.currentTimeMillis() + (time > 0 ? unit.toMillis(time) : 0); + } + + @Override + public long getDelay(TimeUnit unit) { + return time - System.currentTimeMillis(); + } + + @Override + public int compareTo(Delayed o) { + AlarmMessage alarmMessage = (AlarmMessage) o; + long diff = this.time - alarmMessage.time; + if (diff <= 0) { + return -1; + } else { + return 1; + } + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java new file mode 100644 index 0000000..bbf317e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class AssembleDefectModel { + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("抛光层级model") + private AssembleDefectModel polishingModel; + + @ApiParam("拆解层级model") + private AssembleDefectModel disassembleModel; + + @ApiParam("不良类型集合") + private List defectModelList; + + @ApiParam("类型代码") + private String typeCode; + + @ApiParam("类型名称") + private String typeName; + + @ApiParam("不良集合") + private List defectList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java new file mode 100644 index 0000000..166c188 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/9/2 5:00 下午 + * @Modify: + */ +@Data +public class AssistModuleModel { + + @ApiParam("标准节拍") + private Integer standTakt; + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("y坐标内容") + private List yAxis; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java new file mode 100644 index 0000000..9721df9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BarRequestModel.java @@ -0,0 +1,134 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/24 16:50 + * @desc + */ +public class BarRequestModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("关键数据代码") + private String keyData; + + @ApiParam("零件号") + private List partNos; + + @ApiParam("单组数量") + private Integer count; + + @ApiParam("组数") + private Integer groupCount; + + @ApiParam("总数") + private Integer totalCount; + + @ApiParam("开始时间") + private String startTime; + + @ApiParam("结束时间") + private String endTime; + + @ApiParam("均值图") + private boolean xbar; + + @ApiParam("极差图") + private boolean rbar; + + @ApiParam("正太分布图") + private boolean normalDistribution; + + public String getWorkCenterCode() { + return workCenterCode; + } + + public void setWorkCenterCode(String workCenterCode) { + this.workCenterCode = workCenterCode; + } + + public String getKeyData() { + return keyData; + } + + public void setKeyData(String keyData) { + this.keyData = keyData; + } + + public List getPartNos() { + return partNos; + } + + public void setPartNos(List partNos) { + this.partNos = partNos; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public Integer getGroupCount() { + return groupCount; + } + + public void setGroupCount(Integer groupCount) { + this.groupCount = groupCount; + } + + public Integer getTotalCount() { + return this.count * this.groupCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public boolean isXbar() { + return xbar; + } + + public void setXbar(boolean xbar) { + this.xbar = xbar; + } + + public boolean isRbar() { + return rbar; + } + + public void setRbar(boolean rbar) { + this.rbar = rbar; + } + + public boolean isNormalDistribution() { + return normalDistribution; + } + + public void setNormalDistribution(boolean normalDistribution) { + this.normalDistribution = normalDistribution; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java new file mode 100644 index 0000000..012f7d6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java @@ -0,0 +1,128 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/28 2:37 下午 + * @Modify: + */ +@Data +public class BiModel implements Serializable { + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "计划数量") + private double planQty = 0; + + @ApiParam(value = "合格数量") + private double passQty = 0; + + @ApiParam(value = "不良数量") + private double ngQty = 0; + + @ApiParam(value = "实际数量") + private double actualQty = 0; + + @ApiParam(value = "合格率") + private double passRate; + + @ApiParam(value = "不良率") + private double ngRate; + + @ApiParam(value = "警戒值") + private double sentinelValue; + + @ApiParam(value = "总数") + private double total; + + @ApiParam(value = "合格数") + private double qualifiedQty = 0; + + @ApiParam(value = "不合格数") + private double unQualifiedQty = 0; + + @ApiParam(value = "合格率") + private double qualifiedRate = 0; + + @ApiParam(value = "一次合格率") + private double onceQualifiedRate = 0; + + @ApiParam(value = "不合格率") + private double unQualifiedRate = 0; + + @ApiParam("目标合格率") + private double targetPassRate = 0; + + @ApiParam("颜色标识") + private Integer colorFlag = 0; + + @ApiParam("首检") + private Integer firstCheck; + + @ApiParam("巡检") + private Integer onSiteCheck; + + @ApiParam("首件") + private Integer firstArticle; + + @ApiParam("中件") + private Integer mediumSized; + + @ApiParam("末件") + private Integer lastPiece; + + @ApiParam("末检") + private Integer endCheck;//首件、30中件、40末件 + + @ApiParam("质量状态") + private Integer qcStatus; + + private double qty; + + @ApiParam("比率") + private double rate; + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("一些携带值 eg:异常类型，异常次数") + private Map carryMap; + + @ApiParam("图表显示的数据") + private List series; + + @ApiParam("列名") + private Map colMap; + + public BiModel() {} + + public BiModel(Double qty, String partNo) { + this.qty = qty; + this.partNo = partNo; + } + + public BiModel(String workCellCode, String partNo, Integer qcStatus) { + this.workCellCode = workCellCode; + this.partNo = partNo; + this.qcStatus = qcStatus; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index 8076ead..4ac3d6d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -41,8 +41,30 @@ public class BoardModel { @ApiParam("当天停机时间(min)") private String theDayShutDownTime; + + @ApiParam("今日产量") + private Integer actualCapacity; + + @ApiParam("月计划产量") + private Integer monthPlanCapacity; + + @ApiParam("停机时间") + private double stopTime; + + @ApiParam("时段产能") + private Integer hourCapacity; + + @ApiParam("计划节拍") + private Integer planTakt = 0; + + @ApiParam("今日完成产量") + private Integer completeCapacity = 0; + + @ApiParam("时段产能") + private Integer periodCapacity = 0; + @ApiParam("看板时段计划产量") - private List boardShiftSectionCapacityList; + private List boardShiftSectionCapacityList; @ApiParam("看板设备状态") private List boardEquStatusList; @@ -55,4 +77,7 @@ public class BoardModel { @ApiParam("工位状态监控明细") private List boardWorkCellList; + + @ApiParam("天津麦格纳看板") + private MgnBoardAreaYieldModel mgnBoardAreaYieldModel; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java new file mode 100644 index 0000000..2883a02 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 业务队列model + * @Reference: + * @Author: wangjie + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class BusiQueueDispatchModel { + + @ApiParam("实现类") + private Object busDispatchervice; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("key") + private String key; + + @ApiParam("数据") + private Object Obj; + + @ApiParam("信息") + private String info; + + @ApiParam("集合") + private List list; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java index 2e7cfef..08ba812 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -21,7 +21,7 @@ public class BypassModel { private String bypassCode; @ApiParam("检测项") - private String businessValue; + private String checkName; @ApiParam("是否确认，1=已确认，2=未确认") private String isVerify; @@ -29,4 +29,16 @@ public class BypassModel { @ApiParam("生产数据ID") private Long productDataId; + @ApiParam("BYPASS项序号") + private Integer bypassSeq; + + @ApiParam("状态") + private String status; + + @ApiParam("检测结果") + private Integer result; + + @ApiParam("颜色") + private String color; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java new file mode 100644 index 0000000..9eeb99a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: Dominic + * @CreateDate: 2019\11\28 19:50 + * @Modify: + **/ +@Data +public class CosmaDefectModel { + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("类型") + private String type; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("缺陷代码集合") + private List defectCodeList; + + @ApiParam("缺陷位置") + private String location; + + @ApiParam("操作人") + private String userName; + + @ApiParam("报废原因") + private String scrapCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 3d121d7..0f07531 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -22,7 +22,25 @@ public class DataReviewModel { @ApiParam("实际数量") private String realNum; + @ApiParam("检测次数") + private String checkTimes; + @ApiParam("对象代码") private String objectCode; + @ApiParam("末检是否合格") + private String lastDataResult; + + @ApiParam("是否合格标识") + private Integer reviewFlag; + + @ApiParam("是否合格") + private String reviewResult; + + @ApiParam("显示标识") + private Integer showFlag; + + @ApiParam("颜色") + private String color; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java new file mode 100644 index 0000000..4cc7cf7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class DismantleRecordModel { + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("用户") + private String userInfo; + + @ApiParam("物料拆解集合") + private List dismantleRecordList; + + @ApiParam("不良集合") + private List defectList; + + @ApiParam("返修工位标志") + private String repairFlag; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquAutoAlarmModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquAutoAlarmModel.java new file mode 100644 index 0000000..f25fce6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquAutoAlarmModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/29 11:42 + * @desc + */ +@Data +public class EquAutoAlarmModel implements Serializable { + private static final long serialVersionUID = -8671950864141698966L; + + private String org; + + private String workCenterCode; + + private Integer takt; + + private String plcTagAddr; + + private String levelCode; + + private String startTime; + + private String endTime; + + private Integer isFinished = MesPcnEnumUtil.EQU_AUTO_ALARM_TYPE.NORMAL.getValue(); + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java new file mode 100644 index 0000000..4e8de2f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 异步任务model + * @Reference: + * @Author: wangjie + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class FutrueTaskModel { + + @ApiParam("实现类") + private Object futrueTaskService; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("数据") + private Object Obj; + + @ApiParam("集合") + private List list; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index c130f5b..171102c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -88,6 +88,27 @@ public class GenSerialNoModel { @ApiParam("零件号后4位") private String partNoAfterFour; + @ApiParam("客户工厂代码") + private String custProdLineCode; + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("版本号") + private String versionNo; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("颜色名称") + private String colorName; + + @ApiParam("拼接动态字符,多个逗号分隔") + private String dynamicRule; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/HncDataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/HncDataReviewModel.java new file mode 100644 index 0000000..8117bef --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/HncDataReviewModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("海纳川数据复核model") +public class HncDataReviewModel { + + @ApiParam("关键件") + private String itemPartNo; + + @ApiParam("关键件名称") + private String itemPartName; + + @ApiParam("需要数量") + private String needNum; + + @ApiParam("实际数量") + private String realNum; + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("是否合格标识") + private Integer reviewFlag; + + @ApiParam("是否合格") + private String reviewResult; + + @ApiParam("关键件颜色") + private String keyPartColor; + + @ApiParam("生产数据颜色") + private String prodDataColor; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java new file mode 100644 index 0000000..b2cc171 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/2/19 2:58 PM + * @Modify: + */ +@Data +public class IfReportModel { + + @ApiParam("接口表代码") + private String ifTableCode; + + @ApiParam("接口表名称") + private String ifTableName; + + @ApiParam("总数") + private Integer total; + + @ApiParam("已同步数量") + private Integer alreadySync; + + @ApiParam("未同步数量") + private Integer noSync; + + @ApiParam("修改时间") + private String modifyDatetime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingDetailModel.java new file mode 100644 index 0000000..4468c74 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingDetailModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/9 18:00 + * @desc TJ注塑上料展示组件顶部数据集合model + */ +@Data +public class InjectionFeedingDetailModel { + + @ApiParam("是否选中：1=是，2=否") + private Integer isCheck = 2; + + @ApiParam("机台编号") + private String workCenterCode; + + @ApiParam("机台名称") + private String workCenterName; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("工单状态") + private Integer workOrderStatus; + + @ApiParam("工单状态名称") + private String workOrderStatusName; + + @ApiParam("工单计划数量") + private String qty; + + @ApiParam("颜色") + private String color; + + @ApiParam("错误信息") + private String error; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java new file mode 100644 index 0000000..7148de0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wangjie + * @date 2020/4/9 18:00 + * @desc TJ注塑上料展示组件顶部数据model + */ +@Data +public class InjectionFeedingModel { + + @ApiParam("料箱") + private String rackNo; + + @ApiParam("原材料物料号") + private String partNo; + + @ApiParam("原材料物料名称") + private String partName; + + @ApiParam("是否锁定：1=是，2=否") + private Integer lockFlag; + + @ApiParam("机台工单集合") + private List detailModelList = new ArrayList<>(); + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("组织代码") + private String organizeCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java index 0b33b5d..1544ebe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java @@ -45,6 +45,12 @@ public class InjectionProductionControlModel { @ApiParam("箱条码状态") private String printStatusName; + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + @ApiParam("序号") private Integer index; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java new file mode 100644 index 0000000..b3105ce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/28 2:37 下午 + * @Modify: + */ +@Data +public class LogisticsBiModel implements Serializable { + + @ApiParam(value = "去年每月发运数量") + private double lastQty = 0; + + @ApiParam(value = "今年每月发运数量") + private double thisQty = 0; + + @ApiParam(value = "比例值") + private double annualRatio = 0; + + @ApiParam(value = "月份") + private Integer month; + + @ApiParam(value = "实际出库数量") + private double outQty = 0; + + @ApiParam(value = "BP总数") + private double bpQty= 0; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java new file mode 100644 index 0000000..6d0c829 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/15 5:34 PM + * @Modify: + */ +@Data +public class MaterialLotModel implements Serializable { + + private static final long serialVersionUID = -3438339005176732840L; + private Long id; + @ApiParam("条码") + private String sn; + + private String modifyDateTime; + + @ApiParam("供应商批次") + private String dateCode; + + @ApiParam("收货日期") + private String lotNo; + + @ApiParam("特殊批次") + private String fixLotNo; + + @ApiParam("生产日期") + private String leftCode; + + @ApiParam("物料代码") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("数量") + private String qty; + + @ApiParam("源仓库代码") + private String srcWhNo; + + @ApiParam("源存储区代码") + private String srcZoneNo; + + @ApiParam("源库位代码") + private String srcLocateNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java new file mode 100644 index 0000000..59a4d30 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * + */ + +/** + * @Description: 中航-工位停线原因（取AndonManageQueue数据） + * @CreateDate: 2020/11/2 + * @Author: simon.song + */ +@Data +public class MesAndonManageQueueModel { + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("故障名称") + private String acDesc; + + @ApiParam("故障来源") + private String workCellNameRdd; + + @ApiParam("安灯类型") + private String alarmDetailNameRdd; + + @ApiParam("事件描述") + private String ecDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java new file mode 100644 index 0000000..5e12c33 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :中航-每小时产量 + * @Reference : + * @author: dominic + * @date: 2020/10/23 13:46 + * @Modify: + */ + +@Data +public class MesBoardHourProductCountModel { + @ApiParam("时间段") + private String hour; + + @ApiParam("计数") + private Integer count; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java new file mode 100644 index 0000000..2c9bcb2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 中航-产线概况-产线概况 + * @CreateDate: 2020/10/19 + * @Author: simon.song + */ +@Data +public class MesBoardWorkCenterOverviewModel { + @ApiParam("看板代码") + private String boardCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @ApiParam("图片路径") + private String imageUrl; + + @ApiParam("工单列表") + List workOrderList; + + @ApiParam("班组信息") + MesShiftGroup shiftGroup; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java new file mode 100644 index 0000000..41a9001 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 中航-产线状态图 + * @CreateDate: 2020/11/2 + * @Author: simon.song + */ +@Data +public class MesBoardWorkCenterStatusModel { + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("实时节拍") + private String realTimeTakt; + + @ApiParam("工位状态列表") + private List workCellStatusList; + + @ApiParam("工位停线原因") + private List workCellStopLineList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java new file mode 100644 index 0000000..d3f4b25 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +public class MesControlPlanModel { + + @ApiParam("控制计划主键ID") + private Long id; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户名称") + private String custName; + + @ApiParam("版本号") + private Integer version; + + @ApiParam("审核状态") + private Integer auditType; + + @ApiParam("是否启用") + private Integer isEnable; + + @ApiParam("是否删除") + private Integer isCutOut; + + @ApiParam("质量标准数组") + private List standardList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java new file mode 100644 index 0000000..5a4db82 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java @@ -0,0 +1,137 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 控制计划导入模板 + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +@Api(value = "控制计划导入模板", description = "控制计划导入模板") +public class MesControlPlanTemplateModel extends BaseBean { + + private static final long serialVersionUID = 6846982556729401884L; + + @ApiParam("工作中心代码") + @AnnoOutputColumn + private String workCenterCode; + + @ApiParam("物料编码") + @AnnoOutputColumn + private String partNo; + + @ApiParam("物料名称") + @AnnoOutputColumn + private String partName; + + @ApiParam("客户代码") + @AnnoOutputColumn + private String custCode; + + @ApiParam("客户名称") + @AnnoOutputColumn + private String custName; + +// @ApiParam("控制计划版本号") +// @AnnoOutputColumn +// private Integer controlPlanVersion; + +// @ApiParam("是否启用") +// @AnnoOutputColumn +// private Integer isEnable; + + + /** + * 中航质量标准明细表 + */ + @ApiParam("工作单元代码") + @AnnoOutputColumn + private String workCellCode; + +// @ApiParam("质量标准版本") +// @AnnoOutputColumn +// private Integer qualityStandardVersion; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @ApiParam("检测类型") + @AnnoOutputColumn + private Integer checkType; + + @ApiParam("检测项类型") + @AnnoOutputColumn + private String checkItemType; + + @ApiParam("检测项") + @AnnoOutputColumn + private String checkItem; + + @ApiParam("检测标准") + @AnnoOutputColumn + private String checkStandard; + + @ApiParam("检测指导") + @AnnoOutputColumn + private String checkGuide; + + @ApiParam("频率") + @AnnoOutputColumn + private String checkFrequency; + + @ApiParam("是否允许让步") + @AnnoOutputColumn + private Integer isConcession; + + @ApiParam("间隔时间") + @AnnoOutputColumn + private Integer checkInterval = 0; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @ApiParam("个数标识") + @AnnoOutputColumn + private String numberFlag; + + @ApiParam("检测数量") + @AnnoOutputColumn + private Integer qty; + + //任务单类型,动态枚举 + @ApiParam("任务单类型") + @AnnoOutputColumn + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @ApiParam("数据来源") + @AnnoOutputColumn + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @ApiParam("检验值类型") + @AnnoOutputColumn + private String checkValueType; + + @ApiParam("公差上限") + @AnnoOutputColumn + private Double maximum = 0d; + + @ApiParam("公差下限") + @AnnoOutputColumn + private Double minimum = 0d; + + @ApiParam("是否关键检测项") + @AnnoOutputColumn + private Integer isKeyCheckItem; + + @ApiParam("检测值配置编号") + @AnnoOutputColumn + private String checkCfgNo; + + @ApiParam("序号") + @AnnoOutputColumn + private Integer seq; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java new file mode 100644 index 0000000..5d5f06c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @CreateDate: 2020/9/24 + * @Author: simon.song + */ +@Data +public class MesDbCheckRecordModel { + @ApiParam("主键") + private Long id; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("零件名称") + private String partDesc; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("缺陷原因") + private String defectDesc; + + @ApiParam("生产记录表主键ID") + private Long productDataId; + + public MesDbCheckRecordModel(Long id, String serialNumber, String partNo, String partDesc, String defectDesc, Long productDataId) { + this.id = id; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partDesc = partDesc; + this.defectDesc = defectDesc; + this.productDataId = productDataId; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index e632a49..0fdaca2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; @Data public class MesEquTaskPlanModel implements Serializable { @@ -19,8 +22,8 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("作业类型") private Integer taskType; - @ApiParam("周期(天)") - private Integer taskCycle; + @ApiParam("计划配置代码") + private String planCfgCode; @ApiParam("上一执行时间") private String lastTime; @@ -67,17 +70,22 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("设备类别名称") private String equipmentCategoryName; + @ApiParam("设备周期计划配置") + private MesEquTaskPlanCfg planCfg; + + @ApiParam("设备作业要求") + private List equTaskStandards; public MesEquTaskPlanModel() { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) { + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String planCfgCode, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.taskType = taskType; - this.taskCycle = taskCycle; + this.planCfgCode = planCfgCode; this.lastTime = lastTime; this.daysInAdvance = daysInAdvance; this.memo = memo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index 732f977..441bb08 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -64,6 +64,9 @@ public class MesEquTaskStandardModel implements Serializable { @ApiParam("设备类别") private String equipmentCategoryName; + @ApiParam("操作指导文件路径") + private String actionGuideUrl; + public MesEquTaskStandardModel() { @@ -72,7 +75,8 @@ public class MesEquTaskStandardModel implements Serializable { public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, - String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard) { + String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard, + String actionGuideUrl) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -90,5 +94,6 @@ public class MesEquTaskStandardModel implements Serializable { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; this.modifyDatetimeStandard = modifyDatetimeStandard; + this.actionGuideUrl = actionGuideUrl; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index d1220a7..5a21f16 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -106,13 +106,14 @@ public class MesEquipmentModel implements Serializable { } //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) { + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory, + String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.status = status; this.workCenterCode = workCenterCode; - this.equipmentCategory = equipmentCategory; + this.modifyDatetime = modifyDatetime; } //根据生产线，工位获取设备集合 findMesEquipmentList diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java new file mode 100644 index 0000000..4e4b077 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPackage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/18 16:13 下午 + * @Description: 包装查询报表返回model + **/ +@Api("包装查询报表返回model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MesPackageQueryModel extends MesPackage { + @ApiParam("工序名称") + private String processName; + + @ApiParam("工位") + private String workCellName; + + @ApiParam("产线") + private String workCenterName; + + @ApiParam("是否封箱Name") + private String isSealedName; + + public MesPackageQueryModel(String workCenterName, String workCellName) { + this.workCenterName = workCenterName; + this.workCellName = workCellName; + } + + public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo, String processName, String workCellName, String workCenterName) { + super(packageNo, partNo, partNameRdd, qty, packSpecQty, isSealed, ctNo); + this.processName = processName; + this.workCellName = workCellName; + this.workCenterName = workCenterName; + } + + public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo, String processName, String workCenterName, String workCellName) { + super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo); + this.processName=processName; + this.workCenterName = workCenterName; + this.workCellName = workCellName; + } + + public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName,String isSealedName) { + super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo); + this.isSealedName=isSealedName; + this.processName=processName; + this.workCenterName = workCenterName; + this.workCellName = workCellName; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java index abf1eff..c92b82b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java @@ -1,10 +1,12 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import cn.estsh.i3plus.pojo.mes.bean.MesPackage; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -19,12 +21,18 @@ public class MesPaintSnPrintModel implements Serializable { @ApiParam("过程条码") private String serialNumber; + @ApiParam("过程条码数组") + private List serialNumberList; + @ApiParam("产品条码") private String produceSn; @ApiParam("包装编号") private String packageNo; + @ApiParam("包装信息") + private MesPackage packageInfo; + @ApiParam("工单号") private String workOrderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java new file mode 100644 index 0000000..d825602 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @CreateDate: 2020/9/24 + * @Author: simon.song + */ +@Data +public class MesProductDataDefectModel { + + @ApiParam("生产工单") + private String orderNo; + + @ApiParam("产品编码") + private String partNo; + + @ApiParam("产品名称") + private String partDesc; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("缺陷原因") + private String defectDesc; + + @ApiParam("下线时间") + private String offlineTime; + + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectType, String defectDesc, String offlineTime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partDesc = partDesc; + this.productSn = productSn; + this.defectType = defectType; + this.defectDesc = defectDesc; + this.offlineTime = offlineTime; + } + + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectDesc, String offlineTime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partDesc = partDesc; + this.productSn = productSn; + this.defectDesc = defectDesc; + this.offlineTime = offlineTime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java new file mode 100644 index 0000000..ce492d7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @CreateDate: 2020/9/22 + * @Author: simon.song + */ +@Data +public class MesProductDataModel { + @ApiParam("生产数据表主键ID") + private String id; + + @ApiParam("工位代码") + private String workCellCode; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam("产品包装model") + private List productDataModelList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java new file mode 100644 index 0000000..c68b244 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesQcOrderDetailRecordModel implements Serializable { + private static final long serialVersionUID = -7216132883079491432L; + + @ApiParam("检测人") + private String createUser; + + @ApiParam("检测时间") + private String createDatetime; + + @ApiParam("质检单号") + private String orderNo; + + @ApiParam("判定结果") + private String checkResult; + + @ApiParam("检测值") + private String checkValue; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("检测顺序") + private Integer checkSeq; + + + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("是否允许让步") + private Integer isConcession = 0; + + @ApiParam("检验行号") + private Integer itemNo = 0; + +// @ApiParam("产品条码") +// private String serialNumber; + + @ApiParam("数量") + private Integer qty; + + @ApiParam("已检数量") + private Integer finishQty; + + @ApiParam("最大数") + private Double maximum = 0d; + + @ApiParam("最小数") + private Double minimum = 0d; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("数据源") + private String dataSource; + + @ApiParam("检测值类型") + private String checkValueType; + + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam(value = "检测项类型名称") + private String businessTypeName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java new file mode 100644 index 0000000..50edad0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Description: + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +public class MesQualityStandardModel { + + @ApiParam("质量标准主键ID") + private Long id; + + @ApiParam("控制计划表主键ID") + private Long controlPlanId; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("版本") + private Integer version; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("是否允许让步") + private Integer isConcession; + + @ApiParam("间隔时间") + private Integer checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @ApiParam("个数标识") + private String numberFlag; + + @ApiParam("检测数量") + private Integer qty; + + //任务单类型,动态枚举 + @ApiParam("任务单类型") + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @ApiParam("数据来源") + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @ApiParam("检验值类型") + private String checkValueType; + + @ApiParam("公差上限") + private Double maximum; + + @ApiParam("公差下限") + private Double minimum; + + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam("检测值配置编号") + private String checkCfgNo; + + @ApiParam("序号") + private Integer seq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java new file mode 100644 index 0000000..dd422cb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesShiftRestModel extends MesShiftRest { + + @ApiParam("开始时间") + private String startDate; + + @ApiParam("结束时间") + private String endDate; + + @ApiParam("实际时间差(毫秒)") + private Long subTimes; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java new file mode 100644 index 0000000..e746bd3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MesWorkCellStatusModel { + + @ApiParam("工位运行状态") + private String cellStatus; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("故障类型") + private String alarmName; + + @ApiParam("故障原因") + private String acDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java new file mode 100644 index 0000000..004561a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class MgnBoardAreaYieldModel { + + @ApiParam("组装") + private MgnBoardListModel assembleBoardListModel; + + @ApiParam("涂装") + private MgnBoardListModel paintBoardListModel; + + @ApiParam("注塑") + private MgnBoardListModel injectMoldBoardListModel; + + @ApiParam("组装集合") + private List assembleBoardListModelList; + + @ApiParam("涂装集合") + private List paintBoardListModelList; + + @ApiParam("注塑集合") + private List injectMoldBoardListModelList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java new file mode 100644 index 0000000..075da09 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardAssembleCompRateModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("合格率目标值") + private String qualifiedRateTargetValue; + + @ApiParam("完成率") + private String planCompleteRate; + + @ApiParam("合格率偏差值") + private String fpyDeviationValue; + + @ApiParam("日期") + private String date; + + @ApiParam("目标OEE") + private String planOee; + + @ApiParam("实际OEE") + private String finaOee; + + @ApiParam("OEE红线值") + private String oeeRedLineValue; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷占比") + private String defectProportion; + + @ApiParam("一次目标良品值") + private Double planFirstPassYield; + + @ApiParam("最终目标良品值") + private Double planPassYield; + + @ApiParam("一次良品率") + private String firstQualifiedRate; + + @ApiParam("最终良品率") + private String finalQualifiedRate; + + @ApiParam("不良描述") + private String defectMemo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java new file mode 100644 index 0000000..a6c48c9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardListColorModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("颜色") + private String color; + + @ApiParam("安灯类型") + private String alarmCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java new file mode 100644 index 0000000..de042b5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class MgnBoardListModel { + + @ApiParam("产线产量汇总") + private List centerYieldList; + + @ApiParam("月度产量汇总") + private List monthlyYieldList; + + @ApiParam("当班计划产量") + private Double shiftPlanYield; + + @ApiParam("当班实际产量") + private Double shiftActualYield; + + @ApiParam("时间小时") + private String currentMinTime; + + /** + * 开班时间到当前时间按小时累计计划数量 + */ + @ApiParam("每小时计划产量") + private Double minPlanYield;// + + /** + * 开班时间到当前时间按小时累计实际数量 + */ + @ApiParam("每小时实际产量") + private Double minActualYield;// + + @ApiParam("计划完成率") + private String planCompleteRate; + + @ApiParam("当前数据标识") + private boolean currentInfo; + + @ApiParam("呼叫异常数量") + private Integer exceptQty; + + @ApiParam("响应异常数量") + private Integer responseQty; + + @ApiParam("正常数量") + private Integer normalQty; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("车间") + private String areaCode; + + @ApiParam("颜色") + private String color; + + @ApiParam("产线集合") + private List workCenterList; + + @ApiParam("平均OEE") + private Double oeePercent; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java new file mode 100644 index 0000000..795cfce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardYieldModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("日期") + private String date; + + @ApiParam("计划产量") + private Double planYield; + + @ApiParam("实际产量") + private Double actualYield; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java new file mode 100644 index 0000000..982b340 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnPackageSnTraceReportModel { + + @ApiParam("箱条码") + private String packageNo; + + @ApiParam("托条码") + private String packageNo2; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料编号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam("是否封箱") + private Integer isSealed; + + @ApiParam("是否封箱名称") + private String isSealedName; + + @ApiParam(value = "工厂") + public String organizeCode; + + @ApiParam(value="修改日期查询用，查询起始日期") + public String createDateTimeStart; + + @ApiParam(value = "修改日期查询用，查询结束日期") + public String createDateTimeEnd; + + + @ApiParam(value = "工单号") + public String workOrderNo; + + public MgnPackageSnTraceReportModel() { + } + + public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName, String workOrderNo) { + this.packageNo = packageNo; + this.packageNo2 = packageNo2; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.isSealed = isSealed; + this.createDatetime = createDatetime; + this.workCenterCode = workCenterCode; + this.workCenterName = workCenterName; + this.workOrderNo = workOrderNo; + + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java new file mode 100644 index 0000000..99ff6fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnPaintPolishingReportModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料描述") + private String partDesc; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("日期") + private String modifyDate; + + @ApiParam("开始日期") + private String modifyStartDate; + + @ApiParam("结束日期") + private String modifyEndDate; + + @ApiParam("抛光数量") + private Double polishingQty; + + @ApiParam("返喷标识") + private String reverseSprayMark; + + @ApiParam("打磨件物料号") + private String polishPartNo; + + @ApiParam("打磨件物料描述") + private String polishPartDesc; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("不良处理类型") + private String defectActionType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java new file mode 100644 index 0000000..953350a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NormalDistributionModel.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/26 14:46 + * @desc + */ +@Data +public class NormalDistributionModel { + + @ApiParam("尺寸上限") + private Double usl; + + @ApiParam("尺寸下限") + private Double lsl; + + @ApiParam("柱状图") + private List bar = new ArrayList<>(); + + @ApiParam("曲线图") + private List line = new ArrayList<>(); + + @ApiParam("平均均值-绿线") + private List xAxis = new ArrayList<>(); + + @ApiParam("数据个数") + private Integer totalCount; + + @ApiParam("数据总数") + private Double totalDataSum; + + @ApiParam("平均均值") + private Double xbarbar; + + @ApiParam("平均极差") + private Double rbar; + + @ApiParam("最大值") + private Double maxValue; + + @ApiParam("最小值") + private Double minValue; + + @ApiParam("低于下限数据个数") + private Integer belowLowerLimitCount; + + @ApiParam("高于上限数据个数") + private Integer aboveUpperLimitCount; + + @ApiParam("d2") + private Double d2; + + @ApiParam("n") + private Integer n; + + @ApiParam("高能力指数") + private Double cpu; + + @ApiParam("低能力指数") + private Double cpl; + + @ApiParam("过程能力指数") + private Double cp; + + @ApiParam("过程能力") + private Double cpk; + + @ApiParam("过程比率") + private Double cr; + + @ApiParam("标准偏差n") + private Double stdOffset; + + @ApiParam("标准偏差n-1") + private Double stdOffsetMinusOne; + + @ApiParam("方差n") + private Double variance; + + @ApiParam("方差n-1") + private Double varianceMinusOne; + + @ApiParam("性能指数") + private Double pp; + + @ApiParam("性能比率") + private Double pr; + + @ApiParam("性能指数") + private Double ppk; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java index 9a5b3a8..dc8fe48 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java @@ -1,22 +1,11 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -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.util.List; /** * @Description : 设备任务通知人员model @@ -34,23 +23,18 @@ public class NotifyUserModel extends BaseBean { @ApiParam(value ="账户ID") private Long userInfoId; - @Column(name="USER_NAME_RDD") @ApiParam(value ="用户名称" , access ="账号名称") private String userName; - @Column(name="USER_LOGIN_NAME") @ApiParam(value ="登陆名称" , access ="登陆名称") private String userLoginName; - @Column(name="USER_EMAIL") @ApiParam(value ="邮箱" , access ="邮箱") private String userEmail; - @Column(name="USER_PHONE") @ApiParam(value ="手机号" , access ="手机号") private String userPhone; - @Column(name="USER_STATUS") @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") private Integer userStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java index 2b25ff8..0f8794f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java @@ -3,8 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Transient; - +import java.util.List; /** * @Description: * @Author: jokelin @@ -25,10 +24,15 @@ public class OperateObjectParamModel { @ApiParam("日期") private String oeeDate; + @ApiParam("开始日期") + private String startDatetime; + + @ApiParam("结束日期") + private String endDatetime; + @ApiParam("开始时段") private String startTime; - @Transient @ApiParam("结束时段") private String endTime; @@ -41,4 +45,10 @@ public class OperateObjectParamModel { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam(value = "安灯状态代码") + private String statusCode; + + @ApiParam("设备状态集合") + private List objectParamModelList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java new file mode 100644 index 0000000..9ac27ac --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @author dominic + * @date 2020/11/19 00:47 + * @desc 包装明细 + */ +@Data +@Api("包装明细") +public class PackageDetailModel { + + @ApiParam("料架号") + private String ctNo; + + @ApiParam("容器位置编号") + private String ctLocationNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料编号") + private String partNo; + + public PackageDetailModel(String ctNo, String ctLocationNo, String serialNumber, String partNo) { + this.ctNo = ctNo; + this.ctLocationNo = ctLocationNo; + this.serialNumber = serialNumber; + this.partNo = partNo; + } + + public PackageDetailModel() { + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java new file mode 100644 index 0000000..1ae1fbe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: UNPACK + * @Reference: + * @Author: wangjie + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class PackageUnPackModel { + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("包装条码") + private String packageNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("批次") + private String lotNo; + + @ApiParam("状态") + private Integer status; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("更新时间") + private String modifyDatetime; + + @ApiParam("包装数量") + private String partSpecQty; + + @ApiParam("UNPACK数据") + private List unPackList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java index 9ab41c8..10b1c11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -29,6 +29,9 @@ public class PaintOnLineModel { @ApiParam("物料名称") private String partNameRdd; + @ApiParam("颜色代码") + private String colorCode; + @ApiParam("颜色") private String color; @@ -47,6 +50,24 @@ public class PaintOnLineModel { @ApiParam("圈数") private Integer rounds; + @ApiParam("小车号") + private String smallCarNo; + + @ApiParam("车数") + private Integer smallCarAmount; + @ApiParam("过程条码") private String serialNumber; + + @ApiParam("是否虚拟件") + private Integer isFictive = 2; + + @ApiParam("反喷标识") + private String reverseSprayMark; + + @ApiParam("备注") + private String memo; + + @ApiParam("工单类型") + private String workType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index 2265b41..60a89fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -66,4 +66,8 @@ public class PaintWorkOrderSnModel extends BaseBean { private List prodPackageList; private String partNameRdd; + + @ApiParam("反喷标识--工单类型") + private String reverseSprayMark; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java index 6891043..fa219c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java @@ -32,6 +32,10 @@ public class PlcEquStatusModel implements Serializable { @ApiParam("产线状态") private Integer workCenterStatus; + // 电检设备切换密码 + @ApiParam("电检设备切换密码") + private String equChoosePassWard; + @ApiParam("停机类型") private Integer stopType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index b668562..5595821 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -5,11 +5,7 @@ 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.Transient; /** @@ -20,9 +16,6 @@ import javax.persistence.Transient; * @Modify: **/ @Data -@Entity -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("组织模型") public class ProdOrgModel extends BaseBean { @@ -67,7 +60,18 @@ public class ProdOrgModel extends BaseBean { @ApiParam("工位类型") private Integer workCellType; + @ApiParam("工位等级:正常工位，监控工位") + private Integer grade; + @Transient @ApiParam("序号") private Integer seq; + + @Transient + @ApiParam("工位监控模式") + private Integer monitorType; + + @Transient + @ApiParam("条码生成模式") + private Integer generateType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index 15c9efe..7daee9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -63,6 +63,15 @@ public class ProdPackModel implements Serializable { @ApiParam("是否封箱") public Integer isSealed; + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("是否封箱名称") + private String isSealedName; + public ProdPackModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java index ed73333..5f3da6c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -21,6 +21,12 @@ public class ProductBiModel { @ApiParam("工作中心名称") private String workCenterName; + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + @ApiParam("生产区域代码") private String areaCode; @@ -63,6 +69,18 @@ public class ProductBiModel { @ApiParam("客户名称") private String customerName; + @ApiParam("工单号") + private String orderNo; + + @ApiParam("总页数") + private Integer totalPage; + + @ApiParam("开启工单标识") + private Integer opWoFlag = 2; + + @ApiParam("工位序号") + private Integer workCellSeq; + @ApiParam("x坐标内容") private List xAxis; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java index 17d1089..5ead779 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -20,4 +21,10 @@ public class ProductBiSeriesModel { private String type; @ApiParam("显示的数据") private List data; + @ApiParam("实际数量集合") + private List snQtyList = new ArrayList<>(); + @ApiParam("计划数量集合") + private List planQtyList = new ArrayList<>(); + @ApiParam("零件号") + private String partNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java index 16d5f94..5e1307d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java @@ -21,4 +21,10 @@ public class ProductDataCacheModel { @ApiParam("字段名称") private List productDataModelList; + @ApiParam("创建时间") + private String createDatetime; + + @ApiParam("是否必须是合格") + private Boolean isNecessary = false; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index 81e32c2..681d328 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -81,9 +81,18 @@ public class ProductInfoManageModel { @ApiParam("明细队列序列") private Double queDetailSeq; + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("校验VIN") + private String checkVinCode; + @ApiParam("总队列类型") private List queueTypeList; + @ApiParam("总工单类型") + private List workTypeList; + public ProductInfoManageModel() { } @@ -94,4 +103,15 @@ public class ProductInfoManageModel { this.produceColor = produceColor; this.queDetailSeq = queDetailSeq; } + + public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, + Double queueSeq, String workType, String produceColor) { + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; + this.orderNo = orderNo; + this.queDetailSeq = queDetailSeq; + this.queueSeq = queueSeq; + this.workType = workType; + this.produceColor = produceColor; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java index 405f089..58803e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,19 +19,19 @@ public class QcCheckDataResultModel { private Integer isFirstCheck; @ApiParam("首检结果") - private List firstCheckResult; + private List firstCheckResult; @ApiParam("是否完成巡检") private Integer isOnSiteCheck; @ApiParam("巡检结果") - private List onSiteCheckResult; + private List onSiteCheckResult; @ApiParam("是否完成尾检") private Integer isEndCheck; @ApiParam("尾检结果") - private List endCheckResult; + private List endCheckResult; public QcCheckDataResultModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java new file mode 100644 index 0000000..f470ffb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/9/16 00:24 + * @desc + */ +@Data +public class QcOrderCheckDataDetailModel { + + private Integer checkType; + + private String checkItem; + + private String checkStandard; + + private Integer checkCount; + + private Integer isConcession; + + private Integer isKeyCheckItem; + + private Double max; + + private Double min; + + private String checkValue; + + private Integer checkResult; + + private String serialNumber; + + + public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount, + Integer isConcession, Integer isKeyCheckItem, Double max, Double min, + String checkValue, Integer checkResult, String serialNumber) { + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkCount = checkCount; + this.isConcession = isConcession; + this.isKeyCheckItem = isKeyCheckItem; + this.max = max; + this.min = min; + this.checkValue = checkValue; + this.checkResult = checkResult; + this.serialNumber = serialNumber; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java new file mode 100644 index 0000000..5e40bdc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -0,0 +1,122 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.HashMap; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 9:02 下午 + * @Modify: + */ +@Data +@Api("JIT队列列表Model") +public class QueueJitActualModel { + + private Long id; + @ApiParam("vin") + private String vinCode; + @ApiParam("排序号") + private Double seq; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("JIT排序号") + private String jitSeq; + + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("工单类型") + public Integer workType; + + @ApiParam("工单类型") + public String workTypeName; + + @ApiParam("客户产线代码") + private String custPlantCode; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("明细状态名称") + private Integer detailStatus; + + @ApiParam("明细状态名称") + private String detailStatusName; + + @ApiParam("创建人") + private String createUser; + + @ApiParam("创建时间") + private String createDatetime; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("用量") + private Double qty = 0d; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料号") + private String partName; + + @ApiParam("mgn标识") + private String mgnFlag; + + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); + + public QueueJitActualModel() { + + } + + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custPlantCode, String produceCtgyCode, + String productSn, Integer detailStatus, String createUser, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.workType = workType; + this.custPlantCode = custPlantCode; + this.produceCtgyCode = produceCtgyCode; + this.productSn = productSn; + this.detailStatus = detailStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + } + + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String partNo, String partName, String produceCtgyCode, Double qty, + String createUser, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.partNo = partNo; + this.partName = partName; + this.produceCtgyCode = produceCtgyCode; + this.qty = qty; + this.createUser = createUser; + this.createDatetime = createDatetime; + } + + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String produceCtgyCode, String custPlantCode, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.produceCtgyCode = produceCtgyCode; + this.custPlantCode = custPlantCode; + this.createDatetime = createDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java deleted file mode 100644 index 4cfc59e..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Author: jokelin - * @Date: 2020/3/20 9:02 下午 - * @Modify: - */ -@Data -public class QueueJitActualModule { - - private Long id; - @ApiParam("vin") - private String vinCode; - @ApiParam("排序号") - private Double seq; - @ApiParam("分组队列编号") - private String queueGroupNo; - @ApiParam("组内编号") - private Integer groupNo; - @ApiParam("JIT排序号") - private String jitSeq; - - public QueueJitActualModule() { - - } - - public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) { - this.id = id; - this.vinCode = vinCode; - this.seq = seq; - this.queueGroupNo = queueGroupNo; - this.groupNo = groupNo; - this.jitSeq = jitSeq; - } - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 5f310b4..c0a7427 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -91,9 +91,47 @@ public class QueueOrderModel implements Serializable { @ApiParam("产品位置") private String produceCategoryCode; + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("配方内容") + private String formulaContent; + + @ApiParam("分组序号") + private String groupSeq; + + @ApiParam("客户产线代码") + private String custProdLineCode; + @ApiParam("JIT排序号") + private String jitSeq; + private Integer status; + + @ApiParam("回冲标识") + private String jisBackflushStatus; + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("是否放空") + private Integer isEmpty; + @ApiParam("特殊标识") + private Integer specialFlag; + + @ApiParam("箱条码") + private String packageNo; + public String createDatetime; + public QueueOrderModel() { } + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getFinsihQtyVal() { + return this.finsihQty == null ? 0.0d : this.finsihQty; + } + + public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { this.queueSeq = queueSeq; @@ -174,7 +212,11 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) { + // getPrintSnQueueOrderModel + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo, + String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, + String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType, + String createDatetime) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -183,6 +225,17 @@ public class QueueOrderModel implements Serializable { this.prodCfgCode = prodCfgCode; this.isGroupPrinted = isGroupPrinted; this.jitActualNo = jitActualNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.produceCategoryCode = produceCategoryCode; + this.qty = qty; + this.vinCode = vinCode; + this.queueSeq = queueSeq; + this.groupSeq = groupSeq; + this.serialNumber = serialNumber; + this.custProdLineCode = custProdLineCode; + this.specialFlag = specialFlag; + this.workType = workType; + this.createDatetime = createDatetime; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -203,7 +256,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) { + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String queueGroupNo, Integer groupNo) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -219,6 +272,57 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; this.pptCode = pptCode; this.produceCategoryCode = produceCategoryCode; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + } + + //getWaitQueueOrderModelNoSnMgn + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode, + String vinCode, String formulaContent, String queueGroupNo, String jitSeq) { + this.serialNumber = serialNumber; + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; + this.pptCode = pptCode; + this.produceCategoryCode = produceCategoryCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.vinCode = vinCode; + this.formulaContent = formulaContent; + this.queueGroupNo = queueGroupNo; + this.jitSeq = jitSeq; + } + + //getAlreadyQueueOrderModelNoSnMgn + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, + String queueGroupNo, String produceCategoryCode, String jitSeq) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + this.orderNo = orderNo; + this.serialNumber = serialNumber; + this.prodCfgTypeCode = prodCfgTypeCode; + this.vinCode = vinCode; + this.formulaContent = formulaContent; + this.queueGroupNo = queueGroupNo; + this.produceCategoryCode = produceCategoryCode; + this.jitSeq = jitSeq; } //getAlreadyQueueOrderModelNoSn @@ -239,7 +343,8 @@ public class QueueOrderModel implements Serializable { //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) { + Double queueSeq, Double queDetailSeq, String partNo, + String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode, String serialNumber) { this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.orderNo = orderNo; @@ -250,16 +355,43 @@ public class QueueOrderModel implements Serializable { this.organizeCode = organizeCode; this.vinCode = vinCode; this.produceCategoryCode = produceCategoryCode; + this.serialNumber = serialNumber; } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) { + public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String jisActualNo, String produceCategoryCode, String workType, + String partNo, String prodCfgTypeCode) { this.id = id; + this.orderNo = orderNo; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; this.vinCode = vinCode; - this.organizeCode = organizeCode; + this.jisActualNo = jisActualNo; this.produceCategoryCode = produceCategoryCode; this.workType = workType; + this.partNo = partNo; + this.prodCfgTypeCode = prodCfgTypeCode; + } + + // getQueueJitActualJitSeq + public QueueOrderModel(Long id, Double queueSeq, String serialNumber, String orderNo, String prodCfgTypeCode, String vinCode, String queueGroupNo, String jitSeq, Integer status) { + this.id = id; + this.queueSeq = queueSeq; + this.serialNumber = serialNumber; + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.vinCode = vinCode; + this.queueGroupNo = queueGroupNo; + this.jitSeq = jitSeq; + this.status = status; + } + + // getQueueJitActualDetailByNo + public QueueOrderModel(Long id, String jisActualNo, String serialNumber, String vinCode, String jisBackflushStatus) { + this.id = id; + this.jisActualNo = jisActualNo; + this.serialNumber = serialNumber; + this.vinCode = vinCode; + this.jisBackflushStatus = jisBackflushStatus; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java new file mode 100644 index 0000000..17ed649 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RbarModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/25 16:23 + * @desc + */ +@Data +public class RbarModel { + + @ApiParam("控制上限") + private Double ucl; + + @ApiParam("控制下限") + private Double lcl; + + @ApiParam("极差-蓝线 key组号，value值") + private List maxGap = new ArrayList<>(); + + @ApiParam("平均极差-绿线") + private Double rbar; + + @ApiParam("标准差") + private Double stdDev; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java new file mode 100644 index 0000000..b0e5ec7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPartProduceType; +import cn.estsh.i3plus.pojo.mes.bean.MesProcess; +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 流程工序Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("流程工序Model") +public class RouteProcessModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("产线代码") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("流程类型") + private Integer routeType; + + @ApiParam("流程集合") + private List routeList; + + @ApiParam("工序集合") + private List processList; + + @ApiParam("生产类型集合") + private List pptList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java new file mode 100644 index 0000000..f739965 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 卡斯马报废率趋势查询条件封装类 + * @Reference : + * @Author : dominic + * @CreateDate : 2020-12-24 16:35 + * @Modify: + **/ +@Data +@Api("报废率趋势查询条件封装类") +public class ScrapRateTrendQueryModel { + + @ApiParam("组织机构代码") + private String organizeCode; + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("开始时间") + private String startTime; + + @ApiParam("结束时间") + private String endTime; + + @ApiParam("时间类型") + private String timeType; + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("物料号") + private String partNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java index c6aa422..8048ccc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java @@ -28,6 +28,12 @@ public class SkillsUserModel { @ApiParam(value ="工号") private String userEmpNo; + @ApiParam(value ="工位") + private String workCellCode; + + @ApiParam(value ="产线") + private String workCenterCode; + @ApiParam("技能矩阵信息") private List mesUserSkillList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java index 257a159..fc055aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java @@ -20,6 +20,8 @@ public class SnPrintDataModel { @ApiParam("打印数据") private List valueList; + @ApiParam("打印数据") + private List templateData; @ApiParam("打印模板及参数") private MesLabelTemplate labelTemplate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java new file mode 100644 index 0000000..25a2d08 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachine; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态机流程工序设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工序设计Model") +public class StateMachineRouteDesignModel { + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("用户") + private String userInfo; + + @ApiParam("流程") + private MesRoute route; + + @ApiParam("流程工序(根据Seq分组)") + private Map routeProcessMap; + + @ApiParam("状态机") + private MesStateMachine stateMachine; + + @ApiParam("状态点") + private List stateMachineStatusList; + + @ApiParam("流程工序Id") + private Long routeProcessId; + + @ApiParam("产品流程Id") + private Long prodRouteCfgId; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java new file mode 100644 index 0000000..295df7f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态点设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态点设计Model") +public class StateMachineStatusModel extends MesStateMachineStatus { + + @ApiParam("状态点顺序") + private Integer seq = 0; + + @ApiParam("状态点工步集Map") + private Map> stepGroupMap; + + @ApiParam("下个状态点MAP") + private Map> nextStatusGroupMap; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java new file mode 100644 index 0000000..bf16352 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStep; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 状态机流程工步设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工步设计Model") +public class StateMachineStepModel extends MesStep { + + @ApiParam("工步参数集合") + private List stepParamList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java new file mode 100644 index 0000000..4808522 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStepParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态机流程工步参数设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工步参数设计Model") +public class StateMachineStepParamModel extends MesStepParam { + + @ApiParam("参数值") + private String paramValue; + + @ApiParam("可选值的数据") + private List> enumList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java index 41bf108..7e4a62f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; +import io.swagger.annotations.ApiParam; import lombok.Data; /** @@ -8,14 +9,17 @@ import lombok.Data; * @desc */ @Data -@Deprecated public class StateModel { + @ApiParam("状态点代码") private String stateCode; + @ApiParam("状态点名称") private String stateName; - private String routeCode; + @ApiParam("顺序") + private Integer seq; - private String smCode; + @ApiParam("颜色") + private String color; } 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 62c4058..44c290b 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 @@ -9,6 +9,7 @@ import lombok.Data; import java.io.Serializable; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -24,12 +25,24 @@ public class StationRequestBean implements Serializable { private static final long serialVersionUID = -8597212451891803174L; + @ApiParam("新旧流程标识 默认新流程") + private boolean isOldRoute = false; + + @ApiParam("ACTOR接收策略类名") + private String actorReceiveStrategyClass; + + @ApiParam("工步列表") + private List stateList; + @ApiParam("扫描信息") private String scanInfo; - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @ApiParam("产品条码") + private String productSn; + @ApiParam("物料号") private String partNo; @@ -78,6 +91,12 @@ public class StationRequestBean implements Serializable { @ApiParam("工步序号") private Integer stepSeq; + @ApiParam("强制跳过工序") + private Boolean forceJumpProcess = false; + + @ApiParam("自动执行状态机") + private Boolean triggerAutoFsm = false; + @ApiParam("强制执行工步代码") private String forceSpecStepCode; @@ -123,7 +142,7 @@ public class StationRequestBean implements Serializable { private String queueGroupNo; @ApiParam("数据map") - private Map dataMap = new HashMap<>(); + private Map dataMap = new LinkedHashMap<>(); @ApiParam("流程状态集合") private List fsmStates; @@ -131,6 +150,9 @@ public class StationRequestBean implements Serializable { @ApiParam("当前流程状态") private MesStateMachineStatus curFsmState; + @ApiParam("是否重选进入") + private boolean isReselect; + @JsonIgnore @ApiParam("展示组件") private Object moduleService; @@ -180,6 +202,31 @@ public class StationRequestBean implements Serializable { @ApiParam("班次名称") private String shiftName; + @ApiParam("创建时间") + private String createDatetime; + + @ApiParam("包装编号") + private String packageNo; + + @ApiParam("密码") + private String password; + + public StationRequestBean() { + } + + public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode) { + this.organizeCode = organizeCode; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + } + + public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode, String userInfo) { + this.organizeCode = organizeCode; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.userInfo = userInfo; + } + @Override public String toString() { return "StationRequestBean{" + @@ -200,6 +247,8 @@ public class StationRequestBean implements Serializable { ", workOrderNo='" + workOrderNo + '\'' + ", tray='" + tray + '\'' + ", finishCount=" + finishCount + + ", packageNo=" + packageNo + + ", createDatetime=" + createDatetime + '}'; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index 4ce479b..56c5b39 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -51,6 +51,9 @@ public class StationResultBean implements Serializable { @ApiParam("图片路径") private String imageUrl; + @ApiParam("图片路径") + private List imageUrls; + @ApiParam("多个数据集") private List> stationResultBeans; @@ -65,4 +68,7 @@ public class StationResultBean implements Serializable { @ApiParam("定时秒数") private Integer timer; + + @ApiParam("提示音 1，2，3，4与前端约定") + private Integer promptSound; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 4d37f07..e3fcd90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -82,11 +82,15 @@ public class StepModel implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("触发类型") + private Integer triggerType; + public StepModel() { } public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) { + String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, + String workCellCode, Integer triggerType) { this.stepCode = stepCode; this.stepName = stepName; this.stepText = stepText; @@ -98,5 +102,6 @@ public class StepModel implements Serializable { this.paramCode = paramCode; this.stepDisplayName = stepDisplayName; this.workCellCode = workCellCode; + this.triggerType = triggerType; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 2ac3a02..02668f4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Transient; /** @@ -92,14 +93,28 @@ public class StepPrintSnModel extends MesProduceSn { private String vinCode; @ApiParam("客户JIT生产队列排序号") private Double seq; - @ApiParam("jit车号") - private String jitCarNo; + @ApiParam("JIA排序号") + private String jiaSeq; + @ApiParam("JIP排序号") + private String jipSeq; @ApiParam("车型代码") private String carModuleCode; @ApiParam("上一个序列号") - private String lastQueDetailSeq; + private String lastSeq; + @ApiParam("第一个序列号") + private String firstSeq; + @ApiParam("序列架号") + private String serialFrameNum; + @ApiParam("DOCK") + private String dock; @ApiParam("包装数量") - private Integer pgCodeNum; + private Integer pgNum; + @ApiParam("数量") + private Integer num; + @ApiParam("客户工厂代码") + private String custPlantCode; + @ApiParam("产品类型描述") + private String produceCategoryDesc; @ApiParam("批次") private String lotNo; @@ -108,4 +123,40 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("产品配置名称") private String prodCfgCodeName; + @ApiParam("项目代码") + private String prodCfgTypeCode; + @ApiParam("产品位置") + private String produceCategoryCode; + @ApiParam("结果") + private String result; + @ApiParam("项目版本") + private String pctVersion; + @ApiParam("图纸版本") + private String dwgVersion; + @ApiParam("班次名称") + private String shiftName; + @ApiParam("JIT排序号") + private String jitSeq; + @ApiParam("产品位置名称") + private String produceCategoryName; + @ApiParam("配置代码") + private String cfgCode; + + @ApiParam("版本号") + private String versionNo; + @ApiParam("泰国WL物料描述") + private String tgPartDesc; + @ApiParam("泰国过程条码截取前11位") + private String snTop11; + + @ApiParam("缺陷代码") + private String defectCode; + @ApiParam("缺陷原因代码") + private String dcCode; + @ApiParam("维修代码") + private String repairCode; + @ApiParam("质量代码") + private String qcCode; + @ApiParam("打印机名称") + private String printerName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index ffe3af7..9a15c9a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -23,6 +23,10 @@ public class StepResult { private StationRequestBean stationRequestBean; + private MesPcnEnumUtil.STEP_RESULT_CMD cmd; + + private String nextTriggerEvent; + public static StepResult getNonComplete() { return new StepResult(false, ""); } @@ -69,6 +73,10 @@ public class StepResult { return new StepResult(true, msg); } + public static StepResult getSuccessComplete(MesPcnEnumUtil.STEP_RESULT_CMD cmd) { + return new StepResult(true, cmd); + } + public static StepResult getSuccessComplete() { return new StepResult(true, ""); } @@ -85,6 +93,14 @@ public class StepResult { return new StepResult<>(true, data, ""); } + public static StepResult getNewSuccessData(T data, String nextTriggerEvent) { + return new StepResult<>(true, data, "", nextTriggerEvent); + } + + public static StepResult getNewFailureData(T data, String nextTriggerEvent) { + return new StepResult<>(false, data, "", nextTriggerEvent); + } + public static StepResult getSuccessData(Collection data, String msg) { return new StepResult(true, data, msg); } @@ -101,6 +117,11 @@ public class StepResult { this.msg = msg; } + private StepResult(boolean isCompleted, MesPcnEnumUtil.STEP_RESULT_CMD cmd) { + this.isCompleted = isCompleted; + this.cmd = cmd; + } + public StepResult(boolean isCompleted, StationRequestBean stationRequestBean) { this.isCompleted = isCompleted; @@ -113,6 +134,13 @@ public class StepResult { this.msg = msg; } + public StepResult(boolean isCompleted, T data, String msg, String nextTriggerEvent) { + this.isCompleted = isCompleted; + this.data = data; + this.msg = msg; + this.nextTriggerEvent = nextTriggerEvent; + } + public StepResult(boolean isCompleted, Collection dataCollection, String msg) { this.isCompleted = isCompleted; this.dataCollection = dataCollection; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java new file mode 100644 index 0000000..c8e1ea9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -0,0 +1,114 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +@Data +public class TJMgnBoardModel extends BaseBean implements Serializable { + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("条码数量") + private Integer snQty; + + @ApiParam("颜色") + private String partColor; + + @ApiParam("生产数量") + private Double prodQty; + + @ApiParam("一次合格数量") + private Double firstQuQty; + + @ApiParam("抛光数量") + private Double polishQty; + + @ApiParam("不合格数量") + private Double noQuQty; + + @ApiParam("待定数量") + private Double determindQty; + + @ApiParam("一次合格率") + private String firstPassRate; + + @ApiParam("最终合格率") + private String finalPassRate; + + @ApiParam("不良处理类型") + private String defectType; + + @ApiParam("反喷标识") + private String reverseSprayMark; + + @ApiParam("班次") + private String shiftName; + + @ApiParam("车间配置代码") + private String areaConfigCode; + + @ApiParam("列名") + private List> headModelList; + + @ApiParam("列值") + private List> headValueModelList; + + @ApiParam("不良汇总列名") + private List defectNameList; + + @ApiParam("不良汇总列值") + private List defectValueList; + + @Transient + @ApiParam("开始工单") + private String workOrderNoStart; + + @Transient + @ApiParam("结束工单") + private String workOrderNoEnd; + + @ApiParam("产线") + private String workCenterCode; + + @Transient + @ApiParam("创建时间") + private String createDatetime; + + public TJMgnBoardModel() { + } + + public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty, String createDatetime) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qcStatus = qcStatus; + this.workOrderNo = workOrderNo; + this.snQty = snQty; + this.createDatetime = createDatetime; + } + + public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qcStatus = qcStatus; + this.workOrderNo = workOrderNo; + this.snQty = snQty; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TaktAlarmCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TaktAlarmCacheModel.java new file mode 100644 index 0000000..128c5a8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TaktAlarmCacheModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import com.google.common.cache.Cache; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/9/27 20:11 + * @desc + */ +@Data +public class TaktAlarmCacheModel { + + private List levelCode; + + private Cache cache; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java new file mode 100644 index 0000000..0957f35 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/14 15:18 + * @desc + */ +@Data +public class TestStateModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("时间") + private String createDatetime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java new file mode 100644 index 0000000..4010f84 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 时间计数 + * @Reference : + * @Author : dominic + * @CreateDate : 2020/12/28 10:10 + * @Modify: + **/ +@Data +public class TimeCountModel { + @ApiParam("时间段") + private String time; + + @ApiParam("计数") + private Integer count; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java new file mode 100644 index 0000000..a4c2550 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 时间比率 + * @Reference : + * @Author : dominic + * @CreateDate : 2020/12/28 13:10 + * @Modify: + **/ +@Data +public class TimeRateModel { + @ApiParam("时间段") + private String time; + + @ApiParam("比率") + private double rate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java new file mode 100644 index 0000000..d19a7bc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/9 15:35 + * @desc + */ +@Data +public class TjMgnBoardEquipmentMonitorModel { + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("横坐标") + private Double xAxes = 0d; + + @ApiParam("纵坐标") + private Double yAxes = 0d; + + @ApiParam("工位状态") + private String workCellStatus; + + @ApiParam("颜色") + private String color; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java new file mode 100644 index 0000000..c27679b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/29 10:04 下午 + * @Modify: + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TorqueGatherModel { + + @ApiParam("枪号") + private String torqueNo; + + @ApiParam("扭矩值") + private String torqueValue; + + @ApiParam("扭矩角") + private String torqueAngle; + + @ApiParam("是否合格") + private String isQualified; + + @ApiParam("颜色") + private String color; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java new file mode 100644 index 0000000..ada9108 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author adair.song + * @date 2020/6/16 14:21 + * @desc 枪头更换计数弹框model + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("枪头更换计数弹框model") +public class TorqueHeadChangeModel { + + @ApiParam(name = "确认密码") + private String passWord; + + @ApiParam(name = "工厂") + private String organizeCode; + + @ApiParam(name = "工作中心") + private String workCenterCode; + + @ApiParam(name = "工作单元") + private String workCellCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java new file mode 100644 index 0000000..50c2935 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class TorqueReviewModel { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("枪类型") + private String gunType; + + @ApiParam("检测结果") + private String checkResult; + + @ApiParam("显示颜色") + private String showColor; + + @ApiParam("是否大枪") + private Integer isPf; + + @ApiParam("对象代码") + private String objectCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java new file mode 100644 index 0000000..b268328 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/12/9 19:09 + * @desc + */ +@Data +@NoArgsConstructor +@Api("bi的工单model") +public class WorkOrderBiModel { + + @ApiParam("零件号") + private String partNo; + + @ApiParam("零件名") + private String partName; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工单号") + private String workOrderNo; + + public WorkOrderBiModel(String partNo, String partName, String workCenterCode, String workOrderNo) { + this.partNo = partNo; + this.partName = partName; + this.workCenterCode = workCenterCode; + this.workOrderNo = workOrderNo; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.java new file mode 100644 index 0000000..b4b47a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/XbarModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/8/25 16:22 + * @desc + */ +@Data +public class XbarModel { + + @ApiParam("控制上限") + private Double ucl; + + @ApiParam("控制下限") + private Double lcl; + + @ApiParam("均值-蓝线 key组号，value值") + private List xbar = new ArrayList<>(); + + @ApiParam("平均均值-绿线") + private Double xbarbar; + + @ApiParam("标准差") + private Double stdDev; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java index fb93d98..ce900de 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java @@ -51,7 +51,7 @@ public class ZzMesWorkOrderModel extends BaseBean { private String snp; @ApiParam(value = "包装规格") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String packageSpec; @ApiParam(value = "备注") @@ -62,4 +62,16 @@ public class ZzMesWorkOrderModel extends BaseBean { @AnnoOutputColumn(required = false) private Integer rows; + @ApiParam("模具类型") + @AnnoOutputColumn(required = false) + private String mouldType; + + @ApiParam("模具编号集合") + @AnnoOutputColumn(required = false) + private String mouldCodeList; + + @ApiParam("工作中心名称") + @AnnoOutputColumn(required = false) + private String workCenterName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java new file mode 100644 index 0000000..5d33515 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/10 13:15 + * @desc + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Api("备件计划导入model") +public class SparePartsImportModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("用户名") + private String userName; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("客户工厂代码") + private String custPlantCode; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("JIT顺序号") + private String jitSeq; + + @ApiParam("供应商代码") + private String supplierCode; + + @ApiParam("客户零件号") + private String custPartNo; + + @ApiParam("替换VIN") + private String relationVinCode; + + @ApiParam("用量") + private Integer qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java new file mode 100644 index 0000000..71dc11c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/10/11 15:31 + * @desc + */ +@Data +public class SparePartsJspModel { + + private MesQueueJitPlan queueJitPlan; + + private List jitPlanBomList; + + private List jitPlanDetailList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java new file mode 100644 index 0000000..411faac --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import lombok.Data; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/19 15:02 + * @desc + */ +@Data +public class JisaJphReportModel { + + private Double jphVal; + + private Map detailsMap; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java new file mode 100644 index 0000000..3e0f65b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/10/28 11:27 AM + * @Modify: + */ +@Data +public class MgnBjBoardModel implements Serializable { + + private Integer qty; + @ApiParam("jsa数量") + private Integer jsaQty = 0; + @ApiParam("jsa数量") + private Integer jsaRate; + @ApiParam("完成数量") + private Integer completeQty = 0; + @ApiParam("完成率") + private Integer completeRate = 0; + @ApiParam("总数量") + private Integer totalQty = 0; + @ApiParam("预警数量") + private Integer warnQty; + @ApiParam("预警率") + private Integer warnRate; + @ApiParam("目标数量") + private Integer targetQty; + @ApiParam("计划　数量") + private Integer planQty; + @ApiParam("目标合格率") + private Integer targetRate = 0; + @ApiParam("一次合格率") + private Integer onceQualityRate = 0; + @ApiParam("待生产订单数量") + private Integer waitProduceQty = 0; + @ApiParam("低于安全库存") + private Integer minStockQty; + @ApiParam("超出最大库存") + private Integer maxStockQty; + + @ApiParam(value = "显示颜色") + private String color; + + @ApiParam("x坐标内容") + private String xAxis; + + @ApiParam("班次名称") + private String shiftName; + + @ApiParam("班次人数") + private Integer shiftNum; + + @ApiParam("产品位置代码") + private String produceCategoryCode; + + @ApiParam("产品位置名称") + private String produceCtgyName; + + @ApiParam("时段") + private String timeInterval; + + @ApiParam("温度") + private String temperature; + + @ApiParam("湿度") + private String humidity; + + @ApiParam("工位代码") + private String workCellCode; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam("工位描述") + private String workCellDesc; + + @ApiParam("x坐标内容") + private List xAxisList; + + private Map resultMap; + + private Object obj; + + @ApiParam("显示数据") + private List seriesModels; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java new file mode 100644 index 0000000..63c7999 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/10/28 2:56 PM + * @Modify: + */ +@Data +public class MgnBjBoardSeriesModel { + @ApiParam("名称") + private String name; + @ApiParam("显示数量") + private Integer qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java new file mode 100644 index 0000000..6aaf4fd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/11/29 5:40 PM + * @Modify: + */ +@Data +public class SparePartStockModel { + + private String maxQty; + + private String minQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java index 50601e8..31a7723 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java index cfe4ed4..24c85fc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java similarity index 86% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java index 4d2528a..3df8072 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; @@ -36,4 +36,7 @@ public class Head implements Serializable { @XStreamAlias("status") private String status; + @XStreamAlias("vehicleName") + private String vehicleName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java similarity index 91% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java index ef61c84..6eddfc7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; +import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Pn; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java index a493487..d56f13a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java @@ -1,11 +1,14 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; -import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg; +import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java similarity index 69% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java index e61fa14..1975611 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; +import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part; import lombok.Data; import java.util.List; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java index 8a7070f..a3fb79c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java similarity index 86% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java index f6024e5..50c452d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; @@ -19,6 +19,9 @@ public class Part implements Serializable { @XStreamAlias("item") private String item; + @XStreamAlias("componentGroup") + private String componentGroup; + @XStreamAlias("dock") private String dock; @@ -26,7 +29,7 @@ public class Part implements Serializable { private String qty; @ApiParam("是否是baseModule") - private boolean isBaseModule; + private Integer isBaseModule; @ApiParam("前左数量") private String flQty; @@ -49,8 +52,8 @@ public class Part implements Serializable { @ApiParam("配方顺序") private String recipeSeq; - @ApiParam("Mes物料号") private String partNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java similarity index 88% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java index 740b5a0..833a28c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java similarity index 94% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java index c1d74b6..b102a5d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java new file mode 100644 index 0000000..2c4c39f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 17:30 + * @desc + */ +@Data +public class AndonModel { + + private String workCenterCode; + + private Double xAxis; + + private Double yAxis; + + private String expInfo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java new file mode 100644 index 0000000..ebb9bc8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 总装实际产量model + * @Author: wangjie + * @Date: 2020/10/28 2:56 PM + * @Modify: + */ +@Data +public class AssemblyRealWorkModel { + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("实际产量") + private Double realProdQty; + + @ApiParam("实际目标") + private Double realPlanQty; + + @ApiParam("班产目标") + private Double shiftPlanQty; + + @ApiParam("本班达成率") + private Integer shiftPassPercent; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java new file mode 100644 index 0000000..5513e58 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/28 13:47 + * @desc + */ +@Data +public class DefectModel { + + private String workCenterCode; + + private Map percents; + + private Integer total; + + private String queryBeginTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java new file mode 100644 index 0000000..3b95ac3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 20:50 + * @desc + */ +@Data +public class GoodRateModel { + + private String workCenterCode; + + private Double goodRate; + + private Integer total; + + private Integer goodTotal; + + private String color; + + private Double passPercentMax; + + private Double passPercentMin; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java new file mode 100644 index 0000000..143452c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 13:47 + * @desc + */ +@Data +public class OeeModel { + + private String workCenterCode; + + private Integer takt; + + private Integer standardTakt; + + private Double planOee; + + private String color; + + private Double threshold = 0.03; + + private Double realProductivity; + + private Double oeePercent; + + private Double realWorkTime; + + private String shiftBeginTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java new file mode 100644 index 0000000..a3ea101 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 14:10 + * @desc + */ +@Data +public class ProductivityModel { + + private String time; + + private Integer planProductivity; + + private Integer realProductivity; + + private boolean isCurrentInfo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java new file mode 100644 index 0000000..4ed3e9e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import cn.estsh.i3plus.pojo.mes.bean.MesStaff; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/10/28 21:44 + * @desc + */ +@Data +public class StaffMatrixModel { + + private List workCenterCodes; + + private String currentWorkCenterCode; + + private String workCenterPictureUrl; + + private List staffs; + + private List leaders; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java new file mode 100644 index 0000000..22f0883 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 产品工序过程查询-条件 + * @author yumingxing + * @version 1.0 + * @date 2021/1/10 11:02 + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("产品工序过程查询-条件") +public class ConditionQueryModel { + + @ApiParam("项目名称") + private String prodCfgTypeCode; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; + + @ApiParam("零件二维码") + private String serialNumber; + + @ApiParam("质量状态") + private Integer qcStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java new file mode 100644 index 0000000..26dfa50 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品条码返回model + * @author xiangming.liao + * @version 1.0 + * @date 2021/01/06 10:43 + **/ +@Data +@ApiModel("产品条码返回model") +public class CosmaReportProductSnModel extends MesProduceSn implements Serializable { + + private static final long serialVersionUID = 5217363746963291483L; + @ApiParam("条码类型Name") + private String snTypeName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java new file mode 100644 index 0000000..bc450c7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-缺陷信息 + * + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +@ApiModel("产品工序过程查询-缺陷信息") +public class DefectRecordModel implements Serializable { + + private static final long serialVersionUID = 4994719388513997046L; + + @ApiParam("产线") + private String workCenterName; + + @ApiParam("工序名称") + private String processName; + + @ApiParam("质量代码") + private Integer qcStatus; + + @ApiParam("质量状态") + private String qcStatusName; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("缺陷位置名称") + private String defectLocationName; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("零件二维码") + private String serialNumber; + + @ApiParam(value = "执行人") + public String createUser; + + @ApiParam(value = "扫描时间") + public String createDatetime; + + @ApiParam(value = "图片路径") + private String pictureUrl; + + + public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime, String pictureUrl) { + this.workCenterName = workCenterName; + this.processName = processName; + this.qcStatus = qcStatus; + this.defectName = defectName; + this.defectLocation = defectLocation; + this.customerPartNo = customerPartNo; + this.serialNumber = serialNumber; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.pictureUrl = pictureUrl; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java new file mode 100644 index 0000000..8878a06 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 产品履历报表-料箱信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 17:16 + **/ +@Data +@NoArgsConstructor +@ApiModel("产品履历报表-料箱信息") +public class PackageTravelModel implements Serializable { + + private static final long serialVersionUID = -7031472442162953544L; + + @ApiParam("客户零件号") + private String packageNo; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("零件二维码") + private String serialNumber; + + @ApiParam("CMS零件号") + private String partNo; + + @ApiParam("CMS标签号") + private String qrCode; + + @ApiParam("产线") + private String workCenterName; + + @ApiParam("工序名称") + private String processName; + + @ApiParam("料架类型") + private String ctCode; + + @ApiParam("料架编号") + private String ctNo; + + @ApiParam("进炉模式") + private String modelNo; + + @ApiParam("炉内料架位置") + private String fnLocationNo; + + @ApiParam("层位置") + private String ctLocationNo; + + @ApiParam("层内零件位置") + private String ctLocationPartNo; + + @ApiParam("执行时间") + private String createDatetime; + + @ApiParam("执行时间") + private String createUser; + + public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) { + this.packageNo = packageNo; + this.customerPartNo = customerPartNo; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.qrCode = qrCode; + this.workCenterName = workCenterName; + this.processName = processName; + this.ctCode = ctCode; + this.ctNo = ctNo; + this.modelNo = modelNo; + this.fnLocationNo = fnLocationNo; + this.ctLocationNo = ctLocationNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java new file mode 100644 index 0000000..8a0d44b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 工序代码+工序名称 实体类 + * @author yumingxing + * @version 1.0 + * @date 2020/12/22 16:56 + **/ +@Data +@ApiModel("工序代码+工序名称") +public class ProcessModel implements Serializable { + + + private static final long serialVersionUID = -6653836427174801385L; + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("工序名称") + private String processName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java new file mode 100644 index 0000000..0174515 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * 全工序报废率-查询结果-model + * @author yumingxing + * @version 1.0 + * @date 2020/12/21 10:10 + **/ +@Data +@NoArgsConstructor +@ApiModel("全工序报废率-查询结果") +public class ProcessScrapRate { + + @ApiParam("工序") + private String processCode; + + @ApiParam("工序名称") + private String processName; + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("报废率") + private BigDecimal scrapRate; + + @ApiParam("物料号") + private String partNo; + + + public ProcessScrapRate(String processCode,String processName, String prodCfgTypeCode, String workCellCode,String partNo) { + this.processCode = processCode; + this.processName = processName; + this.prodCfgTypeCode = prodCfgTypeCode; + this.workCellCode = workCellCode; + this.partNo = partNo; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java new file mode 100644 index 0000000..beecea1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author yumingxing + * @version 1.0 + * @date 2021/1/9 14:29 + **/ +@ApiModel("项目号零件号") +@Data + +public class ProdCustPartModel { + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户零件号") + private String customerPartNo; + + public ProdCustPartModel(String prodCfgTypeCode, String partNo, String customerPartNo) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.partNo = partNo; + this.customerPartNo = customerPartNo; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java new file mode 100644 index 0000000..0fef7e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/28 14:24 下午 + * @Description: 缺陷率占比柏拉图报表model + **/ +@Api("缺陷率占比柏拉图报表model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ProduceDefectRatePlatoModel { + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("单项占比") + private Double singleRatio; + + @ApiParam("累计占比") + private Double cumulativeRatio; + + @ApiParam("数量") + private Long qty; + + public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, String defectCode, String defectName, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.customerPartNo = customerPartNo; + this.defectCode = defectCode; + this.defectName = defectName; + this.qty = qty; + } + + public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.customerPartNo = customerPartNo; + this.qty = qty; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java new file mode 100644 index 0000000..4c582b1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/28 14:18 下午 + * @Description: 缺陷率占比柏拉图报表查询参数model + **/ +@Api("缺陷率占比柏拉图报表查询参数model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ProduceDefectRatePlatoQueryModel extends BaseBean { + /** + * 必选 + */ + + @ApiParam("工序") + private String processCode; + + @ApiParam("柱子展示条数") + private Integer displaySize; + + //质量状态（20冻结，30报废） + @ApiParam("质量状态") + private List qcStatusList; + /** + * 可选 + */ + @ApiParam("项目号") + private List prodCfgTypeCodeList; + + @ApiParam("零件号") + private List partNoList; + + //统计方式（0按月，1按天。） + @ApiParam("统计方式") + private Integer statisticalMethod; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java new file mode 100644 index 0000000..236b41d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/22 14:38 下午 + * @Description: 每个月/天的冻结数、报废数、生产总数、占比回model + **/ +@Api("每个月/天的冻结数、报废数、生产总数、占比返回model") +@Data +public class ProduceDispPassRateModel { + @ApiParam("统计时间") + private String statisticalTime; + + @ApiParam("产品条码") + private String srialNumber; + + //统计选项（10=全部，20=冻结，30=报废） + @ApiParam("统计选项") + private Integer statisticalOption; + + @ApiParam("冻结数") + private BigDecimal freezeQty; + + @ApiParam("报废数") + private BigDecimal scrapQty; + + @ApiParam("生产总数") + private BigDecimal produceSumQty; + + @ApiParam("占比率") + private BigDecimal ratio; + + public ProduceDispPassRateModel(String statisticalTime, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { + this.statisticalTime = statisticalTime; + this.statisticalOption = statisticalOption; + this.freezeQty = freezeQty; + this.scrapQty = scrapQty; + this.produceSumQty = produceSumQty; + this.ratio = ratio; + } + + public ProduceDispPassRateModel(String statisticalTime, String srialNumber, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { + this.statisticalTime = statisticalTime; + this.srialNumber = srialNumber; + this.statisticalOption = statisticalOption; + this.freezeQty = freezeQty; + this.scrapQty = scrapQty; + this.produceSumQty = produceSumQty; + this.ratio = ratio; + } + + public ProduceDispPassRateModel() { + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java new file mode 100644 index 0000000..5b6f1fe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/23 13:38 下午 + * @Description: 一次性通过率查询参数model + **/ +@Api("一次性通过率查询参数model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ProduceDispPassRateQueryModel { + /** + * 必选 + */ + + @ApiParam("工序") + private String processCode; + + //统计方式（0=按月，1按天） + @ApiParam("统计方式") + private Integer statisticalMethod; + + //质量状态（10=合格，20=冻结，30=报废） + @ApiParam("质量类型") + private Integer qcStatus; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; + + + /** + * 可选 + */ + @ApiParam("项目号") + private List prodCfgTypeCodeList; + + @ApiParam("零件号") + private List partNoList; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java new file mode 100644 index 0000000..4c2df17 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author yumingxing + * @version 1.0 + * @date 2020/12/24 18:57 + **/ +@Data +@NoArgsConstructor +@ApiModel("生产统计明细") +public class ProductDetailResult { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("零件号") + private String partNo; + + @ApiParam + private String customerPartNo; + + @ApiParam("零件描述") + private String partNameRdd; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工序") + private String processCode; + + @ApiParam("工序名称") + private String processName; + + @ApiParam("条码状态") + private String qcStatus; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; + + @ApiParam(value = "生产线名称") + public String workCenterName; + + + public ProductDetailResult(String serialNumber, String partNo,String customerPartNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime,String workCenterName) { + this.serialNumber = serialNumber; + this.partNo = partNo; + this.customerPartNo = customerPartNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.processCode = processCode; + this.processName = processName; + this.qcStatus = qcStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.workCenterName = workCenterName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java new file mode 100644 index 0000000..a3daad6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @author yumingxing 生产总数 + * @version 1.0 + * @date 2020/12/24 18:57 + **/ +@Data +@NoArgsConstructor +public class ProductResult { + + @ApiParam("工作单元") + private String workCellCode; + @ApiParam("零件号") + private String partNo; + @ApiParam("零件号") + private String customerPartNo; + @ApiParam("零件描述") + private String partNameRdd; + @ApiParam("生产线") + private String workCenterCode; + @ApiParam("工序") + private String processCode; + @ApiParam("工序名称") + private String processName; + @ApiParam("生产总数") + private long totalProduction; + @ApiParam("合格数") + private long qualified; + @ApiParam("冻结数") + private long unqualified; + @ApiParam("报废数") + private long scrap; + @ApiParam("合格率") + private BigDecimal qualifiedRate; + @ApiParam("冻结率") + private BigDecimal unqualifiedRate; + @ApiParam("报废率") + private BigDecimal scrapRate; + @ApiParam("生产线名称") + private String workCenterName; + + public ProductResult(String workCellCode,String partNo, String customerPartNo,String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap,String workCenterName) { + this.workCellCode = workCellCode; + this.partNo = partNo; + this.customerPartNo = customerPartNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.processCode = processCode; + this.processName = processName; + this.qualified = qualified; + this.unqualified = unqualified; + this.scrap = scrap; + this.workCenterName = workCenterName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java new file mode 100644 index 0000000..2f9566d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-产品信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +@ApiModel("产品工序过程查询-条件查询页面") +public class ProductSnConditionModel implements Serializable { + + private static final long serialVersionUID = 3154899794523800804L; + + @ApiParam("零件二维码") + private String serialNumber; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("CMS零件号") + private String partNo; + + @ApiParam("项目名称") + private String prodCfgTypeCode; + + @ApiParam("产线") + private String workCenterName; + + @ApiParam("工序名称") + private String processName; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam(value = "扫码时间") + public String createDatetime; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("质量状态Name") + private String qcStatusName; + + public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterName, String processName, String workCellName, String createDatetime, Integer qcStatus) { + this.serialNumber = serialNumber; + this.customerPartNo = customerPartNo; + this.partNo = partNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.workCenterName = workCenterName; + this.processName = processName; + this.workCellName = workCellName; + this.createDatetime = createDatetime; + this.qcStatus = qcStatus; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java new file mode 100644 index 0000000..be65d70 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-产品信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +@ApiModel("产品履历报表-产品信息") +public class ProductSnModel implements Serializable { + + private static final long serialVersionUID = 7137684552464509466L; + + @ApiParam("包装条码") + private String packageNo; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("零件二维码") + private String serialNumber; + + @ApiParam("CMS零件号") + private String partNo; + + @ApiParam("CMS标签号") + private String qrCode; + + @ApiParam("产线") + private String workCenterName; + + @ApiParam("工序名称") + private String processName; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam(value = "扫码时间") + public String createDatetime; + + @ApiParam(value = "执行人") + public String createUser; + + @ApiParam("质量代码") + private Integer qcStatus; + + @ApiParam("质量状态") + private String qcStatusName; + + + + + public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo, + String qrCode, String workCenterName, String processName, + String workCellName, String createDatetime, + String createUser, Integer qcStatus) { + this.packageNo = packageNo; + this.customerPartNo = customerPartNo; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.qrCode = qrCode; + this.workCenterName = workCenterName; + this.processName = processName; + this.workCellName = workCellName; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.qcStatus = qcStatus; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java new file mode 100644 index 0000000..41b06c6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-过程信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +@ApiModel("产品履历报表-过程信息") +public class ProductSnTravelModel implements Serializable { + + private static final long serialVersionUID = 6720300188491659067L; + + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("条码状态") + private Integer snStatus; + + @ApiParam("条码状态Name") + private String snStatusName; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("质量状态Name") + private String qcStatusName; + + @ApiParam("物料码") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("当前工序") + private String processCode; + + @ApiParam("当前工序") + private String nextProcessCode; + + @ApiParam("条码类型") + private Integer snType; + + @ApiParam("条码类型Name") + private String snTypeName; + + @ApiParam(value = "执行时间") + public String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java new file mode 100644 index 0000000..a99b138 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * 生产统计 + * @author yumingxing + * @version 1.0 + * @date 2020/12/24 16:13 + **/ +@Data +public class ProductStatisticsQueryModel { + + @ApiParam("生产线") + private List workCenterCodeList; + @ApiParam("工序") + private List processCodeList; + @ApiParam("零件号") + private List partNoList; + @ApiParam("生产线") + private String workCenterCode; + @ApiParam("工序") + private String processCode; + @ApiParam("零件号") + private String partNo; + @ApiParam("开始日期") + private String modifyStartDate; + @ApiParam("结束日期") + private String modifyEndDate; + @ApiParam("质量状态") + private String qcStatus; + @ApiParam("过程条码") + private String serialNumber; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java new file mode 100644 index 0000000..3540a60 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @author yumingxing + * @version 1.0 + * @date 2020/12/21 10:10 + **/ +@Data +public class ReportQueryModel { + + @ApiParam("工序") + private List processCodeList; + + @ApiParam("项目号") + private List prodCfgTypeCodeList; + + @ApiParam("零件号") + private List partNoList; + + @ApiParam("开始日期") + private String modifyStartDate; + + @ApiParam("结束日期") + private String modifyEndDate; + + @ApiParam("账号") + private String userLoginName; + + @ApiParam("姓名") + private String userName; + + @ApiParam("单个工序") + private String singleProcessCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java new file mode 100644 index 0000000..4f3e4ea --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * 报废占比柏拉图Model + * @author yumingxing + * @version 1.0 + * @date 2020/12/23 15:09 + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("报废占比柏拉图") +public class ScrapOfPlatoModel { + + @ApiParam("零件号") + private String partNo; + @ApiParam("客户零件号") + private String customerPartNo; + @ApiParam("项目") + private String prodCfgTypeCode; + @ApiParam("缺陷代码") + private String defectCode; + @ApiParam("缺陷名称") + private String defectName; + @ApiParam("缺陷数") + private long numberOfDefects; + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("报废率") + private BigDecimal scrapRate; + @ApiParam("报废占比") + private BigDecimal scrapRatio; + @ApiParam("柏拉图报废占比") + private BigDecimal scrapRatioPlato; + + + public ScrapOfPlatoModel(String partNo, String customerPartNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) { + this.partNo = partNo; + this.customerPartNo = customerPartNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.defectCode = defectCode; + this.defectName = defectName; + this.numberOfDefects = numberOfDefects; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java new file mode 100644 index 0000000..6ab47bf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户查询-账号+姓名 + * @author yumingxing + * @version 1.0 + * @date 2020/12/22 10:51 + **/ +@Data +@ApiModel("用户查询-账号+姓名") +public class UserQueryModel implements Serializable { + + @ApiParam("账号") + private String userLoginName; + @ApiParam("姓名") + private String userName; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EngineScriptPersistenceHistoryRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EngineScriptPersistenceHistoryRepository.java new file mode 100644 index 0000000..f7cb666 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EngineScriptPersistenceHistoryRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistenceHistory; +import org.springframework.stereotype.Repository; + +@Repository +public interface EngineScriptPersistenceHistoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java index db00b1d..dc15bb2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistence; import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; import java.util.List; @@ -13,6 +14,7 @@ import java.util.List; * @CreateDate : 2019-04-16 09:53 * @Modify: **/ +@Repository public interface IEngineScriptPersistenceRepository extends BaseRepository { /** * 按照工厂代码和脚本编号查询脚本实体对象 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java new file mode 100644 index 0000000..47b1a16 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfCustOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfCustOrderDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java new file mode 100644 index 0000000..69bc18f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfDeliverOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfDeliverOrderDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java new file mode 100644 index 0000000..896870a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfPackage; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfPackageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelDetailRepository.java new file mode 100644 index 0000000..b374e18 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfPartCheckCustomerLabelDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2021/3/22 15:41 + * @Modify: + **/ +@Repository +public interface IfPartCheckCustomerLabelDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelRepository.java new file mode 100644 index 0000000..0011080 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfPartCheckCustomerLabel; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2021/3/22 15:39 + * @Modify: + **/ +@Repository +public interface IfPartCheckCustomerLabelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java new file mode 100644 index 0000000..ff20aaf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfPartPull; +import cn.estsh.i3plus.pojo.mes.bean.IfRawPartData; + +/** + * @Description : + * @Reference : + * @CreateDate : 2020-04-21 09:53 + * @Modify: + **/ +public interface IfPartPullRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java new file mode 100644 index 0000000..db27680 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesAnalysisRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesAnalysisRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java new file mode 100644 index 0000000..fd1a8de --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardArea; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesBoardAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java similarity index 51% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java index d5e2954..a8f2e8a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; +package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionMethod; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardCustomParamCfg; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesActionMethodRepository extends BaseRepository { +public interface MesBoardCustomParamCfgRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java new file mode 100644 index 0000000..41ee9e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardCustomerData; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardCustomerDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java new file mode 100644 index 0000000..8f55d8c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardDisplay; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/1 6:03 下午 + * @Modify: + */ +public interface MesBoardDisplayRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java new file mode 100644 index 0000000..c259074 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineCoordsMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineCoordsMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java new file mode 100644 index 0000000..b381acf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java new file mode 100644 index 0000000..bf48a0b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLine; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java new file mode 100644 index 0000000..95ecb83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineStaffMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineStaffMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java new file mode 100644 index 0000000..511a124 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardMafactAssessment; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:33 + * @Modify: + **/ +public interface MesBoardMafactAssessmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapRepository.java similarity index 58% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapRepository.java index 209e270..5c5c8ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCap; import org.springframework.stereotype.Repository; /** @@ -11,5 +11,5 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface MesBoardShiftSectionCapacityRepository extends BaseRepository { +public interface MesBoardShiftSectionCapRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java new file mode 100644 index 0000000..c45b135 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardSubmenu; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardSubMenuRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java new file mode 100644 index 0000000..a682ca2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardSwitchCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Repository +public interface MesBoardSwitchCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java new file mode 100644 index 0000000..743c8fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBpBusiness; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesBpBusinessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java new file mode 100644 index 0000000..392ba42 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBypassMapping; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/9/6 1:30 下午 + * @Modify: + */ +public interface MesBypassMappingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java new file mode 100644 index 0000000..06bc4e1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCheckDataCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesCheckDataCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java new file mode 100644 index 0000000..293a1a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesContainerLocation; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesContainerLocationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java new file mode 100644 index 0000000..86ae6e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/5/1 12:21 PM + * @Modify: + */ +public interface MesContainerSnRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java new file mode 100644 index 0000000..ab6c93c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesControlPlan; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesControlPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java new file mode 100644 index 0000000..19f6409 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerSnRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 13:33 + * @Modify: + **/ +@Repository +public interface MesCustomerSnRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java new file mode 100644 index 0000000..caa29bb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDataMigrationCfg; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesDataMigrationCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java new file mode 100644 index 0000000..076d22a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDbCheckRecord; + +/** + * @Description: + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +public interface MesDbCheckRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java new file mode 100644 index 0000000..b9c44b8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDbDataCheck; + +/** + * @Description: + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +public interface MesDbDataCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java new file mode 100644 index 0000000..19fe9e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectLocation; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate:2020-11-25 19:51:00 + * @Modify: + **/ +@Repository +public interface MesDefectLocationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java new file mode 100644 index 0000000..64ea242 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEnum; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:32 + * @Modify: + **/ +public interface MesEnumRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java new file mode 100644 index 0000000..38c311a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskDetailStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:49 AM + * @Modify: + */ +public interface MesEquTaskDetailStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java new file mode 100644 index 0000000..516002d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskPlanCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java new file mode 100644 index 0000000..03b79f7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:46 AM + * @Modify: + */ +public interface MesEquTaskPlanStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java new file mode 100644 index 0000000..515ee67 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTravel; +import org.springframework.stereotype.Repository; + +/** + * @Description :设备运行履历 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentTravelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java new file mode 100644 index 0000000..8f81f87 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesExceptionAlertCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : MES_异常提醒配置 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-10-13 16:49 + * @Modify: + **/ +@Repository +public interface MesExceptionAlertCfgRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java new file mode 100644 index 0000000..81e3258 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesExceptionWindowRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : MES_弹窗异常提醒记录 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-10-13 16:49 + * @Modify: + **/ +@Repository +public interface MesExceptionWindowRecordRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java new file mode 100644 index 0000000..777a721 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocationDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesFurnaceLocationDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java new file mode 100644 index 0000000..e2b36dd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocation; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesFurnaceLocationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java similarity index 53% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java index 544c627..c97836d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; +package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShiftGroup; +import cn.estsh.i3plus.pojo.mes.bean.MesGenerateQcOrder; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesShiftGroupRepository extends BaseRepository { +public interface MesGenerateQcOrderRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java new file mode 100644 index 0000000..f1d8b5a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesHncAgvRunning; + +/** + * @author Wynne.Lu + * @date 2020/8/3 17:54 + * @desc + */ +public interface MesHncAgvRunningRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java new file mode 100644 index 0000000..561c2f2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesHolidayVacation; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/5/7 4:44 PM + * @Modify: + */ +public interface MesHolidayVacationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRecordRepository.java new file mode 100644 index 0000000..78426ac --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesKpDataRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/3/25 2:00 PM + * @Modify: + */ +public interface MesKpDataRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java similarity index 53% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java index 103e176..a367516 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java @@ -1,8 +1,7 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; +package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; +import cn.estsh.i3plus.pojo.mes.bean.MesLineFaultRecord; import org.springframework.stereotype.Repository; /** @@ -13,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesEsopRepository extends BaseRepository { +public interface MesLineFaultRecordRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineOperationRepository.java similarity index 54% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineOperationRepository.java index 9d54073..717784b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineOperationRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; +package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesLineOperation; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesEquipmentRepository extends BaseRepository { +public interface MesLineOperationRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java new file mode 100644 index 0000000..ab1fbc1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfProductOffLine; +import cn.estsh.i3plus.pojo.mes.bean.MesLocation; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:32 + * @Modify: + **/ +public interface MesLocationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLogRepository.java new file mode 100644 index 0000000..e1369c2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLogRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLog; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java index 96f3c6a..37058a9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail; +import org.springframework.stereotype.Repository; /** @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail; * @CreateDate: 2019/10/19 10:33 上午 * @Description: **/ +@Repository public interface MesPackageDetailRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java new file mode 100644 index 0000000..14d91be --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPackageQueue; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/10 5:40 PM + * @Modify: + */ +@Repository +public interface MesPackageQueueRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.java new file mode 100644 index 0000000..7dc91b4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPackageTrans; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:33 + * @Modify: + **/ +public interface MesPackageTransRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java index 3bef25a..323ee9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java @@ -3,11 +3,13 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesPackageTravel; +import org.springframework.stereotype.Repository; /** * @Author: Wynne.Lu * @CreateDate: 2019/10/19 2:57 下午 * @Description: **/ +@Repository public interface MesPackageTravelRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java new file mode 100644 index 0000000..062e6b7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartAnalysisRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesPartAnalysisRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCarModelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCarModelRepository.java new file mode 100644 index 0000000..d9f15f2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCarModelRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartCarModel; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/3/24 3:13 PM + * @Modify: + */ +public interface MesPartCarModelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java new file mode 100644 index 0000000..3616b53 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartContainerCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2020-11-10 + * @Modify: + **/ +@Repository +public interface MesPartContainerCapacityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java new file mode 100644 index 0000000..c81d1dd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartFurnace; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesPartFurnaceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSpecificRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSpecificRepository.java new file mode 100644 index 0000000..6770e91 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSpecificRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartSpecific; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/3/24 3:13 PM + * @Modify: + */ +public interface MesPartSpecificRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java new file mode 100644 index 0000000..bc0a358 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnSystemCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPcnSystemCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java new file mode 100644 index 0000000..bed3882 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPlanTakt; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesPlanTaktRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcDataRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcDataRecordRepository.java new file mode 100644 index 0000000..aaea5fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcDataRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPlcDataRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/5/2 4:11 PM + * @Modify: + */ +public interface MesPlcDataRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java index 9413a87..423e06c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesPlc; +import org.springframework.stereotype.Repository; /** * @Description: @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPlc; * @CreateDate:2019\10\9 0009 11:16 * @Modify: **/ +@Repository public interface MesPlcRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java new file mode 100644 index 0000000..28d572d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderApprovalStatus; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderApprovalStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java new file mode 100644 index 0000000..33abfd8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesQcOrderRecordRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java new file mode 100644 index 0000000..0693f9c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQualityStandard; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesQualityStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java new file mode 100644 index 0000000..bf36ba5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQuarantineRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/3/4 7:38 PM + * @Modify: + */ +public interface MesQuarantineRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRecordRepository.java new file mode 100644 index 0000000..3978ab8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetailRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/2/26 10:18 AM + * @Modify: + */ +public interface MesQueueOrderDetailRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java new file mode 100644 index 0000000..765082d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRealTimeTakt; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @CreateDate: 2020/10/26 + * @Author: simon.song + */ +@Repository +public interface MesRealTimeTaktRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSchedulingRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSchedulingRecordRepository.java new file mode 100644 index 0000000..f3c1717 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSchedulingRecordRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSchedulingRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/29 5:15 下午 + * @Modify: + */ +@Repository +public interface MesSchedulingRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.java new file mode 100644 index 0000000..a29a30d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcControlCoefficientRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSpcControlCoefficient; +import org.springframework.stereotype.Repository; + +/** + * @Description : if不良信息接口 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 16:49 + * @Modify: + **/ +@Repository +public interface MesSpcControlCoefficientRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.java new file mode 100644 index 0000000..8b8a4e4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSpcKeyDataRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSpcKeyData; +import org.springframework.stereotype.Repository; + +/** + * @Description : if不良信息接口 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 16:49 + * @Modify: + **/ +@Repository +public interface MesSpcKeyDataRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java similarity index 57% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java index 42b5b30..ddd50d4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; +package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesBom; +import cn.estsh.i3plus.pojo.mes.bean.MesStaff; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesBomRepository extends BaseRepository { +public interface MesStaffRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineRepository.java new file mode 100644 index 0000000..2f3a3a1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachine; + +/** + * @Description : + * @Author : simon.song + * @CreateDate : 2020-09-01 + **/ +public interface MesStateMachineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java new file mode 100644 index 0000000..9acea36 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStep; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019\10\9 + * @Modify: + **/ +public interface MesStateMachineStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmContinuousConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmContinuousConfigRepository.java new file mode 100644 index 0000000..d4601c9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmContinuousConfigRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmContinuousConfig; + +/** + * @Description :节拍连续异常配置表 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesTaktAlarmContinuousConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmLevelConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmLevelConfigRepository.java new file mode 100644 index 0000000..543e63d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmLevelConfigRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmLevelConfig; + +/** + * @Description :节拍故障等级配置表 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesTaktAlarmLevelConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmRecordRepository.java new file mode 100644 index 0000000..02ef4fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmRecord; + +/** + * @Description :节拍故障记录表 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesTaktAlarmRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.java new file mode 100644 index 0000000..134273f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWcCurrentStatus; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCurrentStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java index 43b09f2..6cf2246 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java index be056c0..ad54293 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** * @Description: diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellStatusRepository.java new file mode 100644 index 0000000..43d28e4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellStatusRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 11:21 + * @Modify: + **/ +@Repository +public interface MesWorkCellStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterMonitorLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterMonitorLogRepository.java new file mode 100644 index 0000000..5b6dad7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterMonitorLogRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenterMonitorLog; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesWorkCenterMonitorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkStartCacheRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkStartCacheRepository.java new file mode 100644 index 0000000..ca5346f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkStartCacheRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkStartCache; +import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Repository +public interface MesWorkStartCacheRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index cae893e..b759a7d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -5,12 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; +import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -91,19 +90,19 @@ public class MesHqlPack { } // 时间段查询 - if (!StringUtil.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getStartTimeEnd())) { + if (!StringUtils.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesPlanOrder.getStartTimeEnd())) { DdlPreparedPack.timeBuilder( mesPlanOrder.getStartTimeStart(), mesPlanOrder.getStartTimeEnd(), "startTime", packBean, true); } - if (!StringUtil.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getEndTimeEnd())) { + if (!StringUtils.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesPlanOrder.getEndTimeEnd())) { DdlPreparedPack.timeBuilder( mesPlanOrder.getEndTimeStart(), mesPlanOrder.getEndTimeEnd(), "endTime", packBean, true); } - if (!StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesPlanOrder.getCreateDateTimeStart(), mesPlanOrder.getCreateDateTimeEnd(), @@ -156,10 +155,13 @@ public class MesHqlPack { public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); @@ -174,10 +176,10 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); @@ -187,24 +189,25 @@ public class MesHqlPack { } // 时间段查询 - if (!StringUtil.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getStartTimeEnd())) { + if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { DdlPreparedPack.timeBuilder( mesWorkOrder.getStartTimeStart(), mesWorkOrder.getStartTimeEnd(), "startTime", packBean, true); } - if (!StringUtil.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getEndTimeEnd())) { + if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { DdlPreparedPack.timeBuilder( mesWorkOrder.getEndTimeStart(), mesWorkOrder.getEndTimeEnd(), "endTime", packBean, true); } - if (!StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesWorkOrder.getCreateDateTimeStart(), mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); DdlPreparedPack.getOrderDefault(mesWorkOrder); return packBean; } @@ -237,10 +240,10 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean); } if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) { - DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); + DdlPreparedPack.getStringLikerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); } if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) { - DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean); + DdlPreparedPack.getStringLikerPack(mesQueueOrder.getPgCode(), "pgCode", packBean); } if (mesQueueOrder.getQueueType() != null) { DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean); @@ -249,7 +252,7 @@ public class MesHqlPack { // 只查询创建状态的队列 DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); - if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesQueueOrder.getCreateDateTimeStart(), mesQueueOrder.getCreateDateTimeEnd(), @@ -282,7 +285,10 @@ public class MesHqlPack { public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); if (!StringUtils.isEmpty(mesArea.getAreaCode())) { - DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringLikerPack(mesArea.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(mesArea.getAreaName())) { + DdlPreparedPack.getStringLikerPack(mesArea.getAreaName(), "areaName", packBean); } return packBean; @@ -297,10 +303,10 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) { - DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); } if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) { - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); } if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); @@ -325,6 +331,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); } + if (!StringUtils.isEmpty(mesWorkCell.getWorkCellName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellName(), "workCellName", packBean); + } return packBean; } @@ -337,23 +346,42 @@ public class MesHqlPack { */ public static DdlPackBean packHqlMesRoute(MesRoute mesRoute, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode); - DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean); - DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean); + if (!StringUtils.isEmpty(mesRoute.getRouteCode())) { + DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean); + } + if (!StringUtils.isEmpty(mesRoute.getRouteName())) { + DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean); + } + if (!StringUtils.isEmpty(mesRoute.getRouteType())) { + DdlPreparedPack.getNumEqualPack(mesRoute.getRouteType(), "routeType", packBean); + } return packBean; } /** * 产品流程配置查询条件封装 * - * @param mesProdRouteCfg + * @param prodRouteCfg * @param organizeCode * @return */ - public static DdlPackBean packHqlMesProdRouteCfg(MesProdRouteCfg mesProdRouteCfg, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); + public static DdlPackBean packHqlMesProdRouteCfg(MesProdRouteCfg prodRouteCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodRouteCfg, organizeCode); + if (!StringUtils.isEmpty(prodRouteCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(prodRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(prodRouteCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(prodRouteCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(prodRouteCfg.getPptCode())) { + DdlPreparedPack.getStringEqualPack(prodRouteCfg.getPptCode(), "pptCode", packBean); + } + if (!StringUtils.isEmpty(prodRouteCfg.getRouteCode())) { + DdlPreparedPack.getStringEqualPack(prodRouteCfg.getRouteCode(), "routeCode", packBean); + } + if (!StringUtils.isEmpty(prodRouteCfg.getRouteType())) { + DdlPreparedPack.getNumEqualPack(prodRouteCfg.getRouteType(), "routeType", packBean); + } return packBean; } @@ -698,6 +726,46 @@ public class MesHqlPack { } /** + * MES工步信息查询条件封装 + * + * @param staff + * @return + */ + public static DdlPackBean getStaff(MesStaff staff, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(staff, organizeCode); + if (!StringUtils.isEmpty(staff.getUserCode())) { + DdlPreparedPack.getStringLikerPack(staff.getUserCode(), "userCode", packBean); + } + if (!StringUtils.isEmpty(staff.getUserName())) { + DdlPreparedPack.getStringLikerPack(staff.getUserName(), "userName", packBean); + } + if (!StringUtils.isEmpty(staff.getSkillLevel())) { + DdlPreparedPack.getNumEqualPack(staff.getSkillLevel(), "skillLevel", packBean); + } + + return packBean; + } + + /** + * 产线看板矩阵 + * + * @param boardLineMatrix + * @param organizeCode + * @return + */ + public static DdlPackBean getBoardLineMatrix(MesBoardLineMatrix boardLineMatrix, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(boardLineMatrix, organizeCode); + if (!StringUtils.isEmpty(boardLineMatrix.getAreaCode())) { + DdlPreparedPack.getStringLikerPack(boardLineMatrix.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(boardLineMatrix.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(boardLineMatrix.getWorkCenterCode(), "workCenterCode", packBean); + } + + return packBean; + } + + /** * MES工步参数信息查询条件封装 * * @param stepParam @@ -773,6 +841,8 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(stationBom, organizeCode); DdlPreparedPack.getStringLikerPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(stationBom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); return packBean; } @@ -860,6 +930,35 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); + if (!StringUtils.isEmpty(keyData.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(keyData.getFieldCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getFieldCode(), "fieldCode", packBean); + } + if (keyData.getObjectType() != null && keyData.getObjectType() != 0) { + DdlPreparedPack.getNumEqualPack(keyData.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdCondition())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdCondition(), "kdCondition", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdName())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdName(), "kdName", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdCode(), "kdCode", packBean); + } + if (keyData.getSpecLsl() != null) { + DdlPreparedPack.getNumEqualPack(keyData.getSpecLsl(), "specLsl", packBean); + } + if (keyData.getSpecUsl() != null) { + DdlPreparedPack.getNumEqualPack(keyData.getSpecUsl(), "specUsl", packBean); + } + return packBean; + } + /** * MES 物料关键数据关系信息查询条件封装 * @@ -992,12 +1091,15 @@ public class MesHqlPack { */ public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode); - if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { - DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); - } +// if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { +// DdlPreparedPack.getStringEqualPack(mesQcOrder.getOrderNo(), "orderNo", packBean); +// } if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) { DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean); } + if (!CollectionUtils.isEmpty(qcOrderDetail.getOrderNoList())) { + DdlPreparedPack.getInPackList(qcOrderDetail.getOrderNoList(), "orderNo", packBean); + } return packBean; } @@ -1198,7 +1300,10 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode); if (!StringUtils.isEmpty(workCellPoint.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(workCellPoint.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCenterCode(), "workCenterCode", packBean); } return packBean; } @@ -1619,6 +1724,24 @@ public class MesHqlPack { } /** + * 设备任务配置 查询条件封装 + * + * @param equTaskPlanCfg + * @param organizeCode + * @return + */ + public static DdlPackBean findEquTaskPlanCfg(MesEquTaskPlanCfg equTaskPlanCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(equTaskPlanCfg, organizeCode); + if (!StringUtils.isEmpty(equTaskPlanCfg.getPlanCfgCode())) { + DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getPlanCfgCode(), "planCfgCode", packBean); + } + if (!StringUtils.isEmpty(equTaskPlanCfg.getDisplayText())) { + DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getDisplayText(), "displayText", packBean); + } + return packBean; + } + + /** * MES 类型信息查询条件封装 * * @param mesTypeCfg @@ -1786,6 +1909,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) { DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean); } + if (!StringUtils.isEmpty(mesDataObject.getDsCode())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getDsCode(), "dsCode", packBean); + } return packBean; } @@ -1898,7 +2024,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); } if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) { - DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean); + DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "templateName", packBean); } return packBean; } @@ -1979,10 +2105,10 @@ public class MesHqlPack { public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode); if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); @@ -1991,7 +2117,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); } if (mesProduceSn.getSnStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); @@ -1999,10 +2125,13 @@ public class MesHqlPack { if (mesProduceSn.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } - if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean); + } + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } - if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) { + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) { DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean); // DdlPreparedPack.timeBuilder( // mesProduceSn.getOutWorkCenterStartTime(), @@ -2089,39 +2218,40 @@ public class MesHqlPack { } /** - * 维修记录 + * 不良记录 * - * @param mesRepairRecord + * @param defectRecord * @param organizeCode * @return */ - public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode); - if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) { - DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean); + public static DdlPackBean getMesDefectRecord(MesDefectRecord defectRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(defectRecord, organizeCode); + if (!StringUtils.isEmpty(defectRecord.getPartNo())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) { - DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean); + if (!StringUtils.isEmpty(defectRecord.getSerialNumber())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getSerialNumber(), "serialNumber", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCenterCode(), "workCenterCode", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getWorkCellCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCellCode(), "workCellCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getDefectCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDefectCode(), "defectCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getDefectCode())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getDefectCode(), "defectCode", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getRepairCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getRepairCode(), "repairCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) { + DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) { + + if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( - mesRepairRecord.getCreateDateTimeStart(), - mesRepairRecord.getCreateDateTimeEnd(), + defectRecord.getCreateDateTimeStart(), + defectRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true); } return packBean; @@ -2193,12 +2323,18 @@ public class MesHqlPack { if (mesProduceSnTravel.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean); } - if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) { + if (!StringUtils.isEmpty(mesProduceSnTravel.getVinCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getVinCode(), "vinCode", packBean); + } + if (!StringUtils.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) { DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean); } - if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { + if (!StringUtils.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } + if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesProduceSnTravel.getCreateDateTimeStart(), @@ -2280,6 +2416,26 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData spcKeyData) { + DdlPackBean packBean = getAllBaseData(spcKeyData.getOrganizeCode()); + if (!StringUtils.isEmpty(spcKeyData.getIsValid())) { + DdlPreparedPack.getNumEqualPack(spcKeyData.getIsValid(), "isValid", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getKdCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getKdCode(), "kdCode", packBean); + } + if (spcKeyData.getObjectType() != null) { + DdlPreparedPack.getNumEqualPack(spcKeyData.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getFieldCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getFieldCode(), "fieldCode", packBean); + } + return packBean; + } + /** * 监听任务查询条件封装 * @@ -2341,7 +2497,7 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) { + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, List orderList, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); @@ -2358,21 +2514,28 @@ public class MesHqlPack { if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean); } + if (!StringUtils.isEmpty(queueJitActual.getRelationVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "relationVinCode", packBean); + } if (queueJitActual.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); } - if (!StringUtil.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtil.isEmpty(queueJitActual.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitActual.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( queueJitActual.getCreateDateTimeStart(), queueJitActual.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - if (!StringUtil.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtil.isEmpty(queueJitActual.getCustPointEndDate())) { + if (!StringUtils.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtils.isEmpty(queueJitActual.getCustPointEndDate())) { DdlPreparedPack.timeBuilder( queueJitActual.getCustPointStartDate(), queueJitActual.getCustPointEndDate(), "createDatetime", packBean, true); } + if (!CollectionUtils.isEmpty(orderList)) { + DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean); + } + DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean); return packBean; } @@ -2532,6 +2695,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); } + DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintStatus(), "printStatus", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); @@ -2641,11 +2805,10 @@ public class MesHqlPack { * MES 工位技能 * * @param mesWorkCellSkill - * @param organizeCode * @return */ - public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCellSkill, organizeCode); + public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode()); if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) { DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean); } @@ -3155,6 +3318,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) { DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean); + } if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) { DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); } @@ -3185,9 +3351,9 @@ public class MesHqlPack { if (queueJitPlan.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean); } - if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(queueJitPlan.getPlanStartDate()) || !StringUtils.isEmpty(queueJitPlan.getPlanEndDate())) { + DdlPreparedPack.timeBuilder(queueJitPlan.getPlanStartDate(), queueJitPlan.getPlanEndDate(), + "planDate", packBean, true); } if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), @@ -3234,6 +3400,7 @@ public class MesHqlPack { /** * 客户JIT队列下达配置 + * * @param jitIssueCfg * @param organizeCode * @return @@ -3248,4 +3415,414 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesLocation(MesLocation mesLocation) { + DdlPackBean packBean = getAllBaseData(mesLocation.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesLocation.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesLocation.getLocationCode(), "locationCode", packBean); + DdlPreparedPack.getStringLikerPack(mesLocation.getLocationName(), "locationName", packBean); + DdlPreparedPack.getNumEqualPack(mesLocation.getIsValid(), "isValid", packBean); + return packBean; + } + + /** + * 条码照片关系 + * + * @param snPhotoRelation + * @param organizeCode + * @return + */ + public static DdlPackBean getMesSnPhotoRelation(MesSnPhotoRelation snPhotoRelation, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(snPhotoRelation, organizeCode); + if (!StringUtils.isEmpty(snPhotoRelation.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getSerialNumber(), "serialNumber", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoName())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoName(), "photoName", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoPath(), "photoPath", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoUrl())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoUrl", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoOriginalPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoOriginalPath", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTransferPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTransferPath", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTargetPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTargetPath", packBean); + } + return packBean; + } + + /** + * MES_BYPASS项映射关系 + * + * @param bypassMapping + * @param organizeCode + * @return + */ + public static DdlPackBean getBypassMapping(MesBypassMapping bypassMapping, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(bypassMapping, organizeCode); + if (!StringUtils.isEmpty(bypassMapping.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(bypassMapping.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(bypassMapping.getCheckName())) { + DdlPreparedPack.getStringLikerPack(bypassMapping.getCheckName(), "checkName", packBean); + } + return packBean; + } + + public static DdlPackBean getMesSubPart(MesSubPart mesSubPart) { + DdlPackBean packBean = getAllBaseData(mesSubPart.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesSubPart.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubPartNo(), "subPartNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubFlag(), "subFlag", packBean); + DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getControlPlan(MesControlPlan controlPlan) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(controlPlan.getOrganizeCode(), controlPlan.getIsValid()); + if (!StringUtils.isEmpty(controlPlan.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getPartNo())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getCustCode())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getCustCode(), "custCode", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getVersion())) { + DdlPreparedPack.getNumEqualPack(controlPlan.getVersion(), "version", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getAuditType())) { + DdlPreparedPack.getNumEqualPack(controlPlan.getAuditType(), "auditType", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getIsEnable())) { + DdlPreparedPack.getNumEqualPack(controlPlan.getIsEnable(), "isEnable", packBean); + } + return packBean; + } + + public static DdlPackBean getMesPaintPolishing(MgnPaintPolishingReportModel paintPolishingReportModel, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(paintPolishingReportModel.getOrganizeCode()); + if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) { + DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(paintPolishingReportModel.getWorkOrderNo())) { + DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getWorkOrderNo(), "workOrderNo", packBean); + } + if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) { + DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(), + "modifyDatetime", packBean, true); + } + return packBean; + } + + public static DdlPackBean getMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) { + DdlPackBean packBean = getAllBaseData(mesExceptionAlertCfg.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getSrcMenuCode(), "srcMenuCode", packBean); + DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesPaintDefect(MesDefectRecord defectRecord, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + if (!StringUtils.isEmpty(defectRecord.getPartNo())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getDefectActionType())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getDefectActionType(), "defectActionType", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(defectRecord.getCreateDateTimeStart(), defectRecord.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } + + /** + * MES下线报工查询条件封装 + * + * @param productOffLine + * @return + */ + public static DdlPackBean getIfProductOffLine(IfProductOffLine productOffLine) { + DdlPackBean packBean = getAllBaseDataByNormalPro(productOffLine, productOffLine.getOrganizeCode()); + if (!StringUtils.isEmpty(productOffLine.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getPartNo())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getCreateDateTimeStart()) || !StringUtils.isEmpty(productOffLine.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(productOffLine.getCreateDateTimeStart(), productOffLine.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } + + /** + * MES_看板自定义参数配置查询条件封装 + * + * @param boardCustomParamCfg + * @return + */ + public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardCustomParamCfg.getOrganizeCode()); + if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(boardCustomParamCfg.getParamCode())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamCode(), "paramCode", packBean); + } + if (!StringUtils.isEmpty(boardCustomParamCfg.getParamName())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamName(), "paramName", packBean); + } + return packBean; + } + + + /** + * MES容器位置查询条件封装 + * + * @param mesContainerLocation + * @return + */ + public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode()); + if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES产品容器容量配置查询条件封装 + * + * @param mesPartContainerCapacity + * @return + */ + public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES客户条码规则查询条件封装 + * + * @param customerSnRule 客户条码规则查询条件 + * @return 查询数据 + */ + public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule customerSnRule) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customerSnRule, customerSnRule.getOrganizeCode()); + if (!StringUtils.isEmpty(customerSnRule.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(customerSnRule.getCustomerPartNo())) { + DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerPartNo(), "customerPartNo", packBean); + } + if (!StringUtils.isEmpty(customerSnRule.getPartNo())) { + DdlPreparedPack.getStringLikerPack(customerSnRule.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(customerSnRule.getLength())) { + DdlPreparedPack.getNumEqualPack(customerSnRule.getLength(), "length", packBean); + } + return packBean; + } + + /** + * MES物料上炉模式查询条件封装 + * + * @param partFurnace 物料上炉模式查询条件 + * @return 查询数据 + */ + public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) { + DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(partFurnace.getModelNo(), "modelNo", packBean); + DdlPreparedPack.getNumEqualPack(partFurnace.getIsValid(), "isValid", packBean); + return packBean; + } + + /** + * MES_看板自定义参数配置查询条件封装 + * + * @param boardLineStaffMatrix + * @return + */ + public static DdlPackBean getBoardLineStaffMatrix(MesBoardLineStaffMatrix boardLineStaffMatrix) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardLineStaffMatrix.getOrganizeCode()); + if (!StringUtils.isEmpty(boardLineStaffMatrix.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCellCode())) { + DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(boardLineStaffMatrix.getUserCode())) { + DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getUserCode(), "userCode", packBean); + } + return packBean; + } + + public static DdlPackBean getMesEnum(MesEnum mesEnum) { + DdlPackBean packBean = getAllBaseData(mesEnum.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesEnum.getEnumCode(), "enumCode", packBean); + DdlPreparedPack.getStringLikerPack(mesEnum.getEnumName(), "enumName", packBean); + DdlPreparedPack.getStringLikerPack(mesEnum.getEnumValue(), "enumValue", packBean); + DdlPreparedPack.getNumEqualPack(mesEnum.getIsValid(), "isValid", packBean); + return packBean; + } + + /** + * MES_看板产线配置查询条件封装 + * + * @param boardLine + * @return + */ + public static DdlPackBean getBoardLine(MesBoardLine boardLine) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardLine.getOrganizeCode()); + if (!StringUtils.isEmpty(boardLine.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(boardLine.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(boardLine.getAreaCode())) { + DdlPreparedPack.getStringLikerPack(boardLine.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(boardLine.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(boardLine.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + + public static DdlPackBean getMesPackage(MesPackage mesPackage) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesPackage.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getCtNo(), "ctNo", packBean); + DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean); + DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean); + return packBean; + } + + public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture) { + DdlPackBean packBean = getAllBaseData(mesProduceCtgyPicture.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean); + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getDefectLocation(), "defectLocation", packBean); + DdlPreparedPack.getNumEqualPack(mesProduceCtgyPicture.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesQueueOrderDetail(MesQueueOrderDetail queueOrderDetail) { + DdlPackBean packBean = getAllBaseData(queueOrderDetail.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(queueOrderDetail.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringLikerPack(queueOrderDetail.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNameRdd(), "partNameRdd", packBean); + return packBean; + } + + /** + * MES_状态机信息查询条件封装 + * + * @param stateMachine + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlMesStateMachine(MesStateMachine stateMachine, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(stateMachine, organizeCode); + if (!StringUtils.isEmpty(stateMachine.getSmCode())) { + DdlPreparedPack.getStringLikerPack(stateMachine.getSmCode(), "smCode", packBean); + } + if (!StringUtils.isEmpty(stateMachine.getSmName())) { + DdlPreparedPack.getStringLikerPack(stateMachine.getSmName(), "smName", packBean); + } + if (!StringUtils.isEmpty(stateMachine.getSmType())) { + DdlPreparedPack.getNumEqualPack(stateMachine.getSmType(), "smType", packBean); + } + return packBean; + } + + /** + * 数据迁移表查询条件封装 + * @param cfg + * @return + */ + public static DdlPackBean getDataMigrationCfg(MesDataMigrationCfg cfg) { + DdlPackBean packBean = getAllBaseData(cfg.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(cfg.getIsValid(), "isValid", packBean); + if (!StringUtils.isEmpty(cfg.getPcnCode())) { + DdlPreparedPack.getStringEqualPack(cfg.getPcnCode(), "pcnCode", packBean); + } + if (!StringUtils.isEmpty(cfg.getMigName())) { + DdlPreparedPack.getStringLikerPack(cfg.getMigName(), "migName", packBean); + } + if (!StringUtils.isEmpty(cfg.getRemark())) { + DdlPreparedPack.getStringLikerPack(cfg.getRemark(), "remark", packBean); + } + if (!StringUtils.isEmpty(cfg.getSrcTableName())) { + DdlPreparedPack.getStringEqualPack(cfg.getSrcTableName(), "srcTableName", packBean); + } + if (!StringUtils.isEmpty(cfg.getSrcQueryConditions())) { + DdlPreparedPack.getStringEqualPack(cfg.getSrcQueryConditions(), "srcQueryConditions", packBean); + } + if (!StringUtils.isEmpty(cfg.getDestTableName())) { + DdlPreparedPack.getStringEqualPack(cfg.getDestTableName(), "destTableName", packBean); + } + return packBean; + } + + public static DdlPackBean getMesPartCarModel(MesPartCarModel mesPartCarModel) { + DdlPackBean packBean = getAllBaseData(mesPartCarModel.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesPartCarModel.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPartCarModel.getVehicleCode(), "vehicleCode", packBean); + DdlPreparedPack.getNumEqualPack(mesPartCarModel.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesPartSpecific(MesPartSpecific mesPartSpecific) { + DdlPackBean packBean = getAllBaseData(mesPartSpecific.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesPartSpecific.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesPartSpecific.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPartSpecific.getSpecificSn(), "specificSn", packBean); + DdlPreparedPack.getNumEqualPack(mesPartSpecific.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesDbDataCheck(MesDbDataCheck mesDbDataCheck) { + DdlPackBean packBean = getAllBaseData(mesDbDataCheck.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesDbDataCheck.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesDbDataCheck.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesDbDataCheck.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(mesDbDataCheck.getQcFiledCode(), "qcFiledCode", packBean); + DdlPreparedPack.getNumEqualPack(mesDbDataCheck.getIsValid(), "isValid", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 04924a2..139b5f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -106,7 +106,9 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "rawQty", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; } @@ -120,7 +122,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; @@ -167,6 +169,12 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(mesWorkOrder.getPrintStatus()) && mesWorkOrder.getPrintStatus() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getPrintStatus(), "printStatus", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); + } if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } else { @@ -221,6 +229,7 @@ public class MesPcnHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); return packBean; } @@ -332,6 +341,29 @@ public class MesPcnHqlPack { return packBean; } + /*public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getDbCheckItem())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getDbCheckItem(), "dbCheckItem", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getErrorFiledCode())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) { + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) { + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getStatus())) { + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean); + } + return packBean; + }*/ + /** * 按条件分页查询产品条码补打印数据 * @@ -393,6 +425,10 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); } + if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); } @@ -401,6 +437,8 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); } + DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean); + // 时间段查询 DdlPreparedPack.timeBuilder( mesPackage.getCreateDateTimeStart(), @@ -464,20 +502,16 @@ public class MesPcnHqlPack { } /** - * 获取工作中心下所有的投料数据 + * 获取检测单下的所有检测明细 * - * @param mesQcOrderDetail + * @param qcOrder * @param organizeCode * @return */ - public static DdlPackBean getMesQcOrderDetail(MesQcOrderDetail mesQcOrderDetail, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean); - DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean); - DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean); - if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) { - DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean); - } + public static DdlPackBean getMesQcOrderDetail(MesQcOrder qcOrder, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); return packBean; } @@ -630,9 +664,6 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } - if (!CollectionUtils.isEmpty(mesWorkOrder.getCustList())) { - DdlPreparedPack.getInPackList(mesWorkOrder.getCustList(), "custCode", packBean); - } if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } @@ -667,4 +698,65 @@ public class MesPcnHqlPack { return packBean; } + + /** + * 产品工作中心配置 + * + * @param prodWorkCenter + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode); + if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean); + } + if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + + /** + * 按条件分页查询包装条码查询数据 + * + * @param mesPackage + * @return + */ + public static DdlPackBean getPackageSn(MesPackage mesPackage) { + + DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPackage.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { + DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + } + + if(!CollectionUtils.isEmpty(mesPackage.getPackageNoList())){ + DdlPreparedPack.getInPackList(mesPackage.getPackageNoList(), "packageNo", packBean); + } + + DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean); + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesPackage.getCreateDateTimeStart(), + mesPackage.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + + return packBean; + } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..bef0b07 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 @@ -29,10 +29,6 @@ i3plus-pojo-report - - i3plus.pojo - i3plus-pojo-form - i3plus.pojo diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java new file mode 100644 index 0000000..eb94499 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Map; + +/** + * @Description : Impp短信内容 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-24 20:31 + * @Modify: + **/ +@Data +@ApiModel("Impp短信内容") +public class ImppSmsContent implements Serializable { + + private static final long serialVersionUID = 3329812596753451793L; + + @ApiModelProperty(value = "软件模块") + private Integer softType; + + @ApiModelProperty(value = "接收手机号") + private String receivePhoneNumber; + + @ApiModelProperty(value = "短信签名代码") + private String smsSignCode; + + @ApiModelProperty(value = "模板代码") + private String templateCode; + + @ApiModelProperty(value = "短信参数") + private Map paramMap; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java index 56e1cb7..1cf909c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java @@ -3,9 +3,7 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -31,6 +29,9 @@ public class DynTableRow implements Serializable { // 行Size private Integer cellSize = 0; + //时间 + private String createDatetime; + // 行数据 private Map cellMap = new HashMap<>(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java new file mode 100644 index 0000000..ab2cd47 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.base.dynamic.DynamicEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-11-17 16:32 + * @Modify: + **/ +@Data +@ApiModel("检查唯一返回结果model") +public class BfCheckOnlyResultModel { + + @ApiModelProperty("是否唯一") + private boolean isOnly; + + @ApiModelProperty("重复的数据") + private DynamicEntity repeatData; + + @ApiModelProperty("异常信息") + private Exception exception; + + public BfCheckOnlyResultModel() { + this.isOnly = true; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java index bc5daaf..2dd1284 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.model.form; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,6 +45,18 @@ public class SqlColumnModel implements Serializable { // 字段精确长度 @ApiParam(value = "字段精确长度") private Integer scale; + + // 暂用来区分存储过程出入参数信息 + // 暂用来区分存储过程出入参数信息 + @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class) + @ApiParam(value ="原始列类型") + private Integer originPropertyType; + + public String getOriginPropertyTypeTxt() { + return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription() + : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType); + } + // 字段类型编号 @ApiParam(value = "字段类型编号") private Integer columnType; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java new file mode 100644 index 0000000..2905c7d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 存储过程列模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-10-21 19:00 + * @Modify: + **/ +@Data +public class SqlProcedureColumnModel { + + @ApiParam(value = "过程") + private String procedureCat; + + @ApiParam(value = "过程方案") + private String procedureSchem; + + @ApiParam(value = "过程名称") + private String procedureName; + + @ApiParam(value = "列名") + private String columnName; + + /** + * 1是入参 + * 2是出入参 + * 3是？ + * 4是出参 + * 5是返回值（函数） + */ + @AnnoOutputColumn(refClass = BlockFormEnumUtil.PROCEDURE_COL_TYPE.class) + @ApiParam(value = "列类型") + private Integer columnType; + + @ApiParam(value = "数据类型") + private Integer dataType; + + @ApiParam(value = "数据类型名称") + private String typeName; + + // 字段Java 类型 + @ApiParam(value = "字段Java 类型") + private String className; + + @ApiParam(value = "长度") + private Integer length; + + @ApiParam(value = "精度") + private Integer scale; + + @ApiParam(value = "是否允许为空") + private Integer nullable; + + @ApiParam(value = "备注") + private String remarks; + + /** + * 0为返回值 + * 1为首位 + */ + @ApiParam(value = "顺序位置") + private Integer ordinalPosition; + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java index de64920..921c2bf 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java @@ -9,7 +9,7 @@ import java.io.Serializable; import java.util.List; /** - * @Description : Wms实体字段Model信息 + * @Description : mes实体字段Model信息 * @Reference : * @Author : siliter.yuan * @CreateDate : 2020-04-24 09:53 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java index a4d0580..e3bc848 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java @@ -5,9 +5,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -16,12 +16,12 @@ import java.util.List; * @Description: **/ @Data -@NoArgsConstructor @AllArgsConstructor @Api("mes导入结果model") public class ExcelImportModel implements Serializable { private static final long serialVersionUID = 3075276018074690913L; + @ApiParam("结果") private boolean result; @@ -32,7 +32,7 @@ public class ExcelImportModel implements Serializable { private int failRowNum; @ApiParam("错误信息集合") - private List ImportErrorModels; + private List importErrorModels; @ApiParam("错误的行号") private String errorRows; @@ -46,4 +46,22 @@ public class ExcelImportModel implements Serializable { @ApiParam("Sheet名称") private String sheetName; + + public ExcelImportModel() { + result = true; + } + + public ExcelImportModel(List excelList) { + result = true; + this.excelList = excelList; + } + + public void addErrorMsg(ImportErrorModel errorModel) { + if (importErrorModels == null) { + importErrorModels = new ArrayList<>(); + } + importErrorModels.add(errorModel); + result = false; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java index c644a49..4a135a5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java @@ -21,9 +21,19 @@ import java.io.Serializable; public class ImportErrorModel implements Serializable { private static final long serialVersionUID = 1212013821950324792L; + + @ApiParam("sheet名称") + private String sheetName; + @ApiParam("错误的行号") private int rowNum; + @ApiParam("错误的列号") + private int colNum; + + @ApiParam("错误的列名") + private String colName; + @ApiParam("错误数量") private int errorNum; @@ -33,4 +43,58 @@ public class ImportErrorModel implements Serializable { @ApiParam("错误描述") private String errorInfo; + public static final class Builder { + private String sheetName; + private int rowNum; + private int colNum; + private String colName; + private String errorInfo; + + private Builder() { + } + + public static Builder newBuilder() { + return new Builder(); + } + + public Builder withSheetName(String sheetName) { + this.sheetName = sheetName; + return this; + } + + public Builder withRowNum(int rowNum) { + this.rowNum = rowNum; + return this; + } + + public Builder withColNum(int colNum) { + this.colNum = colNum; + return this; + } + + public Builder withColName(String colName) { + this.colName = colName; + return this; + } + + public Builder withErrorInfo(String errorInfo) { + this.errorInfo = errorInfo; + return this; + } + + public ImportErrorModel build() { + ImportErrorModel importErrorModel = new ImportErrorModel(); + importErrorModel.setSheetName(sheetName); + importErrorModel.setRowNum(rowNum); + importErrorModel.setColNum(colNum); + importErrorModel.setColName(colName); + if(errorInfo== null){ + importErrorModel.setErrorInfo("SHEET【" + sheetName + "】中第【" + rowNum + "】行，第【" + colNum + "】列 " + + colName + " 数据为空"); + }else { + importErrorModel.setErrorInfo(errorInfo); + } + return importErrorModel; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index 02084bb..974c7e4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.mes; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -141,8 +142,15 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("防错码") private String pokeYokeFix; + @ApiParam("防错码长度") + private String pokeYokeLength; + private Map psets = new LinkedHashMap<>(); + public TorqueCollectionModel(String vinCode) { + this.vinCode = vinCode; + } + /** * 大枪查询结果构造方法 * @@ -162,7 +170,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount, - String pokeYokeFix) { + String pokeYokeFix, String pokeYokeLength) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -178,6 +186,7 @@ public class TorqueCollectionModel implements Serializable { this.isPf = isPf; this.qualifiedCount = qualifiedCount; this.pokeYokeFix = pokeYokeFix; + this.pokeYokeLength = pokeYokeLength; } /** @@ -202,7 +211,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer pset1, Integer pset2, Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8, - Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix) { + Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix, String pokeYokeLength) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -221,6 +230,7 @@ public class TorqueCollectionModel implements Serializable { this.sendSeq = sendSeq; this.checkScanCount = checkScanCount; this.pokeYokeFix = pokeYokeFix; + this.pokeYokeLength = pokeYokeLength; assemblePsets(); } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java new file mode 100644 index 0000000..517507e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/2/20 下午4:39 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("日志字段模型") +public class LogFieldModel implements Serializable { + private static final long serialVersionUID = 6303989757683476327L; + + @ApiParam("日志时间") + private String time; + + @ApiParam("线程") + private String thread; + + @ApiParam("日志等级") + private String level; + + @ApiParam("执行堆栈") + private String stack; + + @ApiParam("日志信息") + private String message; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java new file mode 100644 index 0000000..5aae99e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.shiro.realm.Realm; + +/** + * @author Wynne.Lu + * @date 2021/1/19 下午1:29 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RoleRealmModel { + + private Realm userRealm; + + private Realm saRealm; + + private Realm adminRealm; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java new file mode 100644 index 0000000..fd2b237 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/2/20 下午12:55 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("系统日志模型") +public class SysLogModel implements Serializable { + private static final long serialVersionUID = -2982120258911167575L; + + @ApiParam("查询日期") + private String queryDate; + + @ApiParam("查询开始时间") + private String queryBeginTime; + + @ApiParam("查询结束时间") + private String queryEndTime; + + @ApiParam("索引名称") + private String indexName; + + @ApiParam("索引类型") + private Integer indexType; + + @ApiParam("聚合时间") + private Integer aggsDuration; + + @ApiParam("日志等级") + private Integer level; + + @ApiParam("执行线程") + private String thread; + + @ApiParam("服务器环境变量HostId") + private String hostId; + + @ApiParam("日志信息") + private List logs; + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java new file mode 100644 index 0000000..1515ca6 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2021/1/18 上午10:56 + * @desc 系统登录模型 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("系统登录模型") +public class SysLoginModel { + + @ApiParam(value = "登录名") + private String loginName; + + @ApiParam(value = "手机号") + private String phoneNumber; + + @ApiParam(value = "钉钉临时授权码") + private String dingTalkTmpAuthCode; + + @ApiParam(value = "登录密码") + private String loginPwd; + + @ApiParam(value = "语言代码") + private String languageCode; + + @ApiParam(value = "设备id") + private String deviceId; + + @ApiParam(value = "单点登录策略") + private String loginStrategy; + + @ApiParam(value = "app Id") + private String appId; + + @ApiParam(value = "PlafrormId") + private Integer loginPlatform = CommonEnumUtil.LOG_LOGIN_PLATFORM.PC_IMPP_CORE.getValue(); + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java new file mode 100644 index 0000000..527391a --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java @@ -0,0 +1,183 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-09 + * @Modify: + **/ +@Data +@ApiModel +public class UserExportModel extends BaseBean { + + private static final long serialVersionUID = -6597413958814715617L; + + @ApiModelProperty(value ="姓名" , access ="名称") + private String infoName; + + @ApiModelProperty(value ="工号") + private String infoEmpNo; + + @ApiModelProperty(value ="角色名称" , access ="角色名称") + private String roleNameRdd; + + @ApiModelProperty(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @ApiModelProperty(value ="邮箱" , access ="邮箱") + private String userEmail; + + @ApiModelProperty(value ="手机号" , access ="手机号") + private String userPhone; + + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String departmentNameRdd; + + @ApiModelProperty(value ="岗位名称" , access ="岗位名称") + private String positionNameRdd; + + @ApiModelProperty(value ="组织名称" , access ="组织名称") + private String organizeNameRdd; + + @ApiModelProperty(value ="员工类型", access ="实习、试用期、正式") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE) + private Integer infoEmployeeType; + + @ApiModelProperty(value ="员工等级") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE) + private Integer infoGrade; + + @ApiModelProperty(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_SEX) + private Integer infoSex; + + @ApiModelProperty(value ="婚姻" , example ="1" , access ="性别（1.未知，2.已婚,3未婚）") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE) + private Integer infoMarriage; + + @ApiModelProperty(value ="证件类型") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE) + private Integer infoCardType; + + @ApiModelProperty(value ="证件编号") + private String infoCardNumber; + + @ApiModelProperty(value ="毕业专业") + private String infoSchoolProfession; + + @ApiModelProperty(value ="毕业院校") + private String infoSchool; + + @ApiModelProperty(value ="学历") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EDUCATION) + private Integer infoSchoolEducation; + + @ApiModelProperty(value ="毕业时间") + private String infoSchoolLeaveDate; + + @ApiModelProperty(value ="籍贯") + private String infoBirthplace; + + @ApiModelProperty(value ="种族") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY) + private Integer infoRace; + + @ApiModelProperty(value ="紧急联系人") + private String infoEmergencyContact; + + @ApiModelProperty(value ="紧急联系人-电话") + private String infoEmergencyPhone; + + @ApiModelProperty(value ="入职日期" , access ="默认当前时间") + private String infoJoinDate; + + @ApiModelProperty(value ="离职日期" , access ="默认当前时间") + private String infoResignationDate; + + @ApiModelProperty(value ="出生日期") + private String infoBornDate; + + @ApiModelProperty(value ="政治面貌") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS) + private Integer infoPoliticalStatus; + + @ApiModelProperty(value ="兴趣爱好") + private String infoHobby; + + @ApiModelProperty(value ="家庭地址") + private String infoFamilyAddress; + + @ApiModelProperty(value ="账号状态" , example ="-1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) + private Integer userStatus; + + public UserExportModel() { + } + + public UserExportModel(SysUser sysUser, SysUserInfo sysUserInfo) { + setSysUser(sysUser); + setSysUserInfo(sysUserInfo); + } + + public UserExportModel setSysUser(SysUser sysUser){ + if (sysUser != null) { + this.userLoginName = sysUser.getUserLoginName(); + this.userPhone = sysUser.getUserPhone(); + this.userEmail = sysUser.getUserEmail(); + this.infoEmpNo = sysUser.getUserEmpNo(); + this.userStatus = sysUser.getUserStatus(); + } else { + this.userLoginName = "用户账号不存在"; + } + return this; + } + + public UserExportModel setSysUserInfo(SysUserInfo sysUserInfo){ + if (sysUserInfo != null) { + this.infoName = sysUserInfo.getName(); + this.departmentNameRdd = sysUserInfo.getDepartmentNameRdd(); + this.positionNameRdd = sysUserInfo.getPositionNameRdd(); + this.organizeNameRdd = sysUserInfo.getOrganizeNameRdd(); + this.infoEmployeeType = sysUserInfo.getUserEmployeeType(); + this.infoGrade = sysUserInfo.getUserGrade(); + this.infoSex = sysUserInfo.getUserSex(); + this.infoMarriage = sysUserInfo.getUserMarriage(); + this.infoCardType = sysUserInfo.getUserCardType(); + this.infoCardNumber = sysUserInfo.getUserCardNumber(); + this.infoSchoolProfession = sysUserInfo.getUserSchoolProfession(); + this.infoSchool = sysUserInfo.getUserSchool(); + this.infoSchoolEducation = sysUserInfo.getUserSchoolEducation(); + this.infoSchoolLeaveDate = sysUserInfo.getUserSchoolLeaveDate(); + this.infoBirthplace = sysUserInfo.getUserBirthplace(); + this.infoRace = sysUserInfo.getUserRace(); + this.infoEmergencyContact = sysUserInfo.getUserEmergencyContact(); + this.infoEmergencyPhone = sysUserInfo.getUserEmergencyPhone(); + this.infoJoinDate = sysUserInfo.getUserJoinDate(); + this.infoResignationDate = sysUserInfo.getUserResignationDate(); + this.infoBornDate = sysUserInfo.getUserBornDate(); + this.infoPoliticalStatus = sysUserInfo.getUserPoliticalStatus(); + this.infoHobby = sysUserInfo.getUserHobby(); + this.infoFamilyAddress = sysUserInfo.getUserFamilyAddress(); + this.organizeCode=sysUserInfo.getOrganizeCode(); + this.createDatetime=sysUserInfo.getCreateDatetime(); + this.createUser=sysUserInfo.getCreateUser(); + this.modifyDatetime=sysUserInfo.getModifyDatetime(); + this.modifyUser=sysUserInfo.getModifyUser(); + } else { + this.infoName = "用户消息不存在"; + } + return this; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 4c5ea4f..df0bd83 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.*; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiParam; @@ -46,6 +45,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "FTP 适配器") private BsSuitCaseFTP bsSuitCaseFTP; + @ApiParam(value = "Sap 适配器") + private BsSuitCaseSap bsSuitCaseSap; + @ApiParam(value = "分页数据") private Pager pager; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index eac5415..7a1eea4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -39,6 +39,17 @@ public class SuitClientModel implements Serializable { private Integer actionId; /** + * 调用方自定义标识 + */ + @XStreamAsAttribute + private String suitSid; + + /** + * 重试记录id + */ + private Long retryRecordId; + + /** * 适配器信息 */ private BsSuitCaseModel suitCaseModel; @@ -105,6 +116,8 @@ public class SuitClientModel implements Serializable { @XStreamCDATA private Object suitResultMessage; + private boolean isNeedRetry = false; + public SuitClientModel() { } @@ -140,4 +153,23 @@ public class SuitClientModel implements Serializable { // 设置默认 this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } + + public SuitClientModel(SuitModel suitModel, BsSuitCaseModel suitCaseModel) { + this.requestSource = suitModel.getRequestSource(); + this.suitSid = suitModel.getSuitSid(); + this.retryRecordId = suitModel.getRetryRecordId(); + + this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); + this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId(); + this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode(); + this.suitCaseModel = suitCaseModel; + + // 设置默认 + this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + // 设置默认 + this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + // 设置默认 + this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java new file mode 100644 index 0000000..984bf02 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * 软适配执行适配器(客户端服务端适配总入口) + * 所需的参数模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-10-28 15:51 + * @Modify: + **/ +@Data +public class SuitModel implements Serializable { + + private static final long serialVersionUID = 8981933192688480221L; + + @ApiParam(value = "适配器代码") + private String suitCaseCode; + + @ApiParam(value = "适配SID") + private String suitSid; + + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REQUEST_SOURCE.class) + @ApiParam(value = "适配来源") + private Integer requestSource; + + @ApiParam(value = "重试记录id") + private Long retryRecordId; + + @ApiParam(value = "适配器参数XML") + private String paramXml; + + @ApiParam(value = "适配器参数") + private List bsSuitCaseParamList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java new file mode 100644 index 0000000..2b5db90 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-28 17:48 + * @Modify: + **/ +@Data +@ApiModel("适配记录模型") +public class SuitRecordModel { + + @ApiModelProperty("主记录") + private BsSuitRecord bsSuitRecord; + + @ApiModelProperty("适配文件") + private BsSuitFile bsSuitFile; + + @ApiModelProperty("分页信息") + private Pager pager; + + public SuitRecordModel() { + } + + public SuitRecordModel(BsSuitRecord bsSuitRecord, BsSuitFile bsSuitFile) { + this.bsSuitRecord = bsSuitRecord; + this.bsSuitFile = bsSuitFile; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index e859e21..4dd5f5f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -39,8 +39,16 @@ public class SuitServerModel implements Serializable { // 请求ID private String requestId; + + // 调用方自定义标识 + private String suitSid; + + // 重试记录id + private Long retryRecordId; + // 传输单对象 @XmlElement(name = "data") + @XStreamAlias("data") private Object obj; // 传输集合 private List list; @@ -82,6 +90,13 @@ public class SuitServerModel implements Serializable { private BsSuitCaseModel bsSuitCaseModel; /** + * 适配发送报文信息 + */ + @XStreamOmitField + private String suitSendMessage; + + + /** * 请求来源 */ // @XStreamImplicit @@ -102,4 +117,14 @@ public class SuitServerModel implements Serializable { // @XStreamImplicit private String analyzeMessage; + + public SuitServerModel(){ + } + public SuitServerModel(SuitModel suitModel){ + this.suitCaseCode = suitModel.getSuitCaseCode(); + this.requestSource = suitModel.getRequestSource(); + this.suitSid= suitModel.getSuitSid(); + this.retryRecordId = suitModel.getRetryRecordId(); + this.obj = suitModel.getParamXml(); + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java index df22498..fee7d8f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java @@ -45,4 +45,7 @@ public class BasBeanFieldInfoModel implements Serializable { @ApiParam(value = "自增") private String isFieldGeneric; + + @ApiParam(value = "数据表描述") + private String tableDesc; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java index 63e108f..016a446 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -34,4 +34,7 @@ public class BasBeanInfoModel implements Serializable { @ApiParam(value = "字段列表数据") private List fieldInfoModelList; + + @ApiParam(value = "表名列表数据") + private List basBeanInfoModelList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java index c0bf451..1a9fb95 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java @@ -36,4 +36,6 @@ public abstract class BaseComponetsParam implements Serializable { @ApiParam(value = "工厂代码") public String organizeCode; + + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java new file mode 100644 index 0000000..87d933d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.wms; + + +import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 生产领料计划 + * @Reference : + * @Author : puxiao + * @CreateDate : 2020-09-10 19:50 + * @Modify: + **/ +@Data +public class MesPPMasterModel { + + @ApiParam("生产计划主数据") + private MesPpMaster mesPpMaster; + + @ApiParam("生产计划明细数据") + private MesPpDetails mesPpDetails; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index 8055c00..d904ed9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -105,6 +105,58 @@ public class PrintOrderDataModel implements Serializable { @Transient public String receiveDateTime; + @Transient + @ApiParam("类型名称") + public String busiTypeName; + + @Transient + @ApiParam("物料编号") + public String partNo; + + @ApiParam(value = "标题") + @Transient + public String title; + + @Transient + @ApiParam(value = "客户简称") + private String custName; + + @Transient + @ApiParam(value = "客户全称") + private String custDesc; + + @Transient + @ApiParam(value = "客户地址") + private String custAddr; + + @Transient + @ApiParam(value = "联系人") + private String custOwner; + + @Transient + @ApiParam(value = "电话号码") + private String custTel; + + @Transient + @ApiParam("业务类型") + public Integer busiType; + + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam(value = "生产小组") + private String productionGroup; + + @Transient + @ApiParam(value="修改日期查询用，查询起始日期") + public String modifyDateTimeStart; + + @Transient + @ApiParam(value = "修改日期查询用，查询结束日期") + public String modifyDateTimeEnd; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index f371330..0449979 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -52,4 +52,13 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam(value = "新条码") public WmsStockSn NewWmsStockSn; + + @ApiParam(value = "拆分条码") + public Integer splitSn; + + @ApiParam("关联单据行号") + public String refItem; + + @ApiParam("打印状态") + public Integer isPrinted; } 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 6ef6c90..d60c70e 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 @@ -48,7 +48,7 @@ public class WmsActionResponseBean implements Serializable { public String errorMsg; @ApiParam("提示信息") - public String message; + public String message = ""; @ApiParam("列表信息") public List informations; @@ -125,6 +125,9 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "是否允许重置") private Integer isResetAble; + @ApiParam(value = "是否重置") + private Integer isReset; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; @@ -155,4 +158,7 @@ public class WmsActionResponseBean implements Serializable { this.codeStatus = codeStatus; } + public int getIsResetVal() { + return this.isReset == null ? 2 : this.isReset; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java index 4a59bba..47731d5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java @@ -26,4 +26,6 @@ public class WmsAgCacheModel implements Serializable { public List options; @ApiParam("作业流程明细Model集合") public Map wmsAgdCacheModelMap; + @ApiParam("流程级别组件参数集合") + public Map> wmsAgAmParamsMap; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java new file mode 100644 index 0000000..b4b90d9 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 北京麦格纳BBAC库存扣减MODEL + * @Reference + * @Author dragon + * @CreateDate 2020/11/22 14:46 + * @Modify + */ +@Data +@Api("北京麦格纳BBAC库存扣减MODEL") +public class WmsBjmgnBbacReductModel implements Serializable { + @ApiParam("JIS号") + public String jisNo; + @ApiParam("物料号") + public String partNo; + @ApiParam("项目编码") + public String projectNo; + @ApiParam("客户编码") + public String custNo; + @ApiParam("存储区") + public String zoneNo; + @ApiParam("ERP库存地") + public String erpAreaNo; + @ApiParam("项目名称") + public String projectName; + @ApiParam("数量") + public Double qty; + @ApiParam("单位") + public String unit; + @ApiParam("包含0") + public Integer includeZero; + + + public WmsBjmgnBbacReductModel() { + } + + public WmsBjmgnBbacReductModel(String custNo,String zoneNo,String jisNo, String partNo, String projectNo, + Double qty, String unit) { + this.custNo = custNo; + this.zoneNo = zoneNo; + this.jisNo = jisNo; + this.partNo = partNo; + this.projectNo = projectNo; + this.qty = qty; + this.unit = unit; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java index e4212d3..143d55d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java @@ -49,4 +49,19 @@ public class WmsCSOrderDetailsModel implements Serializable { @ApiParam("目标库位") public String destLocateNo; + + @ApiParam("应盘人") + public String detailsCreateUser; + + @ApiParam("应盘时间") + public String detailsCreateDatetime; + + @ApiParam("实盘人") + public String factCreateUser; + + @ApiParam("实盘时间") + public String factCreateDatetime; + + + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java index 3eb65ad..a78f43f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -30,8 +30,7 @@ public class WmsFieldInfoModel implements Serializable { @ApiParam("处理类型") private int handleType; - public WmsFieldInfoModel (String baseRepository, int handleType, List wmsFieldInfoList) { - this.baseRepository = baseRepository; + public WmsFieldInfoModel ( int handleType, List wmsFieldInfoList) { this.wmsFieldInfoList = wmsFieldInfoList; this.handleType = handleType; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java old mode 100644 new mode 100755 index 2c30912..5fed354 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -21,6 +21,17 @@ public class WmsJobParamModel implements Serializable { private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 private Integer minuteDiff;//处理周期(分钟) + private List fixPartList;//需要特殊处理的零件号集合 + private String fixPartAndWhere; // 特殊零件号需要加的过滤条件 + private Integer pageSize;//数据条数 + private Integer isCheckSn;//是否检查条码存在 + private Integer erpSyncFlag;//查询SHIPPING表的条件 + private String filterZoneNos;//过滤存储区 + private String zoneNos;//存储区 + private String id;//id + private String groupName;//组名称 + private String lineNo;//产线 + public int getMinuteDiffVal() { return this.minuteDiff == null ? 0 : this.minuteDiff.intValue(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 0a8b2f9..45c5589 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -57,7 +57,24 @@ public class WmsMessageStyleModel implements Serializable { } else if (actQty == transQty) {//处理完成 this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } else if (transQty < actQty) {//处理中 处理数量可以大于需求数量 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } + } + + public WmsMessageStyleModel(String message, double transQty, double actQty, boolean showRed) { + this.message = message; + if (actQty == 0) {//未处理 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(); + } else if (transQty > actQty) {//处理中 this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); + } else if (actQty == transQty) {//处理完成 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } else if (transQty < actQty) {//处理数量大于需求数量-显示红色 + if (showRed) { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CLOSED.getValue(); + } else { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } } } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index a718377..e175815 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import lombok.Data; import java.io.Serializable; @@ -19,4 +20,13 @@ public class WmsMoveDetailsModel implements Serializable { private static final long serialVersionUID = -6968143574442339454L; private WmsMoveDetails details; private List moveSnList; + private List wmsStockSnList; + + public WmsMoveDetailsModel(WmsMoveDetails details, List moveSnList) { + this.details = details; + this.moveSnList = moveSnList; + } + + public WmsMoveDetailsModel() { + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java index 0e1e684..ff464ed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -18,4 +18,12 @@ public class WmsMoveMasterModel implements Serializable { private static final long serialVersionUID = -5490167040159056107L; private WmsMoveMaster moveMaster; private List moveDetails; + + public WmsMoveMasterModel(WmsMoveMaster moveMaster, List moveDetails) { + this.moveMaster = moveMaster; + this.moveDetails = moveDetails; + } + + public WmsMoveMasterModel() { + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java index 1c4fdfe..92d8bb8 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java @@ -21,4 +21,7 @@ public class WmsSapDbParamModel implements Serializable { private String masterStatusName;//单据状态名 private String detailsTableName;//单据明细表名 private String snTableName;//单据条码表名 + private String checkDetailCondition;//可以取消单据明细条件 + private String checkSnCondition;//可以取消单据条码条件 + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 4ce5d3c..dc69e01 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -22,9 +25,16 @@ public class WmsStockFifoModel { @ApiParam(value = "物料集合") List partNos; + @ApiParam(value = "物料") + String partNo; + @ApiParam(value = "存储区集合") List zoneNos; + @ApiParam(value = "存储区") + String zoneNo; + + @ApiParam(value = "物料对应的存储区") Map partToZoneMap; @@ -39,4 +49,20 @@ public class WmsStockFifoModel { @ApiParam("默认规则") private String defaultRule; + + @ApiParam("同批次") + private boolean fifoSameBatch; + + @ApiParam("FIFO查询获取方式") + private Integer fifoSnByLood; + + @ApiParam("过滤FIFO锁定条码") + private Integer filterFifoLockSn; + + @ApiParam("物料条码信息") + Map> snMap = new HashMap<>(); + + @ApiParam("所有推荐条码信息") + List wmsStockSnAllList = new ArrayList<>(); + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 025d045..58a671c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -57,6 +57,9 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "源存储区代码") private String srcZoneNo; + @ApiParam(value = "目标存储区代码") + private String destZoneNo; + @ApiParam(value = "创建日期") public String createDatetime; @@ -72,12 +75,21 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "工厂代码") public String organizeCode; + @ApiParam(value = "是否展示删除按钮") + public Integer isShowDeleteButton; + + @ApiParam(value = "跳转后端请求") + public String actionUrl; + + @ApiParam(value = "作业人员") + public String userNo; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, - String createDatetime, String srcZoneNo, String createUser, String organizeCode) { + String createDatetime, String srcZoneNo, String createUser, String organizeCode,String userNo) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; @@ -92,6 +104,7 @@ public class WmsTaskInfoModel implements Serializable { this.srcZoneNo = srcZoneNo; this.createUser = createUser; this.organizeCode = organizeCode; + this.userNo = userNo; } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..a785f21 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java index a0b2a6a..5d3fdec 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -50,4 +51,13 @@ public class SysBarcodeRule extends BaseBean { @ApiParam(value ="条码规则描述") private String barcodeRuleDescription; + @Column(name = "CHECK_MODE") + @ApiParam(value ="校验模式") + @AnnoOutputColumn(refClass = CommonEnumUtil.BARCODE_CHECK_MODE.class) + private Integer checkMode; + + public int getCheckModeVal() { + return checkMode == null ? CommonEnumUtil.BARCODE_CHECK_MODE.SEPARATOR_NUM.getValue() : checkMode; + } + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index fc4acd3..9877c7e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -64,6 +64,10 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板参数拼接") private String paramsPack; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + @Transient @ApiParam(value ="模板id对应的模板参数") private List labelTemplateParamList; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java index f1a39bf..e0d0faa 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; @@ -25,36 +27,39 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="SYS_LOG_USER_LOGIN") -@Api(value="用户登录记录",description = "用户登录记录") +@ApiModel(value="用户登录记录",description = "用户登录记录") public class SysLogUserLogin extends BaseBean { private static final long serialVersionUID = 4665598896654312569L; @Column(name="USER_ID") - @ApiParam(value ="用户ID" , access ="用户ID") + @ApiModelProperty(value ="用户ID" , access ="用户ID") + @AnnoOutputColumn(hidden = true) private Long userId; @Column(name="LOG_LOGIN_NAME") - @ApiParam(value ="登录名称" , access ="登录名称") + @ApiModelProperty(value ="登录名称" , access ="登录名称") private String logLoginName; @Column(name="LOG_LOGIN_STATUS") - @ApiParam(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1") + @ApiModelProperty(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_LOGIN_STATUS.class) private Integer logLoginStatus; @Column(name="LOG_LOGIN_PLATFORM") - @ApiParam(value ="登录平台ID（枚举）" , example ="1") + @ApiModelProperty(value ="登录平台ID（枚举）" , example ="1") + @AnnoOutputColumn(hidden = true) private Integer logLoginPlatform; @Column(name="LOG_LOGIN_HOST") - @ApiParam(value ="登录IP" , access ="登录IP") + @ApiModelProperty(value ="登录IP" , access ="登录IP") private String logLoginHost; @Column(name="LOG_LOGIN_BROWSER") - @ApiParam(value ="登录浏览器" , access ="登录的浏览器") + @ApiModelProperty(value ="登录浏览器" , access ="登录的浏览器") private String logLoginBrowser; @Column(name="LOG_LOGIN_DATE_TIME") - @ApiParam(value ="登录时间" , access ="登录时间") + @ApiModelProperty(value ="登录时间" , access ="登录时间") private String logLoginDateTime; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index e41ee5c..75a8fea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.ArrayList; import java.util.List; /** @@ -42,17 +43,19 @@ public class SysMessage extends BaseBean { private Integer messageSoftType; @Column(name = "MESSAGE_TYPE") - @ApiParam(value = "消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)", example = "-1") + @ApiParam(value = "消息类型(枚举：)", example = "-1") + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_TYPE.class) private Integer messageType; public int getMessageTypeValue() { if (this.messageType == null) { return 0; } else { - return this.messageType.intValue(); + return this.messageType; } } + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_TYPE_CONTENT.class) @Column(name = "MESSAGE_TYPE_CONTENT") @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1") private Integer messageContentType; @@ -153,4 +156,16 @@ public class SysMessage extends BaseBean { @ApiParam(value = "附件集合") private List sysFileAttachList; + @Transient + @ApiParam(value = "附件id集合") + private List fileAttachIdList; + + public void addFileAttachId(Long attachId){ + if(fileAttachIdList == null){ + fileAttachIdList = new ArrayList<>(); + } + + fileAttachIdList.add(attachId); + } + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRecord.java new file mode 100644 index 0000000..6bcbff7 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRecord.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 单号规则记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 15:12 + * @Modify: Dev 2018-12-12 09:41:07 + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_ORDER_NO_RECORD") +@ApiModel(value = "单号记录", description = "单号记录") +public class SysOrderNoRecord extends BaseBean { + + private static final long serialVersionUID = 2749057829943250024L; + + @Column(name = "RULE_CODE") + @ApiModelProperty(value = "规则代码") + private String ruleCode; + + @Column(name = "ORDER_NO") + @ApiModelProperty(value = "单号") + private String orderNo; + + + public SysOrderNoRecord() { + } + + public SysOrderNoRecord(String ruleCode,String orderNo) { + this.ruleCode = ruleCode; + this.orderNo = orderNo; + } + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 6bb092f..a579c71 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -58,14 +59,19 @@ public class SysOrderNoRule extends BaseBean { @Column(name = "SERIAL_NO_LENGTH") @ApiParam(value = "流水号长度",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long serialNoLength; + private Integer serialNoLength; @Column(name = "IS_CYCLE") - @ApiParam(value = "达到最大值后是否循环",example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "是否按日期循环", example = "1") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isCycle; + @Column(name = "IS_FIXED_LENGTH") + @ColumnDefault("2") + @ApiParam(value = "是否固定序号长度",example = "1") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isFixedLength; + @Column(name = "SERIAL_NO") @ApiParam(value = "当前流水号",example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java index 8c7a6cb..14f0a1d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.Map; /** * @Description : @@ -81,6 +82,11 @@ public class SysPojoVersion extends BaseBean { @ApiParam(value ="记录对象对比差异") private String pojoCompare; + @Lob + @Column(name="POJO_COMPARE_TXT") + @ApiParam(value ="记录对象对比差异") + private String pojoCompareTxt; + @Transient @ApiParam(value ="用户部门信息") private SysPojoVersionDetail versionDetail; @@ -88,4 +94,8 @@ public class SysPojoVersion extends BaseBean { @Transient @ApiParam(value ="操作对象本身") private String bean; + + @Transient + @ApiParam(value ="操作对象属性描述") + private Map pojoPropDesc; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java index 9831c18..4c305e4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java @@ -44,12 +44,27 @@ public class SysPojoVersionDetail extends BaseBean { private String pojoBefore; @Lob + @Column(name="POJO_BEFORE_TXT",length = 5000) + @ApiParam(value ="原始对象信息转换后") + private String pojoBeforeTxt; + + @Lob @Column(name="POJO_AFTER",length = 5000) @ApiParam(value ="修改之后对象信息") private String pojoAfter; @Lob + @Column(name="POJO_AFTER_TXT",length = 5000) + @ApiParam(value ="修改之后对象信息转换后") + private String pojoAfterTxt; + + @Lob @Column(name="POJO_COMPARE",length = 5000) @ApiParam(value ="记录对象对比差异") private String pojoCompare; + + @Lob + @Column(name="POJO_COMPARE_TXT",length = 5000) + @ApiParam(value ="记录对象对比差异") + private String pojoCompareTxt; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserExternal.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserExternal.java new file mode 100644 index 0000000..df659b6 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserExternal.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 用户外部关系 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-03 13:32 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_REF_USER_EXTERNAL") +@Api(value="用户外部关系",description = "用户外部关系") +public class SysRefUserExternal extends BaseBean { + + @Column(name="USER_ID") + @ApiParam(value ="用户id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="EXTERNAL_REF") + @ApiParam(value ="对象id" ,example = "-1") + @AnnoOutputColumn(refClass = ImppEnumUtil.USER_EXTERNAL_REF.class) + private Integer externalRef; + + @Column(name="REF_VALUE") + @ApiParam(value ="对象id" ,example = "-1") + private String refValue; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java index 6caccdc..5acecdd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -72,6 +73,7 @@ public class SysRefUserMessage extends BaseBean { @Column(name="MESSAGE_STATUS") @ApiParam(value = "消息状态") + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_STATUS.class) private Integer messageStatus; public int getMessageStatusValue() { @@ -81,4 +83,8 @@ public class SysRefUserMessage extends BaseBean { return messageStatus.intValue(); } } + + public String getMessageStatusTxt() { + return ImppEnumUtil.MESSAGE_STATUS.valueOfDescription(getMessageStatusValue()); + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java index b6bdcc9..8b2bd9f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java @@ -37,7 +37,7 @@ public class SysRefUserRole extends BaseBean { private Long userId; @Column(name="USER_NAME_RDD") - @ApiParam(value ="角色名称") + @ApiParam(value ="用户名称") private String userNameRdd; @Column(name="ROLE_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java new file mode 100644 index 0000000..19bbe3f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java @@ -0,0 +1,137 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:13 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_SEND_RECORD") +@ApiModel(value = "短信发送记录", description = "短信发送记录") +public class SysSmsSendRecord extends BaseBean { + + private static final long serialVersionUID = -3745690058553350416L; + + /** + * 发送回执ID + */ + @Column(name = "BIZ_ID") + @ApiModelProperty(value = "回执id") + private String bizId; + + /** + * 软件模块 + */ + @Column(name = "SOFT_TYPE") + @ApiModelProperty(value = "软件模块") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + /** + * 接收手机号 + */ + @Column(name = "RECEIVE_PHONE_NUMBER") + @ApiModelProperty(value = "接收手机号") + private String receivePhoneNumber; + + /** + * 模板代码 + */ + @Column(name = "TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String templateCode; + + /** + * 模板名称 + */ + @Column(name = "TEMPLATE_NAME") + @ApiModelProperty(value = "模板名称") + private String templateName; + + /** + * 短信签名代码 + */ + @Column(name = "SMS_SIGN_CODE") + @ApiModelProperty(value = "短信签名代码") + private String smsSignCode; + + /** + * 短信签名 + */ + @Column(name = "SMS_SIGN") + @ApiModelProperty(value = "短信签名") + private String smsSign; + + /** + * 短信内容 + */ + @Column(name = "SMS_CONTENT") + @ApiModelProperty(value = "短信内容") + private String smsContent; + + /** + * 短信内容 + */ + @Column(name = "SMS_Param", length = 1000) + @ApiModelProperty(value = "短信参数") + private String smsParam; + + /** + * 短信发送状态 + */ + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SEND_STATUS.class) + @Column(name = "SMS_SEND_STATUS") + @ApiModelProperty(value = "短信发送状态") + private Integer smsSendStatus; + + public String getSmsSendStatusTxt() { + return smsSendStatus == null ? null : ImppEnumUtil.SMS_SEND_STATUS.valueOfDescription(smsSendStatus); + } + + /** + * 短信发送时间 + */ + @Column(name = "SEND_DATE_TIME") + @ApiModelProperty(value = "短信发送时间") + private String sendDateTime; + + /** + * 短信接收日期和时间 + */ + @Column(name = "RECEIVE_DATE_TIME") + @ApiModelProperty(value = "短信接收日期和时间") + private String receiveDateTime; + + /** + * 短信发送异常信息 + */ + @Lob + @Column(name = "SEND_ERR_MSG") + @ApiModelProperty(value = "短信发送异常信息") + private String sendErrMsg; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java new file mode 100644 index 0000000..e3a4ef8 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 短信签名 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_SIGN") +@ApiModel(value = "短信签名", description = "短信签名") +public class SysSmsSign extends BaseBean { + + private static final long serialVersionUID = -8979657974497978428L; + + /** + * 签名 + */ + @Column(name = "SIGN_NAME") + @ApiModelProperty(value = "签名") + private String signName; + + /** + * 签名代码 + */ + @Column(name = "SIGN_CODE") + @ApiModelProperty(value = "签名代码") + private String signCode; + + /** + * 签名描述 + */ + @Column(name = "SIGN_DESC") + @ApiModelProperty(value = "签名描述") + private String signDesc; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java new file mode 100644 index 0000000..40bf0f3 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java @@ -0,0 +1,118 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 短信模板 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_TEMPLATE") +@ApiModel(value = "短信模板", description = "短信模板") +public class SysSmsTemplate extends BaseBean { + + private static final long serialVersionUID = -3879367761511016412L; + + /** + * 模板名称 + */ + @Column(name = "TEMPLATE_NAME") + @ApiModelProperty(value = "模板名称") + private String templateName; + + /** + * 模板代码 + */ + @Column(name = "TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String templateCode; + + /** + * 模板代码 + */ + @Column(name = "SUPPLIER_TEMPLATE_CODE") + @ApiModelProperty(value = "供应商模板代码") + private String supplierTemplateCode; + + /** + * 模板类型 + */ + @AnnoOutputColumn + @Column(name = "TEMPLATE_TYPE") + @ApiModelProperty(value = "模板类型") + private Integer templateType; + + /** + * 供应商类型 + */ + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SUPPLIER.class) + @Column(name = "SUPPLIER_TYPE") + @ApiModelProperty(value = "供应商类型") + private Integer supplierType; + + public String getSupplierTypeTxt() { + return supplierType == null ? null : ImppEnumUtil.SMS_SUPPLIER.valueOfDescription(supplierType); + } + + /** + * 模板状态 + */ + @Column(name = "TEMPLATE_STATUS") + @ApiModelProperty(value = "模板状态") + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class) + private Integer templateStatus; + + public String getTemplateStatusTxt() { + return templateStatus == null ? null : ImppEnumUtil.SMS_TEMPLATE_STATUS.valueOfDescription(templateStatus); + } + + /** + * 模板内容 + */ + @Column(name = "TEMPLATE_CONTENT") + @ApiModelProperty(value = "模板内容") + private String templateContent; + + /** + * 模板描述 + */ + @Column(name = "TEMPLATE_DESC") + @ApiModelProperty(value = "模板描述") + private String templateDesc; + + + /** + * 是否修改模板内容 + */ + @Transient + @ApiModelProperty(value = "是否修改模板内容") + private Integer isModifyContent; + + /** + * 审批备注 + */ + @Transient + @ApiModelProperty(value = "审批备注") + private String reason; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java new file mode 100644 index 0000000..f5985dc --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-13 17:35 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_SOFT_UPDATE_RECORD") +@ApiModel(value="软件更新记录",description = "软件更新记录") +public class SysSoftUpdateRecord extends BaseBean { + + @Column(name="SYSTEM_SOFT_TYPE") + @ApiParam(value ="系统软件类型") + private Integer systemSoftType; + + public String getSystemSoftTypeTxt(){ + return systemSoftType == null ? "无" : CommonEnumUtil.SOFT_TYPE.valueOfDescription(systemSoftType); + } + + @Column(name="SYSTEM_VERSION") + @ApiParam(value ="系统版本") + private String systemVersion; + + @Lob + @Column(name="UPDATE_CONTENT") + @ApiParam(value ="更新内容") + private String updateContent; + + @Column(name="FIRST_DEPLOYMENT_TIME") + @ApiParam(value ="首次部署时间") + private String firstDeploymentTime; + + @Transient + private Map> updateDetailMap; + + public void putUpdateDetail(String detailType, String detail) { + if(updateDetailMap == null){ + updateDetailMap = new HashMap<>(); + } + + List detailList; + if (updateDetailMap.containsKey(detailType)) { + detailList = updateDetailMap.get(detailType); + } else { + detailList = new ArrayList<>(); + updateDetailMap.put(detailType, detailList); + } + + detailList.add(detail); + } + + public void transformUpdateDetail() { + this.updateContent = JSON.toJSONString(updateDetailMap); + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 643cb74..2e48409 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -9,9 +9,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -28,88 +28,96 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_USER") -@Api(value="账号登陆表",description = "账号登陆系统账户。") +@Table(name = "SYS_USER") +@Api(value = "账号登陆表", description = "账号登陆系统账户。") public class SysUser extends BaseBean { private static final long serialVersionUID = 3721769401146979123L; - @Column(name="USER_INFO_ID") - @ApiParam(value ="人员ID" , example = "-1") + @Column(name = "USER_INFO_ID") + @ApiParam(value = "人员ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userInfoId; - @Column(name="LANGUAGE_CODE") - @ApiParam(value ="用户语言") + @Column(name = "LANGUAGE_CODE") + @ApiParam(value = "用户语言") private String languageCode; - @Column(name="USER_NAME_RDD") - @ApiParam(value ="用户名称" , access ="账号名称") + @Column(name = "USER_NAME_RDD") + @ApiParam(value = "用户名称", access = "账号名称") private String userName; - @Column(name="USER_LOGIN_NAME") - @ApiParam(value ="登陆名称" , access ="登陆名称") + @Column(name = "USER_LOGIN_NAME") + @ApiParam(value = "登陆名称", access = "登陆名称") private String userLoginName; - @Column(name="USER_EMP_NO") - @ApiParam(value ="工号") + @Column(name = "USER_EMP_NO") + @ApiParam(value = "工号") private String userEmpNo; @Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用 - @Column(name="USER_LOGIN_PASSWORD") - @ApiParam(value ="登陆密码") + @Column(name = "USER_LOGIN_PASSWORD") + @ApiParam(value = "登陆密码") private String userLoginPassword; - @Column(name="USER_LOGIN_PASSWORD_ID") - @ApiParam(value ="密码ID" , example = "-1") + @Column(name = "USER_LOGIN_PASSWORD_ID") + @ApiParam(value = "密码ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long userLoginPasswordId; - @Column(name="USER_TYPE") - @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + @Column(name = "USER_PASSWORD_LAST_MODIFY_TIME") + @ApiParam(value = "用户最后一次修改密码时间") + private String userPasswordLastModifyTime; + + @Column(name = "USER_TYPE") + @ApiParam(value = "账号类型（枚举，待定）", example = "-1") private Integer userType; - @Column(name="USER_EMAIL") - @ApiParam(value ="邮箱" , access ="邮箱") + @Column(name = "USER_EMAIL") + @ApiParam(value = "邮箱", access = "邮箱") private String userEmail; - @Column(name="USER_PHONE") - @ApiParam(value ="手机号" , access ="手机号") + @Column(name = "USER_PHONE") + @ApiParam(value = "手机号", access = "手机号") private String userPhone; - @Column(name="USER_STATUS") - @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + @Column(name = "USER_WECHAT_NO") + @ApiParam(value = "微信号") + private String userWeChatNo; + + @Column(name = "USER_STATUS") + @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1") private Integer userStatus; - @Column(name="USER_LOGIN_NUM") - @ApiParam(value ="登录次数",example = "0") + @Column(name = "USER_LOGIN_NUM") + @ApiParam(value = "登录次数", example = "0") private Integer userLoginNum; @Deprecated - @Column(name="USER_LOGIN_LAST_DATE_TIME") - @ApiParam(value ="账号最后登录时间") + @Column(name = "USER_LOGIN_LAST_DATE_TIME") + @ApiParam(value = "账号最后登录时间") private String userLoginLastDateTime; -/********************************** 关系信息 ********************************/ + /********************************** 关系信息 ********************************/ - @Column(name="DEPARTMENT_ID") - @ApiParam(value ="部门ID" , example ="-1") + @Column(name = "DEPARTMENT_ID") + @ApiParam(value = "部门ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long departmentId; - @Column(name="ORGANIZE_ID") - @ApiParam(value ="组织ID" , example = "0") + @Column(name = "ORGANIZE_ID") + @ApiParam(value = "组织ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long organizeId; -/********************************** 冗余信息 ********************************/ + /********************************** 冗余信息 ********************************/ - @Column(name="DEPARTMENT_NAME_RDD") - @ApiParam(value ="部门名称" , access ="部门名称") + @Column(name = "DEPARTMENT_NAME_RDD") + @ApiParam(value = "部门名称", access = "部门名称") private String departmentNameRdd; - @Column(name="ORGANIZE_NAME_RDD") - @ApiParam(value ="组织名称" , access ="组织名称") + @Column(name = "ORGANIZE_NAME_RDD") + @ApiParam(value = "组织名称", access = "组织名称") private String organizeNameRdd; // @Lob @@ -127,44 +135,44 @@ public class SysUser extends BaseBean { // @ApiParam(value ="组织名称集合") // private String organizeNamesRdd; -/********************************** 非数据库信息 ********************************/ + /********************************** 非数据库信息 ********************************/ @Transient - @ApiParam(value ="用户部门信息") + @ApiParam(value = "用户部门信息") private SysDepartment department; @Transient - @ApiParam(value ="用户组织信息") + @ApiParam(value = "用户组织信息") private SysOrganize organize; @Transient - @ApiParam(value ="账号所有操作组织信息") + @ApiParam(value = "账号所有操作组织信息") private List organizeList; @Transient - @ApiParam(value ="账号所有操作部门 Id 集合") + @ApiParam(value = "账号所有操作部门 Id 集合") private List departmentIdList; @Transient - @ApiParam(value ="账号所有操作部门信息") + @ApiParam(value = "账号所有操作部门信息") private List departmentList; @Transient - @ApiParam(value ="角色ID" , example = "0") + @ApiParam(value = "角色ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long roleId; @Transient - @ApiParam(value ="角色ID集合" , example = "0") + @ApiParam(value = "角色ID集合", example = "0") @JsonSerialize(using = ToStringSerializer.class) private List roleIdList; @Transient - @ApiParam(value ="账号所有角色信息") + @ApiParam(value = "账号所有角色信息") private List roleList; @Transient - @ApiParam(value ="账号所有操作权限信息") + @ApiParam(value = "账号所有操作权限信息") private List menuList; /*** test ***/ diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java new file mode 100644 index 0000000..68a5917 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-08-10 15:13 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_USER_CUSTOMIZE_CONFIG") +@ApiModel(value="用户定制化配置",description = "用户定制化配置") +public class SysUserCustomizeConfig extends BaseBean { + + private static final long serialVersionUID = -3757585990009089233L; + + @Column(name="USER_ID") + @ApiModelProperty(value ="用户id" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="CUSTOMIZE_CONFIG_TYPE") + @ApiModelProperty(value ="定制化配置类型" , example = "-1") + @AnnoOutputColumn(refClass = ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.class) + private Integer customizeConfigType; + + public String getCustomizeConfigTypeTxt() { + return customizeConfigType == null ? "无" : ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.valueOf(customizeConfigType); + } + + @Column(name="CONFIG_KEY") + @ApiModelProperty(value ="定制化配置类型" , example = "-1") + private String configKey; + + @Column(name="CONFIG_VALUE") + @ApiModelProperty(value ="配置值" , example = "-1") + private String configValue; + + public String getRedisKey(String keyPrefix) { + String redisKey = this.getUserId() + ":" + this.getCustomizeConfigType() + ":" + this.getConfigKey(); + if (StringUtils.isNotBlank(keyPrefix)) { + return keyPrefix + ":" + redisKey; + } else { + return redisKey; + } + } + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index fded310..a11bded 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -140,7 +141,7 @@ public class SysUserInfo extends BaseBean { @Column(name="USER_INFO_STATUS") @ApiParam(value ="用户状态" , example ="-1") - @AnnoOutputColumn(hidden = true) + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userInfoStatus; @Column(name="USER_LOGIN_NUM") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index d53eb6b..f45692e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -8,12 +8,6 @@ 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 org.springframework.data.mongodb.core.mapping.Document; - -import javax.persistence.Column; -import javax.persistence.Table; /** * @Description : @@ -23,115 +17,88 @@ import javax.persistence.Table; * @Modify: **/ @Data -@Document -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_CONSOLE") @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogConsole extends BaseBean { private static final long serialVersionUID = -6073378683575266830L; /******** 服务器信息 ********/ - @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") private Integer softType; public String getSoftTypeTxt() { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Column(name="LOG_HOST") @ApiParam(value ="服务器IP") private String logHost; - @Column(name="LOG_PID") @ApiParam(value ="应用PID") @JsonSerialize(using = ToStringSerializer.class) private Long logPid; - @Column(name="LOG_PORT") @ApiParam(value ="应用端口") private Integer logPort; - @Column(name="LOG_GROUP") @ApiParam(value ="日志分组(日志记录器名称，getLogger方法的参数值)") private String logGroup; - @Column(name="LOG_LEVEL") @ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)") private String logLevel; - @Column(name="LOG_TYPE") @ApiParam(value ="操作类型(post,put,get)") private String logType; /******** 用户信息 ********/ - @Column(name="USER_HOST") @ApiParam(value ="用户登录IP") private String userHost; - @Column(name="USER_BROWSER") @ApiParam(value ="用户登录浏览器") private String userBrowser; - @Column(name="USER_OS") @ApiParam(value ="用户登录操作系统") private String userOs; - @Column(name="USER_ID") @ApiParam(value ="账号ID") @JsonSerialize(using = ToStringSerializer.class) private Long userId; - @Column(name="USER_LOGIN_NAME") @ApiParam(value ="用户登录名称") private String userLoginName; /******** 日志信息 ********/ - @Column(name="REQUEST_ID") @ApiParam(value ="请求ID") @JsonSerialize(using = ToStringSerializer.class) private Long requestId; - @Column(name="EXECUTE_THREAD_ID") @ApiParam(value ="执行线程") private String executeThreadId; - @Column(name="EXECUTE_CLASS_NAME") @ApiParam(value ="执行Class") private String executeClassName; - @Column(name="EXECUTE_METHOD") @ApiParam(value ="执行方法") private String executeMethod; - @Column(name="EXECUTE_LINE_NUMBER") @ApiParam(value ="报错行数") private Integer executeLineNumber; - @Column(name="EXECUTE_TITLE") @ApiParam(value ="方法标题") private String executeTitle; - @Column(name="EXECUTE_ARGS") @ApiParam(value ="执行参数") private String executeArgs; - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") private Integer executeTime; - @Column(name="EXECUTE_STATUS") @ApiParam(value ="执行状态") private String executeStatus; - @Column(name="EXECUTE_MESSAGE") @ApiParam(value ="执行日志信息") private String executeMessage; - @Column(name="ERROR_STACK_TRACE",length = 5000) @ApiParam(value ="执行异常堆栈信息") private String errorStackTrace; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index 90e1854..7b67f0d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -7,14 +7,8 @@ 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 org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * @Description : 系统异常 @@ -24,18 +18,13 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION") @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { private static final long serialVersionUID = -2844455884020022321L; //CommonEnumUtil.SOFT_TYPE - @Indexed - @Column(name="SOFT_TYPE") + @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer softType; @@ -43,15 +32,12 @@ public class SysLogException extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Column(name="EXC_CLASS_NAME") @ApiParam(value ="异常类名") private String excClassName; - @Column(name="EXC_MESSAGE") @ApiParam(value ="异常信息") private String excMessage; - @Column(name="EXC_STACK") @ApiParam(value ="堆栈信息") private String excStack; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index f14accf..9c3dfc0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -12,75 +12,64 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; -import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.Table; /** * @Description : 用户操作日志表 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 16:58:42.720 - * @Modify : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:42.720 + * @Modify : **/ @Data -@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_OPERATE") -@Api(value="操作日志表",description = "操作日志表") +@Table(name = "SYS_LOG_OPERATE") +@Api(value = "操作日志表", description = "操作日志表") public class SysLogOperate extends BaseBean { private static final long serialVersionUID = 1515035521283176727L; - @Indexed - @Column(name="SOFT_TYPE") - @ApiParam(value ="系统模块（枚举）", example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "系统模块（枚举）", example = "1") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description") private Integer softType; + public String getSoftTypeTxt() { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Indexed - @Column(name="OPERATE_TYPE") - @ApiParam(value ="操作类型" , example = "-1") - @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "操作类型", example = "-1") + @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class, refForeignKey = "value", value = "description") private Integer operateType; - public String getOperateTypeTxt(){ + public String getOperateTypeTxt() { return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType); } - @Column(name="OPERATE_MESSAGE") - @ApiParam(value ="操作信息" , access ="操作信息") + @ApiParam(value = "操作信息", access = "操作信息") private String operateMessage; - @Column(name="USER_LOGIN_NAME") - @ApiParam(value ="登录用户名称" , access ="登录用户名称") + @ApiParam(value = "登录用户名称", access = "登录用户名称") private String userLoginName; - @Column(name="REMOTE_IP") - @ApiParam(value ="请求IP" , access ="请求IP") + @ApiParam(value = "请求IP", access = "请求IP") private String remoteIp; - @Column(name="REQUEST_URL") - @ApiParam(value ="请求路径" , access ="请求路径") + @ApiParam(value = "本机名/Ip", access = "本机名/Ip") + private String serverHost; + + @ApiParam(value = "请求路径", access = "请求路径") private String requestUrl; // @Column(name="HTTP_METHOD") // @ApiParam(value ="http请求方法" , access ="http请求方法") // private String httpMethod; - @Column(name="LOG_ARGS") - @ApiParam(value ="方法入参" , access ="方法入参") + @ApiParam(value = "方法入参", access = "方法入参") private String logArgs; - @Column(name="EXECUTE_TIME") - @ApiParam(value ="执行耗时") + @ApiParam(value = "执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index c45cd05..789e923 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -10,14 +10,8 @@ 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 org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * @Description : 系统日志表 @@ -27,17 +21,11 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_SYSTEM") @Api(value="系统日志表",description = "系统日志表") public class SysLogSystem extends BaseBean { private static final long serialVersionUID = -2209777442410263684L; - @Indexed - @Column(name="LOG_LEVEL") @ApiParam(value ="日志级别" , example ="1") @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name") private Integer logLevel; @@ -45,8 +33,6 @@ public class SysLogSystem extends BaseBean { return logLevel == null ? null : ImppEnumUtil.LOG_LEVEL.valueOfDescription(logLevel); } - @Indexed - @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer softType; @@ -54,8 +40,6 @@ public class SysLogSystem extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Indexed - @Column(name="LOG_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer logModuleId; @@ -63,48 +47,37 @@ public class SysLogSystem extends BaseBean { return logModuleId == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(logModuleId); } - @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; - @Column(name="REQUEST_URL") @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; - @Column(name="HTTP_METHOD") @ApiParam(value ="http请求方法" , access ="http请求方法") private String httpMethod; - @Column(name="LOG_CLASS") @ApiParam(value ="触发类路径" , access ="触发类路径") private String logClass; - @Column(name="LOG_METHOD") @ApiParam(value ="触发方法" , access ="触发方法") private String logMethod; - @Column(name="ARGS_COUNT") @ApiParam(value ="入参数量" , access ="入参数量", example = "0") private Integer argsCount; - @Column(name="LOG_ARGS") @ApiParam(value ="方法入参" , access ="方法入参") private String logArgs; - @Column(name="LOG_TITLE") @ApiParam(value ="日志标题") private String logTitle; - @Column(name="LOG_DETAIL") @ApiParam(value ="日志详情") private String logDetail; - @Column(name="SERVER_HOST") @ApiParam(value ="服务器") private String serverHost; - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 9d1de96..f94befb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -11,11 +11,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Table; /** * @Description : 定时任务执行记录 @@ -25,72 +22,60 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_TASK_TIME") @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { private static final long serialVersionUID = -841008177433745529L; - @Column(name="SCHEDULER_INSTANCE_ID") @ApiParam(value ="调度器实例id") private String schedulerInstanceId; - @Column(name="SCHEDULER_SERVER_IP") @ApiParam(value ="调度服务器ip") private String schedulerServerIp; - @Column(name="SCHEDULER_SERVER_PORT") @ApiParam(value ="调度服务器端口") private Integer schedulerServerPort; - @Column(name="TASK_THREAD_ID") @ApiParam(value ="任务线程id") @JsonSerialize(using = ToStringSerializer.class) private Long taskThreadId; - @Column(name="NAME") @ApiParam(value ="任务名称") private String name; - @Column(name="GROUP_NAME") @ApiParam(value ="任务组名称") private String groupName; - @Column(name="TASK_PLAN_ID") @ApiParam(value ="任务计划id" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long taskPlanId; - @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") private Integer softType; public String getSoftTypeTxt() { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Column(name="TASK_CYCLE_NAME_RDD") @ApiParam(value ="任务周期名称") private String taskCycleNameRdd; - @Column(name="TASK_CYCLE_EXPS_RDD") @ApiParam(value ="任务周期表达式") private String taskCycleExpsRdd; - @Indexed - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; - @Column(name="TASK_STATUS") @ApiParam(value ="任务完成情况(枚举：1正常，2失败)") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer taskStatus; - @Column(name="TASK_LOG_ERROR") + public int getTaskStatusVal() { + return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus; + } + @ApiParam(value ="任务异常日志") private String taskLogError; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java deleted file mode 100644 index 6fe78cc..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; - -/** - * @Description : 异常记录表(使用Mongodb) - * @Reference : - * @Author : frin - * @Date : 2018-11-8 12:03:00 - * @Modify : - **/ -public interface SysLogExceptionRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java deleted file mode 100644 index e33b7c7..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; - -/** - * @Description : 操作日志表(使用Mongodb) - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:00.118 - * @Modify : - **/ -public interface SysLogOperateRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java deleted file mode 100644 index eddc176..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; - -/** - * @Description : 系统日志表 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:00.158 - * @Modify : - **/ -public interface SysLogSystemRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java deleted file mode 100644 index 1ce1eef..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; - -/** - * @Description : - * @Reference : - * @Author : yunhao - * @CreateDate : 2018-12-20 22:35 - * @Modify: - **/ -public interface SysLogTaskTimeRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRecordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRecordRepository.java new file mode 100644 index 0000000..146591d --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRecord; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-03 22:01 + * @Modify: + **/ +public interface SysOrderNoRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserExternalRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserExternalRepository.java new file mode 100644 index 0000000..d6ae840 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserExternalRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserExternal; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-03 13:44 + * @Modify: + **/ +public interface SysRefUserExternalRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java new file mode 100644 index 0000000..2ea1dd5 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsSendRecord; + +/** + * @Description : 短信发送记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:52 + * @Modify: + **/ +public interface SysSmsSendRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java new file mode 100644 index 0000000..0e1adaf --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsSign; + +/** + * @Description : 短信签名 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:51 + * @Modify: + **/ +public interface SysSmsSignRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java new file mode 100644 index 0000000..94d50ba --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsTemplate; + +/** + * @Description : 短信模板 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:52 + * @Modify: + **/ +public interface SysSmsTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java new file mode 100644 index 0000000..9b9953c --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSoftUpdateRecord; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-14 13:15 + * @Modify: + **/ +public interface SysSoftUpdateRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java index f74a350..614b9a7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java @@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import org.springframework.data.jpa.repository.Lock; +import org.springframework.data.jpa.repository.Query; + +import javax.persistence.LockModeType; /** * @Description : 设备类型 @@ -11,4 +15,9 @@ import cn.estsh.i3plus.pojo.platform.bean.SysToolType; * @Modify : **/ public interface SysToolTypeRepository extends BaseRepository { + + @Lock(LockModeType.PESSIMISTIC_WRITE) + @Query(value = "from SysToolType where id = ?1") + SysToolType getByIds(Long id); + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java new file mode 100644 index 0000000..5093383 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysUserCustomizeConfig; + +/** + * @Description : 用户定制化配置 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-08-10 15:34 + * @Modify: + **/ +public interface SysUserCustomizeConfigRepository extends BaseRepository { +} 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 225cfd7..48f81e2 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 @@ -98,8 +98,7 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(resource.getResourceType(), "resourceType", result); // 是否多类型查询 if (StringUtils.isNotBlank(resource.getResourceTypes())) { - DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); - } + DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); } DdlPreparedPack.getNumEqualPack(resource.getSoftType(), "softType", result); DdlPreparedPack.getNumEqualPack(resource.getIsSystem(), "isSystem", result); @@ -345,8 +344,8 @@ public class CoreHqlPack { public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) { DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumNOEqualPack(role.getId(), "id", result); DdlPreparedPack.getStringEqualPack(role.getName(), "name", result); - DdlPreparedPack.getNumEqualPack(role.getId(), "id", result); return result; } @@ -476,6 +475,7 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean); DdlPreparedPack.getOrderDefault(message); + ddlPackBean.setOrderByStr(message.orderBy()); return ddlPackBean; } @@ -487,6 +487,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysFile(SysFile file) { + DdlPreparedPack.getOrderDefault(file); DdlPackBean result = DdlPackBean.getDdlPackBean(file); // hql拼接 @@ -582,11 +583,11 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); // DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(), "userEmpNo", result); // DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList, "id", result); @@ -662,7 +663,7 @@ public class CoreHqlPack { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result); + DdlPreparedPack.getStringEqualAndAllowBlankPack(dictionary.getDictionaryValue(), "dictionaryValue", result); DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not @@ -846,6 +847,7 @@ public class CoreHqlPack { public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage) { StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageId(), "messageId", result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(), "messageTypeRdd", result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(), "messageSoftType", result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(), "messageTitleRdd", result); @@ -1140,13 +1142,201 @@ public class CoreHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan){ + public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTaskPlan); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(),"id",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(),"name",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(),"groupName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(), "name", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(), "groupName", ddlPackBean); return ddlPackBean; } + + public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); + + DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); + + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLogUserLogin); + + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(), "logLoginStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(), "logLoginPlatform", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(), "logLoginName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginHost(), "logLoginHost", ddlPackBean); + DdlPreparedPack.timeBuilder(sysLogUserLogin.getLogLoginDateTime(), "logLoginDateTime", ddlPackBean, false, true); + + return ddlPackBean; + } + + public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef, List valueList) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean); + DdlPreparedPack.getInPackList(valueList, "valueList", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef, List userIdList) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean); + DdlPreparedPack.getInPackList(userIdList, "userId", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysRefUserExternal); + + DdlPreparedPack.getNumEqualPack(sysRefUserExternal.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysRefUserExternal.getExternalRef(), "externalRef", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysRefUserExternal.getRefValue(), "refValue", ddlPackBean); + + return ddlPackBean; + } + + + public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); + + DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSoftUpdateRecord.getSystemVersion(), "systemVersion", ddlPackBean); + DdlPreparedPack.timeBuilder(sysSoftUpdateRecord.getFirstDeploymentTime(), "firstDeploymentTime", ddlPackBean, false, + true); + + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); + + DdlPreparedPack.getNumNOEqualPack(sysSoftUpdateRecord.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSoftUpdateRecord.getSystemVersion(), "systemVersion", ddlPackBean); + + return ddlPackBean; + } + + + public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment); + + DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize); + + DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装检查短信签名唯一hql + * + * @param sysSmsSign 短信签名信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlCheckSysSmsSignOnly(SysSmsSign sysSmsSign) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign); + + DdlPreparedPack.getNumNOEqualPack(sysSmsSign.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信签名查询hql + * + * @param sysSmsSign 短信签名信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsSign(SysSmsSign sysSmsSign) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign); + + DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignName(), "signName", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装检查短信模板唯一hql + * + * @param sysSmsTemplate 短信模板信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlCheckSysSmsTemplateOnly(SysSmsTemplate sysSmsTemplate) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate); + + DdlPreparedPack.getNumNOEqualPack(sysSmsTemplate.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信模板查询hql + * + * @param sysSmsTemplate 短信模板信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsTemplate(SysSmsTemplate sysSmsTemplate) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate); + + DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信发送记录查询hql + * + * @param sysSmsSendRecord 短信发送记录 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsSendRecord(SysSmsSendRecord sysSmsSendRecord) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSendRecord); + + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getReceivePhoneNumber(), "receivePhoneNumber", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getBizId(), "bizId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSoftType(), "softType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSmsSendStatus(), "smsSendStatus", ddlPackBean); + DdlPreparedPack.timeBuilder(sysSmsSendRecord.getSendDateTime(), "smsSendStatus", ddlPackBean,false,true); + + return ddlPackBean; + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java index e3bf5e0..5d08743 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "IF_PICK_DATA") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("IF_拣货数据") public class IfPickData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java index 258296d..0e69bc5 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTION_MODULE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("作业组件") public class PtlActionModule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java index 90e4cd7..0f90de3 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTION_MODULE_GROUP") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("组件集") public class PtlActionModuleGroup extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java index e3bd0f0..f02bc31 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTION_MODULE_PARAM") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("组件参数") public class PtlActionModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java index eac7e13..7e593b1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTION_ROUTE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("作业流程") public class PtlActionRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java index d3bbefe..c074f6f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTOR") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR信息") public class PtlActor extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java index f8fa5fb..20507fe 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTOR_RULE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR消息获取规则") public class PtlActorRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java index 05de822..3eed4b2 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,7 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域") public class PtlArea extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java index ad66202..99a1751 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_ACTOR_ACTION") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_区域观察者事件配置") public class PtlAreaActorAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java index c5a58e1..df61f2d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_ROUTE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域作业流程") public class PtlAreaRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java index 34c5e42..ba1f840 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_ROUTE_MODULE_PARAM") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_区域流程组件调用参数") public class PtlAreaRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index 8bed06c..75b2a3e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,7 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_SECTION_TASK") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区段亮灯任务") public class PtlAreaSectionTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java index 3e14e31..5d5704d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_SECTION_TASK_DETAIL") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区段亮灯任务明细") public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index 2df3ce2..a91b4a3 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_TASK") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域亮灯任务") public class PtlAreaTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java index b8a8825..7afbfd0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_TASK_SEQ") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域任务进度") public class PtlAreaTaskSeq extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 972e412..a871bdf 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.ptl.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_BOM") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) public class PtlBom extends BaseBean implements Serializable { private static final long serialVersionUID = 2676195473413945030L; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java index 3f1c2d1..8426ec5 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_CONFIG") @Api("PTL配置表") public class PtlConfig extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index fce2d11..cdd6725 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_CONTROL") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("控制器") public class PtlControl extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java index de26af7..5f775b5 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ELEMENT") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("元素") public class PtlElement extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java index 5763636..158f68a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ELEMENT_ATTRIBUTE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("元素属性") public class PtlElementAttribute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java index ab70950..f716e87 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_IF") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_接口清单") public class PtlIf extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java index 8bde78c..10a6062 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_INTERFACE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("界面") public class PtlInterface extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java index 6412bb4..2450e58 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_INTERFACE_ELEMENT") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("界面元素") public class PtlInterfaceElement extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java index 8a7c756..c57d0f5 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_INTERFACE_ELEMENT_ATTRIBUTE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("界面元素属性") public class PtlInterfaceElementAttribute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java index eb3e19d..8387854 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,7 +25,7 @@ import java.util.List; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") public class PtlLabelTemplate extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java index de2c8ac..3eaf1ea 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,7 +26,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") public class PtlLabelTemplateParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java new file mode 100644 index 0000000..6f8c41b --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_LOG") +@Inheritance(strategy = InheritanceType.JOINED) +@Api("PTL_LOG") +public class PtlLog extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3885987217528730391L; + + @Column(name = "METHOD_NAME") + @ApiParam(value = "方法名") + private String methodName; + + @Column(name = "EXCEPTION_LOG") + @ApiParam(value = "异常日志") + private String exceptionLog; + + @Column(name = "CONTROL_CODE") + @ApiParam(value = "控制器") + private String controlCode; + + @Column(name = "IP") + @ApiParam(value = "IP") + private String ip; + + @Column(name = "AREA_NO") + @ApiParam(value = "区域") + private String areaNo; + + @Column(name = "SECTION_CODE") + @ApiParam(value = "区段") + private String sectionCode; + + @Column(name = "TAG_NO") + @ApiParam(value = "标签地址") + private Integer tagNo; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java index 6733022..eeef653 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_MAIN_TASK") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("主任务") public class PtlMainTask extends BaseBean implements Serializable { @@ -86,6 +88,10 @@ public class PtlMainTask extends BaseBean implements Serializable { @ApiParam("区域代码") private String areaNo; + @Column(name = "SECTION_NO") + @ApiParam("区段代码") + private String sectionNo; + @Column(name = "TASK_TYPE") @ApiParam("任务类型") private String taskType; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java index d273e3e..8ec0c8a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_MAIN_TASK_DETAIL") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("主任务明细") public class PtlMainTaskDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java index cdf49e6..f0e69a9 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_MESSAGE_TYPE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("消息类型") public class PtlMessageType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java index 3b9f24f..7fb3553 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_MESSAGE_TYPE_FORMAT") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("消息类型格式") public class PtlMessageTypeFormat extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java index cd2ba93..9eedd02 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_METHOD") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("方法清单") public class PtlMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java index 982dcef..3b15e57 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_OBJECT_DAO") @Api("PTL_对象与dao对应关系") public class PtlObjectDao extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java index 16331af..493be03 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_PART") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("物料") public class PtlPart extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java index b822a40..0cc37a6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,7 +26,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN") @Api("PCN节点") public class PtlPcn extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java index f7001d4..8bc9d01 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,7 +28,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @Table(name = "PTL_PCN_CLEAR") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_PCN数据清理") public class PtlPcnClear extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java index e966b3e..780c739 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,7 +26,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class PtlPcnConnectLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java index 18a7d10..7d4bcc6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,7 +28,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_SYNC_CFG") @Api("PTL_PCN_同步配置") public class PtlPcnSyncCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java index 486b07c..e1b734e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_SYNC_ERRORLOG") @Api("PTL_PCN同步异常日志") public class PtlPcnSyncErrorLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java index 3f67269..3d2343e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_TASK") @Api("ptl-pcn定时任务工作清单") public class PtlPcnTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java index 58d21b7..5261e3f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_TASK_LOG") @Api("ptl-pcn定时任务工作清单同步记录") public class PtlPcnTaskLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java index 4bfd0b9..8b69996 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,7 +26,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="PTL_PRINTER_CONFIGURE") @Api("打印机配置表") public class PtlPrinterConfigure extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java index 22f7119..8832189 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="PTL_PRINTING_QUEUE") @Api("待打印队列表") public class PtlPrintingQueue extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java index 6c57df7..9c31083 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_RFID") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_RFID") public class PtlRfid extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java index 9d7dce2..2f9dd95 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ROUTE_MODULE_PARAM") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_流程组件调用参数") public class PtlRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java index 319d501..913489b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ROUTE_STATUS") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态") public class PtlRouteStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index 4e4d276..23cda83 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ROUTE_STATUS_ERROR_RECORD") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态异常记录") public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java index 0faefbd..00634cf 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_SECTION") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区段") public class PtlSection extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java index b504674..733320b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -21,7 +23,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_SYNC_DEAD_LETTER", indexes = { @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"), @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java index d07f684..ff09f32 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,7 +29,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_SYS_USER_OFFLINE") @Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class PtlSysUserOffline extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index a897694..9111cd0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_TAG") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("标签信息") public class PtlTag extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java index 0f63c84..2cef980 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,7 +28,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="PTL_TEST_USER") @Api(value="PTL 测试用户",description = "测试用户") public class PtlTestUser extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java index 7033251..0ae6dc3 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -18,7 +20,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TIME") @Api("工步参数") public class PtlTime extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java new file mode 100644 index 0000000..d8d7409 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.IfPickData; +import cn.estsh.i3plus.pojo.ptl.bean.PtlLog; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlLogRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 4d24640..dbfb918 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -375,4 +375,47 @@ public class PtlHqlPack { DdlPreparedPack.getNumEqualPack(pickData.getSyncFlag(), "syncFlag", packBean); return packBean; } + + /** + * 区段 + * @param section + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlSection(PtlSection section, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(section, organizeCode); + DdlPreparedPack.getStringLikerPack(section.getAreaNo(), "areaNo", packBean); + DdlPreparedPack.getStringLikerPack(section.getSectionNo(), "sectionNo", packBean); + DdlPreparedPack.getStringLikerPack(section.getSectionName(), "sectionName", packBean); + return packBean; + } + + /** + * 控制器 + * @param control + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlControl(PtlControl control, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(control, organizeCode); + DdlPreparedPack.getStringLikerPack(control.getAreaNo(), "areaNo", packBean); + DdlPreparedPack.getStringLikerPack(control.getControlNo(), "controlNo", packBean); + DdlPreparedPack.getStringLikerPack(control.getControlName(), "controlName", packBean); + DdlPreparedPack.getNumEqualPack(control.getControlType(), "controlType", packBean); + return packBean; + } + + /** + * 物料 + * @param part + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlPart(PtlPart part, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode); + DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean); + DdlPreparedPack.getStringEqualPack(part.getPartType(), "partType", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..0fbfb69 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml new file mode 100644 index 0000000..6bef2bc --- /dev/null +++ b/modules/i3plus-pojo-screen/pom.xml @@ -0,0 +1,57 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + + 4.0.0 + + i3plus-pojo-screen + + + + i3plus.pojo + i3plus-pojo-base + + + org.springframework + spring-web + + + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${project.version} + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java new file mode 100644 index 0000000..f550999 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java @@ -0,0 +1,28 @@ +//package cn.estsh.i3plus.pojo.screen.annotation; +// +//import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +// +//import java.lang.annotation.Documented; +//import java.lang.annotation.ElementType; +//import java.lang.annotation.Retention; +//import java.lang.annotation.RetentionPolicy; +//import java.lang.annotation.Target; +// +///** +// * @author Wynne.Lu +// * @date 2021/3/30 下午9:11 +// * @desc +// */ +//@Retention(RetentionPolicy.RUNTIME) +//@Target({ElementType.FIELD) +//@Documented +//public @interface ReferTo { +// +// ScreenEnumUtil.DATA_RESOURCE_TYPE refType() default ScreenEnumUtil.DATA_RESOURCE_TYPE.ENUM; +// +// String refWhere(); +// +// String refField(); +// +// +//} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/BaseScreenBean.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/BaseScreenBean.java new file mode 100644 index 0000000..1485a11 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/BaseScreenBean.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午8:47 + * @desc + */ +@Data +public abstract class BaseScreenBean extends BaseBean { + private static final long serialVersionUID = 3535186340743573771L; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java new file mode 100644 index 0000000..25e3878 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 上午10:43 + * @desc + */ +@Entity +@Table(name = "SCR_ACTION") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("动作") +public class ScrAction extends BaseBean implements Serializable { + private static final long serialVersionUID = 3832856363595940018L; + + @Column(name = "ACTION_CODE") + @ApiModelProperty("动作代码") + private String actionCode; + + @Column(name = "ACTION_NAME") + @ApiModelProperty("动作名称") + private String actionName; + + @Column(name = "ACTION_TYPE") + @ApiModelProperty("动作类型") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.ACTION_TYPE actionType; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java new file mode 100644 index 0000000..2ccbb5c --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 上午10:43 + * @desc + */ +@Entity +@Table(name = "SCR_COMPONENT") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("组件") +public class ScrComponent extends BaseBean implements Serializable { + private static final long serialVersionUID = 3832856363595940018L; + + @Column(name = "COMPONENT_CODE") + @ApiModelProperty(value = "组件代码") + private String componentCode; + + @Column(name = "COMPONENT_TYPE") + @ApiModelProperty(value = "组件代码") + private String componentType; + + @Column(name = "MODEL_CODE") + @ApiModelProperty(value = "model代码") + private String modelCode; + + @Lob + @Column(name = "COMPONENT_PROPERTY") + @ApiModelProperty(value = "组件描述") + private String componentProperty; + + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java new file mode 100644 index 0000000..4576a2b --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:29 + * @desc + */ +@Entity +@Table(name = "SCR_DATA_AUTH") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("数据权限") +public class ScrDataAuth extends BaseBean implements Serializable { + private static final long serialVersionUID = 8099384243374450186L; + + @Column(name = "MODEL_CODE") + @ApiModelProperty("model代码") + private String modelCode; + + @Column(name = "MODEL_FIELD_CODE") + @ApiModelProperty("model字段代码") + private String modelFieldCode; + + @Column(name = "MODEL_FIELD_CONDITION") + @ApiModelProperty("model字段条件") + private String modelFieldCondition; + + @Column(name = "ACCESS_ROLES") + @ApiModelProperty("可以访问的角色") + private String accessRoles; + + @Column(name = "DENIED_ROLES") + @ApiModelProperty("拒绝访问的角色") + private String deniedRoles; + + @Column(name = "ACCESS_USERS") + @ApiModelProperty("可以访问的用户") + private String accessUsers; + + @Column(name = "DENIED_USERS") + @ApiModelProperty("拒绝访问的用户") + private String deniedUsers; + + @Column(name = "AUTH_TYPE") + @ApiModelProperty("权限类型 （行，列）") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.AUTH_TYPE authType; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java new file mode 100644 index 0000000..33cf2fc --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午1:27 + * @desc 数据对象管理 + */ +@Entity +@Table(name = "SCR_DATA_OBJECT") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("数据对象管理") +public class ScrDataObject extends BaseBean implements Serializable { + private static final long serialVersionUID = -270662014158685376L; + + @Column(name = "DATA_SOURCE_ID") + @ApiModelProperty(value = "数据源ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long dataSourceId; + + @Column(name = "DATA_OBJECT_CODE") + @ApiModelProperty(value = "数据对象代码") + private String dataObjectCode; + + @Column(name = "TABLE_NAME") + @ApiModelProperty(value = "表或视图名称") + private String tableName; + + @Column(name = "DATA_TYPE") + @ApiModelProperty(value = "数据类型") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.DATA_OBJECT_SOURCE dataType; + + @Column(name = "FIELD_CODE") + @ApiModelProperty(value = "字段代码") + private String fieldCode; + + @Column(name = "FIELD_TYPE") + @ApiModelProperty(value = "字段类型") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.JDBC_TYPES fieldType; + + @Column(name = "FIELD_SIZE") + @ApiModelProperty(value = "字段长度") + private Integer fieldSize; + + @Column(name = "DISPLAY_NAME") + @ApiModelProperty(value = "字段名称") + private String displayName; + + @Column(name = "DESCRIPTION") + @ApiModelProperty(value = "描述") + private String description; + + @Column(name = "NULLABLE") + @ApiModelProperty("是否能为空") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.NULLABLE nullable; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java new file mode 100644 index 0000000..8eb61aa --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午1:27 + * @desc + */ +@Entity +@Table(name = "SCR_DATA_OBJECT_INDEX") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("数据对象约束管理") +public class ScrDataObjectIndex extends BaseBean implements Serializable { + private static final long serialVersionUID = 8995523223574903326L; + + @Column(name = "DATA_OBJECT_CODE") + @ApiModelProperty("数据对象代码") + private String dataObjectCode; + + @Column(name = "INDEX_TYPE") + @ApiModelProperty("约束类型") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.INDEX_TYPE indexType; + + @Column(name = "GROUP_NO") + @ApiModelProperty("组号") + private Integer groupNo; + + @Column(name = "FIELD_CODE") + @ApiModelProperty("字段代码") + private String fieldCode; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java new file mode 100644 index 0000000..08078fa --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java @@ -0,0 +1,95 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 上午10:58 + * @desc + */ + +@Entity +@Table(name = "SCR_DATASOURCE") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("数据源管理") +public class ScrDatasource extends BaseBean implements Serializable { + private static final long serialVersionUID = 2660387454249572573L; + + @Column(name = "SOURCE_NAME") + @ApiModelProperty(value = "数据源名称") + private String sourceName; + + @Column(name = "SOURCE_CODE") + @ApiModelProperty(value = "数据源代码") + private String sourceCode; + + @Column(name = "SOURCE_CONNECTION_STATUS") + @ApiModelProperty(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus; + + @Column(name = "SOURCE_TYPE") + @ApiModelProperty(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE") + @Enumerated(EnumType.STRING) + private CommonEnumUtil.DATA_SOURCE_TYPE sourceType; + + @Column(name = "SOURCE_HOST") + @ApiModelProperty(value = "数据源连接地址") + private String sourceHost; + + @Column(name = "SOURCE_PORT") + @ApiModelProperty(value = "数据源端口") + private Integer sourcePort; + + @Column(name = "SOURCE_DATA_BASE_NAME") + @ApiModelProperty(value = "数据库名称") + private String sourceDataBaseName; + + @Column(name = "SOURCE_USER_NAME") + @ApiModelProperty(value = "数据库用户名称") + private String sourceUserName; + + @Column(name = "SOURCE_PASSWORD") + @ApiModelProperty(value = "数据库用户密码") + private String sourcePassword; + + @Column(name = "IS_READ_ONLY") + @ApiModelProperty(value = "是否只读") + private Boolean isReadOnly; + + @Column(name = "SOURCE_DRIVER") + @ApiModelProperty(value = "驱动") + private String sourceDriver; + + @Column(name = "SOURCE_DRIVER_VERSION") + @ApiModelProperty(value = "驱动版本") + private String sourceDriverVersion; + + @Column(name = "SOURCE_VERSION") + @ApiModelProperty(value = "数据库版本") + private String sourceVersion; + + @Column(name = "SOURCE_DESCRIPTION") + @ApiModelProperty(value = "数据源描述") + private String sourceDescription; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java new file mode 100644 index 0000000..bb7c145 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/19 下午5:06 + * @desc + */ +@Entity +@Table(name = "SCR_EVENT") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("事件") +public class ScrEvent extends BaseBean implements Serializable { + private static final long serialVersionUID = -6217007706865821613L; + + @Column(name = "EVENT_CODE") + @ApiModelProperty("事件代码") + private String eventCode; + + @Column(name = "EVENT_NAME") + @ApiModelProperty("事件名称") + private String eventName; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java new file mode 100644 index 0000000..0732be5 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/19 下午5:06 + * @desc + */ +@Entity +@Table(name = "SCR_EVENT_ACTION") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("事件动作") +public class ScrEventAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -6217007706865821613L; + + @Column(name = "EVENT_ACTION_CODE") + @ApiModelProperty("事件动作CODE") + private String eventActionCode; + + @Column(name = "EVENT_ACTION_NAME") + @ApiModelProperty("事件动作名称") + private String eventActionName; + + @Column(name = "EVENT_CODE") + @ApiModelProperty("事件代码") + private String eventCode; + + @Column(name = "PRE_ACTION_CODE") + @ApiModelProperty("执行前动作代码") + private String preActionCode; + + @Column(name = "EXECUTE_ACTION_CODE") + @ApiModelProperty("执行的动作代码") + private String executeActionCode; + + @Column(name = "POST_ACTION_CODE") + @ApiModelProperty("执行前动作代码") + private String postActionCode; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java new file mode 100644 index 0000000..762d5f3 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午9:59 + * @desc + */ +@Entity +@Table(name = "SCR_FILE") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("文件") +public class ScrFile extends BaseBean implements Serializable { + private static final long serialVersionUID = 2343301746531746105L; + + @Column(name = "FILE_NAME") + @ApiModelProperty("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiModelProperty("文件URL") + private String fileUrl; + + @Column(name = "GROUP_NAME") + @ApiModelProperty("组名") + private String groupName; + + @Column(name = "FILE_ORIGIN_NAME") + @ApiModelProperty("文件原名") + private String fileOriginName; + + @Column(name = "FILE_SIZE") + @ApiModelProperty("文件大小") + private String fileSize; + + @Column(name = "FILE_TYPE") + @ApiModelProperty("文件类型名称") + private String fileType; + + @Column(name = "SYNC_TAG") + @ApiModelProperty("同步标记") + private Integer syncTag = 0; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java new file mode 100644 index 0000000..90f9535 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:30 + * @desc + */ +@Entity +@Table(name = "SCR_LAYOUT") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("布局") +public class ScrLayout extends BaseBean implements Serializable { + private static final long serialVersionUID = 3390463604300159807L; + + @Column(name = "LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "LAYOUT_NAME") + @ApiModelProperty("布局名称") + private String layoutName; + + @Column(name = "LAYOUT_TYPE") + @ApiModelProperty("布局类型") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.LAYOUT_TYPE layoutType; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java new file mode 100644 index 0000000..d226159 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午5:01 + * @desc + */ +@Entity +@Table(name = "SCR_LAYOUT_COLUMN") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("布局-父类-列") +public class ScrLayoutColumn extends BaseBean implements Serializable { + private static final long serialVersionUID = 5001564292608042287L; + + @Column(name = "LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "ROW_CODE") + @ApiModelProperty("列代码") + private String rowCode; + + @Column(name = "COLUMN_CODE") + @ApiModelProperty("列代码") + private String columnCode; + + @Column(name = "COLUMN_SEQ") + @ApiModelProperty("列顺序") + private Integer columnSeq; + + @Column(name = "COLUMN_SPAN") + @ApiModelProperty("列占位") + private Integer columnSpan; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java new file mode 100644 index 0000000..8a90a8b --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午5:01 + * @desc + */ +@Entity +@Table(name = "SCR_LAYOUT_ROW") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("布局-行") +public class ScrLayoutRow extends BaseBean implements Serializable { + private static final long serialVersionUID = 6042010183759804616L; + + @Column(name = "LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "ROW_CODE") + @ApiModelProperty("行代码") + private String rowCode; + + @Column(name = "ROW_HEIGHT") + @ApiModelProperty("行高") + private Double rowHeight; + + @Column(name = "ROW_SEQ") + @ApiModelProperty("行顺序") + private Integer rowSeq; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java new file mode 100644 index 0000000..ce0ffe0 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:29 + * @desc + */ +@Entity +@Table(name = "SCR_MODEL") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("model") +public class ScrModel extends BaseBean implements Serializable { + private static final long serialVersionUID = -4609944173378718944L; + + @Column(name = "MODEL_CODE") + @ApiModelProperty("model代码") + private String modelCode; + + @Column(name = "MODEL_TYPE") + @ApiModelProperty("model的类型") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.MODEL_TYPE modelType; + + @Column(name = "DATA_OBJECT_CODE") + @ApiModelProperty("数据对象代码") + private String dataObjectCode; + + @Column(name = "DATA_COlUMN_AUTH") + @ApiModelProperty("数据列权限") + private String dataColumnAuth; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java new file mode 100644 index 0000000..67b3e8f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java @@ -0,0 +1,111 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:29 + * @desc + */ +@Entity +@Table(name = "SCR_MODEL_FIELD") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("model字段") +public class ScrModelField extends BaseBean implements Serializable { + private static final long serialVersionUID = 3893137576091823152L; + + @Column(name = "MODEL_CODE") + @ApiModelProperty("model代码") + private String modelCode; + + @Column(name = "FIELD_CODE") + @ApiModelProperty("字段代码") + private String fieldCode; + + @Column(name = "DISPLAY_NAME") + @ApiModelProperty("字段名称") + private String displayName; + + @Column(name = "FIELD_NAME") + @ApiModelProperty("字段名称") + private String fieldName; + + @Column(name = "IS_FUZZY_SEARCH") + @ApiModelProperty("是否支持模糊查询") + private Boolean isFuzzySearch; + + @Column(name = "IS_SHOW_IN_NEW") + @ApiModelProperty("是否在新增时展示") + private Boolean isShowInNew; + + @Column(name = "IS_SHOW_IN_EDIT") + @ApiModelProperty("是否在编辑时展示") + private Boolean isShowInEdit; + + @Column(name = "IS_ALLOW_SORT") + @ApiModelProperty("是否支持排序") + private Boolean isAllowSort; + + @Column(name = "IS_REQUIRED") + @ApiModelProperty("是否必填") + private Boolean isRequired; + + @Column(name = "FORM_SEQ") + @ApiModelProperty("表单顺序") + private Integer formSeq; + + @Column(name = "TABLE_SEQ") + @ApiModelProperty("表格顺序") + private Integer tableSeq; + + @Column(name = "EXPORT_SEQ") + @ApiModelProperty("导出顺序") + private Integer exportSeq; + + @Column(name = "VALIDATION") + @ApiModelProperty("校验") + private String regexValidation; + + @Column(name = "IS_VIRTUAL") + @ApiModelProperty("是否是虚拟的") + private Boolean isVirtual; + + @Column(name = "MODEL_FIELD_DATASOURCE") + @ApiModelProperty("字段数据来源") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.MODEL_FIELD_DATASOURCE modelFieldDatasource; + + @Column(name = "MODEL_FIELD_DATASOURCE_PROPS") + @ApiModelProperty("model字段来源属性") + private String modelFieldDatasourceProps; + + @Column(name = "DATA_ROW_AUTH") + @ApiModelProperty("数据列权限") + private String dataRowAuth; + + @Transient + private Object fieldValue; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java new file mode 100644 index 0000000..3e4130e --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/12 下午4:26 + * @desc + */ +@Entity +@Table(name = "SCR_MODEL_FIELD_INDEX") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("model字段约束") +public class ScrModelFieldIndex extends BaseBean implements Serializable { + private static final long serialVersionUID = 5020158684534641672L; + + @Column(name = "MODEL_CODE") + @ApiModelProperty("model代码") + private String modelCode; + + @Column(name = "INDEX_TYPE") + @ApiModelProperty("约束类型") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.INDEX_TYPE indexType; + + @Column(name = "GROUP_NO") + @ApiModelProperty("组号") + private Integer groupNo; + + @Column(name = "FIELD_CODE") + @ApiModelProperty("字段代码") + private String fieldCode; + + @Column(name = "IS_USER_CREATED") + @ApiModelProperty("是否是用户创建的") + @Enumerated(EnumType.STRING) + private CommonEnumUtil.TRUE_OR_FALSE isUserCreated; + + @Column(name = "PRIMARY_KEY_SWITCH") + @ApiModelProperty("model主键唯一检查开关") + @Enumerated(EnumType.STRING) + private CommonEnumUtil.TRUE_OR_FALSE primaryKeySwitch; + + @Column(name = "UNIQUE_KEY_SWITCH") + @ApiModelProperty("model唯一键唯一检查开关") + @Enumerated(EnumType.STRING) + private CommonEnumUtil.TRUE_OR_FALSE uniqueKeySwitch; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java new file mode 100644 index 0000000..aa5817a --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/12 下午4:30 + * @desc + */ +@Entity +@Table(name = "SCR_MODEL_FIELD_VIRTUAL") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("model虚拟字段") +public class ScrModelFieldVirtual extends BaseBean implements Serializable { + private static final long serialVersionUID = -7756539161394751580L; + + @Column(name = "MODEL_CODE") + @ApiModelProperty("model代码") + private String modelCode; + + @Column(name = "VIRTUAL_FIELD_NAME") + @ApiModelProperty("虚拟字段名称") + private String virtualFieldName; + + @Column(name = "SPEL_CALC_EXPRESSION") + @ApiModelProperty("SPEL计算表达式") + private String spelCalcExpression; + + @Column(name = "GROUP_NO") + @ApiModelProperty("组号") + private Integer groupNo; + + @Column(name = "FIELD_CODE") + @ApiModelProperty("字段代码") + private String fieldCode; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java new file mode 100644 index 0000000..416af7c --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午7:50 + * @desc + */ +@Entity +@Table(name = "SCR_PANEL") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("Panel") +public class ScrPanel extends BaseBean implements Serializable { + + @Column(name = "PANEL_CODE") + @ApiModelProperty("Panel代码") + private String panelCode; + + @Column(name = "PANEL_NAME") + @ApiModelProperty("Panel名称") + private String panelName; + + @Column(name = "PANEL_LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "USAGE_AMOUNT") + @ApiModelProperty("使用数量") + private Integer usageAmount; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java new file mode 100644 index 0000000..d6249a0 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午7:47 + * @desc + */ +@Entity +@Table(name = "SCR_SCREEN") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("页面") +public class ScrScreen extends BaseBean implements Serializable { + private static final long serialVersionUID = -6755902986892118213L; + + @Column(name = "SCREEN_CODE") + @ApiModelProperty("页面代码") + private String screenCode; + + @Column(name = "SCREEN_NAME") + @ApiModelProperty("页面名称") + private String screenName; + + @Column(name = "SCREEN_VERSION") + @ApiModelProperty("页面版本") + private String screenVersion; + + @Column(name = "SCREEN_LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "SCREEN_TYPE") + @ApiModelProperty("页面类型") + @Enumerated(EnumType.STRING) + private ScreenEnumUtil.SCREEN_TYPE screenType; + + @Column(name = "SCREEN_OWNING_SYSTEM") + @ApiModelProperty("界面所属系统") + @Enumerated(EnumType.STRING) + private CommonEnumUtil.SOFT_TYPE screenOwningSystem; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java new file mode 100644 index 0000000..35639e4 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.screen.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午1:27 + * @desc + */ +@Entity +@Table(name = "SCR_SCREEN_HISTORY") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("数据对象管理") +public class ScrScreenHistory extends BaseBean implements Serializable { + private static final long serialVersionUID = -2191090486124097302L; + + @Column(name = "SCREEN_CODE") + @ApiModelProperty(value = "界面代码") + private String screenCode; + + @Column(name = "SCREEN_VERSION") + @ApiModelProperty(value = "页面版本") + private String screenVersion; + + @Lob + @Column(name = "SCREEN_DETAIL") + @ApiModelProperty(value = "界面详情") + private String screenDetail; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java new file mode 100644 index 0000000..8f19dbc --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.screen.bean.relation; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @author Wynne.Lu + * @date 2021/3/25 上午9:56 + * @desc + */ +@Entity +@Table(name = "SCR_COMPONENT_EVENT_ACTION") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("组件事件动作") +public class ScrComponentEventAction extends BaseBean { + private static final long serialVersionUID = 7600064730551351570L; + + @Column(name = "COMPONENT_CODE") + @ApiModelProperty("组件代码") + private String componentCode; + + @Column(name = "EVENT_ACTION_CODE") + @ApiModelProperty("事件动作代码") + private String eventActionCode; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java new file mode 100644 index 0000000..9e79e14 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.screen.bean.relation; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午8:42 + * @desc + */ +@Entity +@Table(name = "SCR_COMPONENT_MODEL_FIELD") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("Panel与Model字段的关系") +public class ScrComponentModelField extends BaseBean implements Serializable { + private static final long serialVersionUID = -3441031841089357196L; + + @Column(name = "PANEL_CODE") + @ApiModelProperty("Panel代码") + private String panelCode; + + @Column(name = "COMPONENT_CODE") + @ApiModelProperty("组件代码") + private String componentCode; + + @Column(name = "MODEL_CODE") + @ApiModelProperty("model代码") + private String modelCode; + + @Column(name = "FIELD_CODE") + @ApiModelProperty("字段代码") + private String fieldCode; + + @Column(name = "DISPLAY_NAME") + @ApiModelProperty("字段名称") + private String displayName; + + @Column(name = "IS_FUZZY_SEARCH") + @ApiModelProperty("是否支持模糊查询") + private Boolean isFuzzySearch; + + @Column(name = "IS_SHOW_IN_NEW") + @ApiModelProperty("是否在新增时展示") + private Boolean isShowInNew; + + @Column(name = "IS_SHOW_IN_EDIT") + @ApiModelProperty("是否在编辑时展示") + private Boolean isShowInEdit; + + @Column(name = "IS_ALLOW_SORT") + @ApiModelProperty("是否支持排序") + private Boolean isAllowSort; + + @Column(name = "FORM_SEQ") + @ApiModelProperty("表单顺序") + private Integer formSeq; + + @Column(name = "TABLE_SEQ") + @ApiModelProperty("表格顺序") + private Integer tableSeq; + + @Column(name = "VALIDATION") + @ApiModelProperty("校验") + private String validation; + + @Column(name = "DICTIONARY") + @ApiModelProperty("字典") + private String dictionary; + + @Column(name = "IS_VIRTUAL") + @ApiModelProperty("是否是虚拟的") + private boolean isVirtual; + + @Column(name = "FIELD_NAME") + @ApiModelProperty("字段名称") + private String fieldName; + + @Column(name = "SPEL_VIRTUAL_VALUE") + @ApiModelProperty("SPEL表达式虚拟属性") + private String spelVirtualValue; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java new file mode 100644 index 0000000..899086f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.screen.bean.relation; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; + +/** + * @author Wynne.Lu + * @date 2021/3/25 下午4:33 + * @desc + */ +@Entity +@Table(name = "SCR_PANEL_COMPONENT", +// indexes = { +// @Index(columnList = "PANEL_CODE")}, + uniqueConstraints = { + @UniqueConstraint(columnNames = {"PANEL_CODE", "LAYOUT_CODE"}) + } +) +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("Panel与组件的关系") +public class ScrPanelComponent extends BaseBean { + private static final long serialVersionUID = 3459027655126916483L; + + @Column(name = "PANEL_CODE") + @ApiModelProperty("panel代码") + private String panelCode; + + @Column(name = "LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "ROW_CODE") + @ApiModelProperty("行代码") + private String rowCode; + + @Column(name = "COLUMN_CODE") + @ApiModelProperty("列代码") + private String columnCode; + + @Column(name = "COMPONENT_CODE") + @ApiModelProperty(value = "组件代码") + private String componentCode; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java new file mode 100644 index 0000000..70da97c --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrScreenPanel.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.screen.bean.relation; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; + +/** + * @author Wynne.Lu + * @date 2021/3/25 下午4:33 + * @desc + */ +@Entity +@Table(name = "SCR_SCREEN_PANEL", + uniqueConstraints = { + @UniqueConstraint(columnNames = {"SCREEN_CODE", "LAYOUT_CODE"}) + } +) +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@EqualsAndHashCode(callSuper = true) +@ApiModel("Screen与Panel的关系") +public class ScrScreenPanel extends BaseBean { + private static final long serialVersionUID = 3459027655126916483L; + + @Column(name = "SCREEN_CODE") + @ApiModelProperty("Screen代码") + private String screenCode; + + @Column(name = "LAYOUT_CODE") + @ApiModelProperty("布局代码") + private String layoutCode; + + @Column(name = "ROW_CODE") + @ApiModelProperty("行代码") + private String rowCode; + + @Column(name = "COLUMN_CODE") + @ApiModelProperty("列代码") + private String columnCode; + + @Column(name = "PANEL_CODE") + @ApiModelProperty(value = "panel代码") + private String panelCode; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java new file mode 100644 index 0000000..8e45669 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.screen.component.base; + +import cn.estsh.i3plus.pojo.screen.bean.BaseScreenBean; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:32 + * @desc + */ +@Data +public abstract class BaseComponent extends BaseScreenBean { + + private static final long serialVersionUID = 6768391193506016205L; + + private String componentCode; + + private String modelCode; + + private String cssStyle; + + private Integer tabIndex; + + private String componentType = this.getClass().getName(); + + private String communicationType; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java new file mode 100644 index 0000000..6c3c057 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.component.base; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:30 + * @desc + */ +@Data +public abstract class BaseView extends BaseComponent { + + private String jsEnhance; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java new file mode 100644 index 0000000..94f45bd --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.screen.component.base; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:30 + * @desc + */ +@Data +public abstract class BaseWidget extends BaseComponent { + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewBarChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewBarChart.java new file mode 100644 index 0000000..1e65921 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewBarChart.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrViewBarChart extends ScrViewChart { + private static final long serialVersionUID = 7114030006928397461L; + + private List xAxis; + + private List yAxis; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java new file mode 100644 index 0000000..c96dc80 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseView; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrViewChart extends BaseView { + private static final long serialVersionUID = 3786868086148227665L; + private Integer autoRefreshInterval; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java new file mode 100644 index 0000000..f0c58fd --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseView; +import lombok.Data; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:30 + * @desc + */ +@Data +public class ScrViewForm extends BaseView { + + private Map fields; + + private String action; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java new file mode 100644 index 0000000..bb61d04 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrViewLineChart extends ScrViewChart { + +// private List xAxis; +// +// private List yAxis; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java new file mode 100644 index 0000000..e7a423a --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ + +@Data +public class ScrViewPieChart extends ScrViewChart { + private static final long serialVersionUID = -4334873164110780274L; + +// private Map data; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java new file mode 100644 index 0000000..795c06e --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseView; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:29 + * @desc + */ +@Data +public class ScrViewTable extends BaseView { + + private static final long serialVersionUID = -795585853717859678L; + private Integer autoRefreshInterval = 0; + + private Boolean isShowChoice; + + private Boolean isPagination; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java new file mode 100644 index 0000000..a9f896b --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.screen.component.view; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseView; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:30 + * @desc + */ +@Data +public class ScrViewTree extends BaseView { + private static final long serialVersionUID = 3615560061167536377L; + + private String parentField; + + private String showField; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java new file mode 100644 index 0000000..29d7906 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:30 + * @desc + */ +@Data +public class ScrWidgetButton extends BaseWidget { + + private String icon; + + private String type; + + private String size; + + private String action; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java new file mode 100644 index 0000000..2011a99 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrWidgetCascader extends BaseWidget { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetDatetimePicker.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetDatetimePicker.java new file mode 100644 index 0000000..7dd274c --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetDatetimePicker.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:32 + * @desc + */ +@Data +public class ScrWidgetDatetimePicker extends BaseWidget { + + private String dateFormat; + + private Boolean isMultiPicker; + + private String beginDatetime; + + private String defaultBeginDatetime; + + private String endDatetime; + + private String defaultEndDatetime; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java new file mode 100644 index 0000000..048f7bf --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrWidgetLabel extends BaseWidget { + + private String text; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPagination.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPagination.java new file mode 100644 index 0000000..4d851ee --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPagination.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午1:30 + * @desc + */ +@Data +public class ScrWidgetPagination { + + private Integer pageSize; + + private Integer totalCount; + + private Integer currentPage; + + private Integer offset; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPreview.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPreview.java new file mode 100644 index 0000000..78846c3 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPreview.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午2:04 + * @desc + */ +@Data +public class ScrWidgetPreview extends BaseWidget { + + private String type; + + /** + * new blank ,dialog, preview + */ + private String previewType; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetSelector.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetSelector.java new file mode 100644 index 0000000..4269184 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetSelector.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:31 + * @desc + */ +@Data +public class ScrWidgetSelector extends BaseWidget { + + private String placeholder; + + private String dataFormat; + + /** + * 静态属性， 远端数据，数据字典 + */ + private String datasource; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetText.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetText.java new file mode 100644 index 0000000..d3ad441 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetText.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:32 + * @desc + */ +@Data +public class ScrWidgetText extends BaseWidget { + + private String placeholder; + + private String defaultValue; + + private String validation; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetUpload.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetUpload.java new file mode 100644 index 0000000..38dd703 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetUpload.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.screen.component.widget; + +import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2021/3/11 下午12:32 + * @desc + */ +@Data +public class ScrWidgetUpload extends BaseWidget { + + private Boolean isAllowDraw; + + private Boolean maxFileCount; + /** + * jpg,file + */ + private String type; + + private Long maxFileSize; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java new file mode 100644 index 0000000..7b9f2b7 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex; +import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource; +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/4/26 00:12 + * @desc + */ +@Data +@Builder +public class ScrDataObjectIndexModel implements Serializable { + private static final long serialVersionUID = -5784177094937410041L; + + private ScrDatasource datasource; + + private List dataObjects; + + private List dataObjectIndices; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDatasourceInfoModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDatasourceInfoModel.java new file mode 100644 index 0000000..47878fb --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDatasourceInfoModel.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午6:10 + * @desc + */ +@Data +@Builder +@ApiModel("datasource基础信息") +public class ScrDatasourceInfoModel implements Serializable { + private static final long serialVersionUID = -5818708649412989886L; + + @ApiModelProperty("数据库已知用户") + private String dbKnewUser; + + @ApiModelProperty("数据库系统函数") + private String dbSysFunction; + + @ApiModelProperty("数据库系统函数") + private String dbDateFunction; + + @ApiModelProperty("数据库系统函数") + private String dbStringFunction; + + @ApiModelProperty("数据库连接字符串") + private String dbConnectUrl; + + @ApiModelProperty("数据库是否只读") + private boolean dbIsReadOnly; + + @ApiModelProperty("数据库产品名称") + private String dbProductName; + + @ApiModelProperty("数据库版本") + private String dbVersion; + + @ApiModelProperty("数据库驱动") + private String dbDriver; + + @ApiModelProperty("数据库驱动版本") + private String dbDriverVersion; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrExecuteModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrExecuteModel.java new file mode 100644 index 0000000..567eb5e --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrExecuteModel.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrAction; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex; +import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource; +import cn.estsh.i3plus.pojo.screen.bean.ScrModel; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldIndex; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldVirtual; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/4/9 13:41 + * @desc + */ +@Data +@Builder +@AllArgsConstructor +@ApiModel("model，modelFields与数据对象，数据源的关系") +public class ScrExecuteModel implements Serializable { + private static final long serialVersionUID = -7305897999888994870L; + + @ApiModelProperty("动作") + private ScrAction action; + + @ApiModelProperty("模型") + private ScrModel model; + + @ApiModelProperty("数据源") + private ScrDatasource datasource; + + @ApiModelProperty("model对应的数据对象") + private List dataObjects; + + @ApiModelProperty("model对应的数据对象索引") + private List dataObjectIndices; + + @ApiModelProperty("model字段") + private List modelFields; + + @ApiModelProperty("model字段索引") + private List modelFieldIndices; + + @ApiModelProperty("model虚拟字段") + private List modelFieldVirtuals; + + private List insertCondition; + + private List queryCondition; + + private List updateCondition; + + private List deleteCondition; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java new file mode 100644 index 0000000..b34cf2a --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午6:10 + * @desc + */ +@Data +@ApiModel("布局model") +public class ScrLayoutModel implements Serializable { + private static final long serialVersionUID = -2767386371499251918L; + + @ApiModelProperty("布局") + private ScrLayout layout; + + @ApiModelProperty("布局中的行列关系") + private List rowColumnModels; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java new file mode 100644 index 0000000..6fb3ee3 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2021/3/28 上午12:42 + * @desc + */ +@Data +@ApiModel("Panel与组件关系的创建model") +public class ScrPanelComponentCreateModel implements Serializable { + private static final long serialVersionUID = -5832175256726333348L; + + @ApiModelProperty("panel代码") + private String panelCode; + + @ApiModelProperty("布局代码") + private String layoutCode; + + @ApiModelProperty("行序号") + private Integer rowSeq; + + @ApiModelProperty("列序号") + private Integer columnSeq; + + @ApiModelProperty("组件参数信息") + private Map baseComponent; + + @ApiModelProperty("model代码") + private String modelCode; + + @ApiModelProperty("该组件的事件动作集合") + private List eventActions; + + @ApiModelProperty("组件使用到的model字段集合") + private List modelFields; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java new file mode 100644 index 0000000..2a10b3c --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrComponent; +import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/28 上午12:42 + * @desc + */ +@Data +@ApiModel("Panel和组件的查询model") +public class ScrPanelComponentQueryModel implements Serializable { + private static final long serialVersionUID = 4133777603151273736L; + + @ApiModelProperty("行代码") + private String rowCode; + + @ApiModelProperty("列代码") + private String columnCode; + + @ApiModelProperty("组件") + private ScrComponent component; + + @ApiModelProperty("动作事件") + private ScrEventAction eventAction; + + @ApiModelProperty("组件与model字段的关系") + private List modelFields; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java new file mode 100644 index 0000000..4fe5aaa --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/5/14 09:58 + * @desc + */ +@Data +@ApiModel("请求model") +public class ScrRequestModel implements Serializable { + private static final long serialVersionUID = -4119744678742689856L; + + @ApiModelProperty("工厂代码") + private String organizeCode; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("页面代码") + private String screenCode; + + @ApiModelProperty("容器代码") + private String panelCode; + + @ApiModelProperty("模型") + private String modelCode; + + @ApiModelProperty("动作") + private String actionCode; + + @ApiModelProperty("分页") + private Pager pager; + + @ApiModelProperty("下载文件Id") + private Long downloadFileId; + + @ApiModelProperty("跳转参数") + private String redirectUrl; + + @ApiModelProperty("跳转参数") + private String enumName; + + @ApiModelProperty("目标系统") + private CommonEnumUtil.SOFT_TYPE targetSystem; + + @ApiModelProperty("包名") + private String packageName; + + @ApiModelProperty("类名") + private String className; + + @ApiModelProperty("方法名") + private String methodName; + + @ApiModelProperty("上传文件") + private MultipartFile file; + + @ApiModelProperty("模型字段") + private List modelFields; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java new file mode 100644 index 0000000..12f782b --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午8:35 + * @desc + */ +@Data +@ApiModel("行列Model") +public class ScrRowColumnModel implements Serializable { + private static final long serialVersionUID = 7450630220924238356L; + + @ApiModelProperty("行") + private ScrLayoutRow row; + + @ApiModelProperty("行中的列") + private List columns; +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java new file mode 100644 index 0000000..ead4f1e --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/28 上午12:42 + * @desc + */ +@Data +@ApiModel("Screen与Panel的创建Model") +public class ScrScreenPanelCreateModel implements Serializable { + private static final long serialVersionUID = -5832175256726333348L; + + @ApiModelProperty("screen代码") + private String screenCode; + + @ApiModelProperty("布局代码") + private String layoutCode; + + @ApiModelProperty("行代码") + private String rowCode; + + @ApiModelProperty("列代码") + private String columnCode; + + @ApiModelProperty("panel代码") + private String panelCode; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlColumnModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlColumnModel.java new file mode 100644 index 0000000..024062b --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlColumnModel.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-03-22 17:17 + * @Modify: + **/ +@Data +@ApiModel("数据表或视图的列model") +public class ScrSqlColumnModel implements Serializable { + private static final long serialVersionUID = -8437573966195980847L; + // isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer +// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 50 getColumnLabel name getColumnName name getSchemaName getPrecision 50 getScale 0 getTableName interceptor getColumnType 12 getColumnTypeName VARCHAR getColumnClassName java.lang.String +// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel age getColumnName age getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer +// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 19 getColumnLabel date_time getColumnName date_time getSchemaName getPrecision 19 getScale 0 getTableName interceptor getColumnType 93 getColumnTypeName TIMESTAMP getColumnClassName java.sql.Timestamp +// isAutoIncrement false isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel test_num_not_null getColumnName test_num_not_null getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer +// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel test_unique getColumnName test_unique getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer +// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel test_comment getColumnName test_comment getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer +// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 500 getColumnLabel test_string_1000 getColumnName test_string_1000 getSchemaName getPrecision 500 getScale 0 getTableName interceptor getColumnType 12 getColumnTypeName VARCHAR getColumnClassName java.lang.String +// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 4 getColumnLabel test_double getColumnName test_double getSchemaName getPrecision 4 getScale 2 getTableName interceptor getColumnType 8 getColumnTypeName DOUBLE getColumnClassName java.lang.Double + // 是否自增 + @ApiParam(value = "是否自增") + private Integer isAutoIncrement; + // 是否允许为空 + @ApiParam(value = "是否允许为空") + private Integer isNullable; + // 是否是对象 + @ApiParam(value = "是否是对象") + private Integer isSigned; + // 字段名称 + @ApiParam(value = "字段名称") + private String columnName; + // 字段长度 + @ApiParam(value = "字段长度") + private Integer precision; + // 字段精确长度 + @ApiParam(value = "字段精确长度") + private Integer scale; + + // 暂用来区分存储过程出入参数信息 + // 暂用来区分存储过程出入参数信息 + @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class) + @ApiParam(value = "原始列类型") + private Integer originPropertyType; + + public String getOriginPropertyTypeTxt() { + return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription() + : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType); + } + + // 字段类型编号 + @ApiParam(value = "字段类型编号") + private Integer columnType; + // 字段类型名称 + @ApiParam(value = "字段类型名称") + private String columnTypeName; + // 字段Java 类型 + @ApiParam(value = "字段Java 类型") + private String columnClassName; + // 字段Java 类型 + @ApiParam(value = "枚举:BlockFormEnumUtil.PROPERTY_TYPE") + private Integer columnClassType; + // 属性是否主键 + @ApiParam(value = "枚举: CommonEnumUtil.TRUE_OR_FALSE") + private Integer columnPrimaryKey; + + @ApiParam(value = "属性值") + private Object value; + @ApiParam(value = "属性默认值") + private Object defaultValue; + + public ScrSqlColumnModel() { + } + + public ScrSqlColumnModel(String columnName, CommonEnumUtil.PROPERTY_TYPE type) { + this.columnName = columnName; + this.columnClassType = type.getValue(); + this.columnTypeName = type.getDescription(); + } +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDdlModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDdlModel.java new file mode 100644 index 0000000..bce824f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDdlModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-03-22 16:40 + * @Modify: + **/ +@Data +public class ScrSqlDdlModel implements Serializable { + private static final long serialVersionUID = -1294648161172538340L; + + private String tableCat; + private String tableSchem; + private String tableName; + private Integer tableType; + private String tableTypeName; + private String remarks; + private String typeCat; + private String typeName; + private String selfReferencingColName; + private String refGeneration; + + List columnlist; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDmlModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDmlModel.java new file mode 100644 index 0000000..85c65cf --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDmlModel.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2021/4/9 14:59 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("通用界面查询Model") +public class ScrSqlDmlModel implements Serializable { + private static final long serialVersionUID = -177686438571101429L; + + @ApiModelProperty("工厂") + private String organizeCode; + + @ApiModelProperty("操作人") + private String userName; + + @ApiModelProperty("表名或视图名") + private String table; + + @ApiModelProperty("字段") + private List fields; + + @ApiModelProperty("查询参数") + private Map searchParams; + + @ApiModelProperty("插入参数") + private Map insertParams; + + @ApiModelProperty("批量查询参数") + private List> insertBatchParams; + + @ApiModelProperty("更新参数") + private Map updateParams; + + @ApiModelProperty("批量更新参数") + private List> updateBatchParams; + + @ApiModelProperty("分页参数") + private Pager pager; + + @ApiModelProperty("排序") + private String orderBy; + + @ApiModelProperty("数据源") + private ScrDatasource datasource; + + @ApiModelProperty("主键") + private Map primaryKeys; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTableColumnModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTableColumnModel.java new file mode 100644 index 0000000..7f69a58 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTableColumnModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午6:10 + * @desc + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("table列类型") +public class ScrTableColumnModel extends ScrTableModel implements Serializable { + private static final long serialVersionUID = -1798799352034473523L; + + @ApiModelProperty("列名") + private String columnName; + + @ApiModelProperty("列类型Id") + private Integer columnDataType; + + @ApiModelProperty("列类型名称") + private String columnTypeName; + + @ApiModelProperty("列大小") + private Integer columnSize; + + @ApiModelProperty("列小数位数") + private Integer columnDecimalDigits; + + @ApiModelProperty("基数") + private Integer columnNumPrecRadix; + + @ApiModelProperty(value = "是否允许为null", notes = "0 不允许为空 1 允许为空 2 未知") + private Integer columnNullable; + + @ApiModelProperty("列描述") + private String columnRemarks; + + @ApiModelProperty("列默认值") + private String columnDefault; + + @ApiModelProperty("列在表中位置") + private Integer columnOrdinalPosition; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTableIndexModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTableIndexModel.java new file mode 100644 index 0000000..e326f44 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTableIndexModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午6:10 + * @desc + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("table索引类型 包含主键索引") +public class ScrTableIndexModel extends ScrTableModel implements Serializable { + private static final long serialVersionUID = -6849703973729507400L; + + @ApiModelProperty("索引是否唯一键") + private Boolean indexUnique; + + @ApiModelProperty("索引类别（可能为空）") + private String indexQualifier; + + @ApiModelProperty("索引名称") + private String indexName; + + @ApiModelProperty("索引类型") + private Short indexType; + + @ApiModelProperty("索引列顺序号") + private Short indexOrdinalPosition; + + @ApiModelProperty("索引列名") + private String indexColumnName; + + @ApiModelProperty(value = "索引升降序", notes = "A升序 B降序") + private String indexAscDesc; + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTableModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTableModel.java new file mode 100644 index 0000000..73b4869 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTableModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午6:10 + * @desc + */ +@Data +@Builder +@ApiModel("table类型") +public class ScrTableModel implements Serializable { + private static final long serialVersionUID = 6273278236124833259L; + + @ApiModelProperty("库名") + private String tableCatalog; + + @ApiModelProperty("Schema") + private String tableSchem; + + @ApiModelProperty("表名") + private String tableName; + + @ApiModelProperty("类型:TABLE|VIEW") + private String tableType; + + public ScrTableModel() { + } + + public ScrTableModel(String tableCatalog, String tableSchem, String tableName, String tableType) { + this.tableCatalog = tableCatalog; + this.tableSchem = tableSchem; + this.tableName = tableName; + this.tableType = tableType; + } +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTablePrimaryIndexModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTablePrimaryIndexModel.java new file mode 100644 index 0000000..14ee3dd --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrTablePrimaryIndexModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.screen.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/27 下午6:10 + * @desc + */ +@Data +@ApiModel("table主键索引") +@EqualsAndHashCode(callSuper = true) +public class ScrTablePrimaryIndexModel extends ScrTableModel implements Serializable { + private static final long serialVersionUID = 3555705756354710415L; + + @ApiModelProperty("列名") + private String columnName; + + @ApiModelProperty("主键顺序") + private Short keySeq; + + @ApiModelProperty("主键名称") + private String pkName; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java new file mode 100644 index 0000000..adeb27f --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrAction; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrActionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java new file mode 100644 index 0000000..562d104 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrComponent; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrComponentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataAuthRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataAuthRepository.java new file mode 100644 index 0000000..c70323a --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataAuthRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataAuth; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrDataAuthRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectIndexRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectIndexRepository.java new file mode 100644 index 0000000..3435385 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectIndexRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrDataObjectIndexRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java new file mode 100644 index 0000000..08bd787 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrDataObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java new file mode 100644 index 0000000..7786ddd --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrDatasourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java new file mode 100644 index 0000000..88491b9 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrEventActionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java new file mode 100644 index 0000000..b558c8c --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrEvent; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrEventRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java new file mode 100644 index 0000000..cfeba7e --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrFile; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java new file mode 100644 index 0000000..3255b32 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrLayoutColumnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java new file mode 100644 index 0000000..78a4c00 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrLayoutRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java new file mode 100644 index 0000000..32a5636 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayout; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrLayoutRowRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldIndexRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldIndexRepository.java new file mode 100644 index 0000000..f229531 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldIndexRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldIndex; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrModelFieldIndexRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java new file mode 100644 index 0000000..6effc84 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelField; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrModelFieldRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java new file mode 100644 index 0000000..f1894ea --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldVirtual; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrModelFieldVirtualRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java new file mode 100644 index 0000000..790db09 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrModel; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrModelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java new file mode 100644 index 0000000..0d4ee36 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrAction; +import cn.estsh.i3plus.pojo.screen.bean.ScrPanel; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrPanelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java new file mode 100644 index 0000000..b1a72a7 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrScreen; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrScreenRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java new file mode 100644 index 0000000..985642d --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository.rel; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentEventAction; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrComponentEventActionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java new file mode 100644 index 0000000..e441be7 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository.rel; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrComponentModelFieldRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java new file mode 100644 index 0000000..4512ece --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository.rel; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrPanelComponent; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrPanelComponentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java new file mode 100644 index 0000000..cfe08b3 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository.rel; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.relation.ScrScreenPanel; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrScreenPanelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..76739f9 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java new file mode 100644 index 0000000..3168c77 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java @@ -0,0 +1,107 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.math.NumberUtils; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 业务脚本 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-07-28 14:35 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_BUSI_SCRIPT") +@ApiModel(value = "业务脚本", description = "业务脚本") +public class BsBusiScript extends BaseBean { + + private static final long serialVersionUID = 1419277265159912600L; + + @Column(name = "SCRIPT_NAME") + @ApiModelProperty(value = "脚本名称") + private String scriptName; + + @Column(name = "SCRIPT_CODE") + @ApiModelProperty(value = "脚本代码") + private String scriptCode; + + @Column(name = "SCRIPT_TYPE") + @ApiModelProperty(value = "脚本类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.class) + private Integer scriptType; + + public String getScriptTypeTxt() { + return scriptType == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.valueOfDescription(scriptType); + } + + @Column(name = "SCRIPT_LANGUAGE") + @ApiModelProperty(value = "脚本语言") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.class) + private Integer scriptLanguage; + + public String getScriptLanguageTxt() { + return scriptLanguage == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.valueOfDescription(scriptLanguage); + } + + @Column(name = "SCRIPT_EXECUTE_METHOD") + @ApiModelProperty(value = "脚本执行方式") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.class) + private Integer scriptExecuteMethod; + + public String getScriptExecuteMethodTxt() { + return scriptExecuteMethod == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.valueOfDescription(scriptExecuteMethod); + } + + @Column(name = "SCRIPT_OBJ_NAME") + @ApiModelProperty(value = "脚本对象名称") + private String scriptObjName; + + @Column(name = "SCRIPT_METHOD_NAME") + @ApiModelProperty(value = "脚本方法名称") + private String scriptMethodName; + + @Column(name = "SCRIPT_CONTENT") + @ApiModelProperty(value = "脚本内容") + private String scriptContent; + + @Column(name = "SCRIPT_DESC") + @ApiModelProperty(value = "脚本描述") + private String scriptDesc; + + @Column(name = "REF_ID") + @ApiModelProperty(value = "关联id") + @JsonSerialize(using = ToStringSerializer.class) + private Long refId; + + @Column(name = "SCRIPT_VERSION") + @ApiModelProperty(value = "脚本版本") + private Integer scriptVersion; + + public int getScriptVersion(){ + return scriptVersion == null ? NumberUtils.INTEGER_ONE : scriptVersion; + } + + public BsBusiScript nextVersion() { + setScriptVersion(getScriptVersion() + 1); + return this; + } + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index 2f04bc8..e3ddc94 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -52,6 +52,10 @@ public class BsDataSource extends BaseBean { @ApiParam(value = "数据源端口") private Integer dataSourcePort; + @Column(name = "DATA_SOURCE_INSTANCE_NAME") + @ApiParam(value = "数据源实例名称") + private String dataSourceInstanceName; + @Column(name = "DATA_SOURCE_USER") @ApiParam(value = "用户名") private String dataSourceUser; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java index 4f87d41..ed054c8 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +36,7 @@ public class BsLongData extends BaseBean { private static final long serialVersionUID = -329128754646765129L; @Column(name = "REF_ID") @ApiParam(value = "关联id") + @JsonSerialize(using = ToStringSerializer.class) private Long refId; @Column(name = "REF_DATA_TYPE") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java new file mode 100644 index 0000000..8da9d02 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.softswitch.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 : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-15 15:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SAP_CONN") +@Api(value = "SAP连接信息", description = "SAP连接信息") +public class BsSapConn extends BaseBean { + + private static final long serialVersionUID = -8590500564480743293L; + + @Column(name = "SAP_CONN_NAME") + @ApiParam(value = "sap连接名称") + private String sapConnName; + + @Column(name = "SAP_CONN_CODE") + @ApiParam(value = "sap连接代码") + private String sapConnCode; + + @Column(name = "SAP_HOST") + @ApiParam(value = "SAP 应用服务器") + private String sapHost; + + @Column(name = "SAP_ROUTER") + @ApiParam(value = "SAP 路由") + private String sapRouter; + + @Column(name = "SAP_SYS_NO") + @ApiParam(value = "sap系统编号") + private String sapSysNo; + + @Column(name = "SAP_CLIENT") + @ApiParam(value = "sap集团") + private String sapClient; + + @Column(name = "SAP_USER") + @ApiParam(value = "sap用户名") + private String sapUser; + + @Column(name = "SAP_PWD") + @ApiParam(value = "sap密码") + private String sapPwd; + + @Column(name = "SAP_LANG") + @ApiParam(value = "sap登录语言") + private String sapLang; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index a515e18..1bd2e4d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -40,13 +41,18 @@ public class BsSuitCase extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; public int getCaseTypeIdVal(){ if(caseTypeId == null) { return -1; } - return caseTypeId.intValue(); + return caseTypeId; + } + + public String getCaseTypeTxt() { + return BlockSoftSwitchEnumUtil.CASE_TYPE.valueOfDescription(getCaseTypeIdVal()); } @Column(name = "CASE_DETAIL_ID") @@ -63,7 +69,7 @@ public class BsSuitCase extends BaseBean { if(suitTypeId == null){ return -1; } - return suitTypeId.longValue(); + return suitTypeId; } @Column(name = "SUIT_TYPE_NAME_RDD") @@ -76,6 +82,7 @@ public class BsSuitCase extends BaseBean { @Column(name = "SUIT_MODE_ID") @ApiParam(value = "适配模式(枚举,主动，被动)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_MODE.class) private Integer suitModeId; @Column(name = "SUIT_ACTION_ID") @@ -102,7 +109,16 @@ public class BsSuitCase extends BaseBean { if(isNeedCertification==null){ return CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); } - return isNeedCertification.intValue(); + return isNeedCertification; + } + + @Column(name = "IS_SAVE_EMPTY_MSG") + @ApiParam(value = "是否保存空报文") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isSaveEmptyMsg; + + public int getIsSaveEmptyMsgVal(){ + return isSaveEmptyMsg == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isSaveEmptyMsg; } @Column(name = "IS_PUSH_MQ") @@ -230,6 +246,26 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配器状态") private Integer suitCaseStatus; + @Column(name = "BIND_BUSI_SCRIPT_CODE") + @ApiParam(value = "绑定业务脚本Code") + private String bindBusiScriptCode; + + @Column(name = "IS_SUPPORT_RETRY") + @ApiParam(value = "是否支持重试") + private Integer isSupportRetry; + + public int getIsSupportRetryVal() { + return isSupportRetry == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isSupportRetry; + } + + @Column(name = "RETRY_INTERVAL") + @ApiParam(value = "重试间隔（s）") + private Integer retryInterval; + + public int getRetryIntervalVal() { + return retryInterval == null ? 10: retryInterval; + } + @Transient @ApiParam(value = "适配器套件明细") private Object bsSuitCaseDetail; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index f7fbfb9..1945d75 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -9,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -66,6 +68,15 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "ftp编码") private Integer encode; + @Column(name = "CONNECTION_MODE") + @ApiParam(value = "ftp连接模式") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.class) + private Integer connectionMode; + + public String getConnectionModeTxt(){ + return connectionMode == null ? "无" : BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.valueOfDescription(connectionMode); + } + @Column(name = "IS_READ_AND_EMPTY") @ApiParam(value = "读取并清空") private Integer isReadAndEmpty; @@ -110,9 +121,25 @@ public class BsSuitCaseFTP extends BaseBean { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal()); } + @ColumnDefault("2") + @Column(name = "IS_CHECK_FILE") + @ApiParam(value = "是否校验文件") + private Integer isCheckFile; + + public boolean isCheckFile(){ + return isCheckFile != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isCheckFile); + } + + @Column(name = "CHECK_FILE_PATH") + @ApiParam(value = "校验文件路径") + private String checkFilePath; + @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath; + @Transient + @ApiParam(value = "临时适配路径") + private List ftpFileList; @Transient @ApiParam(value = "适配文件列表") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index 2ccf61d..21054f7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -60,6 +61,16 @@ public class BsSuitCaseREST extends BaseBean { return isRequestBody == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isRequestBody; } + //CommonEnumUtil.HTTP_METHOD_TYPE + @Column(name = "RETRY_STRATEGY") + @ApiParam(value = "重试策略") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_REST_RETRY_STRATEGY.class) + private Integer retryStrategy; + + public int getRetryStrategyVal() { + return retryStrategy == null ? BlockSoftSwitchEnumUtil.BS_REST_RETRY_STRATEGY.HTTP_STATUS_CODE.getValue() : retryStrategy; + } + @Transient @ApiParam(value = "请求头转换") private List requestHeaderList; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java new file mode 100644 index 0000000..37c9b4b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-18 17:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_SAP") +@Api(value = "SAP适配器", description = "SAP适配器") +public class BsSuitCaseSap extends BaseBean { + + private static final long serialVersionUID = -2019771592688281243L; + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "SAP_CONN_ID") + @ApiParam(value = "sap连接id") + @JsonSerialize(using = ToStringSerializer.class) + private Long sapConnId; + + @Column(name = "SAP_CONN_CODE") + @ApiParam(value = "sap连接代码") + private String sapConnCode; + + @Column(name = "SAP_CONN_NAME") + @ApiParam(value = "sap连接代码") + private String sapConnName; + + @Column(name = "BUSI_FUNC_NAME") + @ApiParam(value = "业务方法") + private String busiFuncName; + + @Column(name = "COMMIT_FUNC_NAME") + @ApiParam(value = "提交方法名") + private String commitFuncName; +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index dac4976..b21f150 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -54,6 +56,7 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; @Column(name = "SUIT_TYPE_NAME_RDD") @@ -81,8 +84,14 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class) private Integer processState; + public String getProcessStateTxt() { + return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() : + BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState); + } + @Column(name = "PROCESS_TIME") @ApiParam(value = "处理时间") private String processTime; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index 7e2b460..2713ed7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -3,12 +3,13 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; 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; @@ -26,7 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_FILE") -@Api(value = "适配文件信息", description = "适配文件信息") +@ApiModel(value = "适配文件信息", description = "适配文件信息") public class BsSuitFile extends BaseBean { private static final long serialVersionUID = -5476684791619434327L; @@ -85,4 +86,19 @@ public class BsSuitFile extends BaseBean { @ApiParam(value = "处理时间") private String processTime; + public void setFtpPathInfo(String ftpPathInfo){ + if(ftpPathInfo == null){ + return; + } + + int pathIdx = ftpPathInfo.lastIndexOf("/"); + if (pathIdx == -1) { + this.setFolderPath("/"); + this.setFileName(ftpPathInfo); + }else{ + this.setFolderPath(ftpPathInfo.substring(0,pathIdx)); + this.setFileName(ftpPathInfo.substring(pathIdx + 1)); + } + } + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 957bd5e..e03eae7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -5,15 +5,17 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.util.List; +import java.util.Map; /** * @Description : 适配记录 @@ -33,7 +35,7 @@ import java.util.List; @Index(name="bs_suit_record_create_date_time_idx",columnList = "CREATE_DATE_TIME"), @Index(name="bs_suit_record_process_time_idx",columnList = "PROCESS_TIME"), }) -@Api(value = "适配记录", description = "适配记录") +@ApiModel(value = "适配记录", description = "适配记录") public class BsSuitRecord extends BaseBean { private static final long serialVersionUID = 174969165955420968L; @@ -60,6 +62,15 @@ public class BsSuitRecord extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseDetailId; + @Column(name = "SUIT_SID") + @ApiParam(value = "适配记录SID") + private String suitSid; + + @Column(name = "RETRY_RECORD_ID") + @ApiParam(value = "重试记录id") + @JsonSerialize(using = ToStringSerializer.class) + private Long retryRecordId; + @Column(name = "SUIT_METHOD_ID") @ApiParam(value = "适配方式id枚举（定时适配，主动适配）") private Integer suitMethodId; @@ -127,12 +138,48 @@ public class BsSuitRecord extends BaseBean { @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class) private Integer processState; + public String getProcessStateTxt() { + return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() : + BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState); + } + @Column(name = "PROCESS_TIME") @ApiParam(value = "处理时间") private String processTime; + @Column(name = "SCRIPT_RESULT") + @ApiParam(value = "脚本结果") + private String scriptResult; + + @Column(name = "PROCESS_RESULT") + @ApiParam(value = "处理结果") + private String processResult; + + @ColumnDefault(value = "10") + @Column(name = "RETRY_STATUS") + @ApiParam(value = "重试状态") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.class) + private Integer retryStatus; + + public String getRetryStatusTxt() { + return retryStatus == null ? BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.NOT_RETRY.getDescription() : + BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.valueOfDescription(retryStatus); + } + + @ColumnDefault(value = "0") + @Column(name = "RETRY_NUM") + @ApiParam(value = "重试状态") + private Integer retryNum; + + public int getRetryNumVal() { + return retryNum == null ? 0 : retryNum; + } + + /************************************** 临时属性 ***************************************/ + @Transient @ApiParam(value = "适配记录参数") private List bsSuitRecordParamList; @@ -150,6 +197,10 @@ public class BsSuitRecord extends BaseBean { private List bsSuitFileList; @Transient + @ApiParam(value = "日志长文本记录集合<关联类型，记录内容>") + private Map bsLongDataMap; + + @Transient @ApiParam(value = "适配记录报文-查询条件") private String searchMessage; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index 81ae451..6ba934f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 请求适配记录 @@ -46,10 +47,12 @@ public class BsSuitRequestRecord extends BaseBean { private Integer requestSource; // 移动至记录数据表 - @Lob @Column(name = "REQUEST_ORGIN_PARAM") @ApiParam(value = "请求原始参数") private String requestOrginParam; + @Transient + @ApiParam(value = "id-查询条件") + private List searchIdList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java new file mode 100644 index 0000000..99401ba --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsBusiScript; + +/** + * @Description : 业务脚本 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-07-28 15:13 + * @Modify: + **/ +public interface BsBusiScriptRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java new file mode 100644 index 0000000..a241382 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSapConn; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-19 13:50 + * @Modify: + **/ +@Repository +public interface BsSapConnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java new file mode 100644 index 0000000..8397e45 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseSap; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-19 13:50 + * @Modify: + **/ +@Repository +public interface BsSuitCaseSapRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 28aa126..021e734 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -261,7 +261,7 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); return ddlPackBean; } @@ -320,17 +320,20 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitRecord.getScriptResult(),"scriptResult",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getRequestSource(), "requestSource", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getRetryRecordId(), "retryRecordId", ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); - ddlPackBean.setOrderByStr(bsSuitRecord.orderBy()); return ddlPackBean; @@ -367,6 +370,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitRequestRecord(BsSuitRequestRecord bsSuitRequestRecord){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitRequestRecord); + DdlPreparedPack.getInPackList(bsSuitRequestRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRequestRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRequestRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); @@ -385,6 +389,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitFile.getFolderPath(), "folderPath", ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true); ddlPackBean.setOrderByStr(bsSuitFile.orderBy()); @@ -416,7 +421,57 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsLongData); DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean); - DdlPreparedPack.getStringLikePack(bsLongData.getData(),"data",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsLongData.getData(),"data",ddlPackBean); + return ddlPackBean; + } + + public static DdlPackBean packHqlBsBusiScript(BsBusiScript bsBusiScript){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsBusiScript); + DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptName(),"scriptName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptCode(),"scriptCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsBusiScript.getScriptType(),"scriptType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean); + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckSuitFile(BsSuitFile bsSuitFile){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitFile); + DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitFile.getFileName(),"fileName",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitFile.getFolderPath(),"folderPath",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean); + return ddlPackBean; + } + + /** + * sap连接查询条件封装 + * @param bsSapConn + * @return + */ + public static DdlPackBean packHqlBsSapConn(BsSapConn bsSapConn){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnName(), "sapConnName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSapConn.orderBy()); + + return ddlPackBean; + } + + /** + * sap连接查询条件封装 + * @param bsSapConn + * @return + */ + public static DdlPackBean packHqlCheckBsSapConnOnly(BsSapConn bsSapConn){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(bsSapConn.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSapConn.orderBy()); + return ddlPackBean; } } diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..0368700 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java index 9fa4fcf..62eed51 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java @@ -4,6 +4,8 @@ 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 org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @Table(name = "SWEB_CONFIG") +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "系统配置", description = "SWEB系统配置") public class SwebConfig extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java index dbf70ee..e1de11e 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,10 +10,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; /** * @Description : @@ -27,13 +25,14 @@ import javax.persistence.Version; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("移库单-明细") public class SwebDocMovementDetails extends BaseBean { private static final long serialVersionUID = -1232334350341792942L; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") @@ -69,7 +68,11 @@ public class SwebDocMovementDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public String item; + public Integer item; + + @Column(name = "SNP") + @ApiParam(value = "标准包装", example = "1") + private Double snp; /** * 是否免费:0=计费,1=免费 @@ -153,10 +156,14 @@ public class SwebDocMovementDetails extends BaseBean { public transient Integer lockVersion; @Column(name = "IS_SN") - @ApiParam(value = "条码生成状态", example = "20") - public Integer isSn; + @ApiParam(value = "条码生成状态", example = "2") + public Integer isSn = CommonEnumUtil.FALSE; @Column(name = "LOT_NO") @ApiParam("批次") public String lotNo; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java index 56aaa79..c8ac075 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -8,9 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : @@ -25,6 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("移库单-主表") public class SwebDocMovementMaster extends BaseBean { @@ -92,8 +92,8 @@ public class SwebDocMovementMaster extends BaseBean { private String refNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") @@ -146,4 +146,8 @@ public class SwebDocMovementMaster extends BaseBean { @Column(name = "SHIP_TIME") @ApiParam(value = "发运时间") private String shipTime; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java index 1dcc1c6..c7e256f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,9 +10,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : @@ -26,6 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("移库单-条码") public class SwebDocMovementSn extends BaseBean { @@ -36,7 +36,7 @@ public class SwebDocMovementSn extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public String item; + public Integer item; @Column(name="PART_NO") @ApiParam("物料编码") @@ -75,11 +75,11 @@ public class SwebDocMovementSn extends BaseBean { @ApiParam(value = "条码类型") private Integer snType; - @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; - @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") private String vendorName; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java deleted file mode 100644 index 7acd947..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.bean; - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -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; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "SWEB_MOVEMENT_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class SwebMovementToWms extends BaseBean { - private static final long serialVersionUID = -8089219927352225317L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name = "ITEM") - @ApiParam("行号") - public String item; - - @Column(name = "VENDOR_NO") - @ApiParam(value = "供应商编号") - private String vendorNo; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - - @Column(name = "SRC_WH_NO") - @ApiParam("源仓库代码") - public String srcWhNo; - - @Column(name = "DEST_ZONE_NO") - @ApiParam("目标存储区代码") - public String destZoneNo; - - /** - * 移动类型:IN=入库,OUT=出库,MOVE=移库 - */ - @Column(name = "MOVE_TYPE") - @ApiParam("移动类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description") - public Integer moveType; - /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 - */ - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - public Integer busiType; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java index c3d0e27..59ace62 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("订单发货通知记录表") public class SwebOrderDeliveryLog extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java index cde67c9..055b8c1 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("物理包装") public class SwebPackage extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java deleted file mode 100644 index 65babf1..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "SWEB_PO_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class SwebPoToWms extends BaseBean { - - private static final long serialVersionUID = -3999194389200855165L; - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name = "VERSION") - @ApiParam("版本") - public String version; - - @Column(name = "ITEM") - @ApiParam("行号") - private Integer item; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - private Double qty; - - @Column(name = "VENDOR_NO") - @ApiParam("供应商") - private String vendorNo; - - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false) - @ColumnDefault("0") - @ApiParam(value = "条码打印数量", example = "0") - private Double printQty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "PLAN_DATE") - @ApiParam("计划交货日期") - private String planDate; - - @Column(name = "PLAN_TIME") - @ApiParam("计划交货时间") - private String planTime; - - @Column(name = "ERP_AREA_NO") - @ApiParam("默认收货库存地") - private String erpAreaNo; - - @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam("标准包装") - private Double snp; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java index e627eee..e331e92 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("开口合同主表") public class SwebProcurementPlanOrder extends BaseBean { @@ -42,8 +45,8 @@ public class SwebProcurementPlanOrder extends BaseBean { private Integer orderStatus; @ApiParam("供应商代码") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java index 6e049d3..647d241 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("开口合同明细表") public class SwebProcurementPlanOrderDetails extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java index de0243b..1c6e43c 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("订单修改日志记录表") public class SwebPurchaseChangeLog extends BaseBean { @@ -50,4 +53,15 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") private String remark; + + public SwebPurchaseChangeLog() { + + } + + public SwebPurchaseChangeLog(Integer itemStatus, String remark, String modifyDatetime, String modifyUser) { + this.itemStatus = itemStatus; + this.remark = remark; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index dde1758..3038b8e 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("采购订单表-主表") public class SwebPurchaseOrder extends BaseBean { @@ -36,8 +40,8 @@ public class SwebPurchaseOrder extends BaseBean { public String orderNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") @@ -96,7 +100,7 @@ public class SwebPurchaseOrder extends BaseBean { private String refOrderNo; @Column(name = "EXPECTED_TIME") - @ApiParam(value = "预计到货时间") + @ApiParam(value = "预计交货时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String expectedTime; @@ -104,6 +108,15 @@ public class SwebPurchaseOrder extends BaseBean { @ApiParam(value = "合同号") private String refNo; + // SwebEnumUtil.ORDER_SOURCE + @Column(name = "ORDER_SOURCE") + @ApiParam(value = "订单来源") + private Integer orderSource; + + @Column(name = "IS_EXT_ADD") + @ApiParam(value = "是否追加") + private Integer isExtAdd; + @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 开始时间") @@ -113,4 +126,8 @@ public class SwebPurchaseOrder extends BaseBean { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 结束时间") private String expectedTimeEnd; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index a343b51..7a1643d 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("采购订单表-明细表") public class SwebPurchaseOrderDetails extends BaseBean { @@ -36,8 +39,8 @@ public class SwebPurchaseOrderDetails extends BaseBean { private String orderNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") @@ -78,7 +81,7 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "SNP_QTY") @ColumnDefault("0") - @ApiParam(value = "默认包装规格", example = "0") + @ApiParam(value = "包装数量", example = "0") private Double snpQty; @Column(name = "PRINT_QTY") @@ -105,6 +108,7 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("库存地") private String erpWarehouse; + // 停用 @Column(name = "REF_QTY") @ColumnDefault("0") @ApiParam(value = "订单数量", example = "0") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index ce53f9e..5c9e56f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("采购订单表-条码明细表") public class SwebPurchaseOrderSn extends BaseBean { @@ -36,8 +39,8 @@ public class SwebPurchaseOrderSn extends BaseBean { private String orderNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") @@ -51,6 +54,11 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "零件名称") private String partName; + @Column(name = "ITEM_NO") + @ColumnDefault("0") + @ApiParam(value = "行号", example = "0") + private Integer itemNo; + @ApiParam("零件类型") @Column(name = "PART_TYPE") private Integer partType; @@ -59,6 +67,10 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "UNIT") private String unit; + @Column(name = "SN_STATUS") + @ApiParam(value = "SN状态", example = "1") + private Integer snStatus; + @Column(name = "BOX_QTY") @ColumnDefault("0") @ApiParam(value = "箱数", example = "0") @@ -66,7 +78,7 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "SERIAL_NO") @ApiParam(value = "序列号") - private String serialNo; + private Integer serialNo; @Column(name = "SN") @ApiParam(value = "箱条码") @@ -117,6 +129,14 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "重量") private Double weight; + @Column(name = "VEN_PRODUCT_TIME") + @ApiParam(value = "供应商生产日期") + private String venProductTime; + + @Column(name = "EXPECTED_TIME") + @ApiParam(value = "预计交货时间") + private String expectedTime; + @Transient @ApiParam(value = "合同号") private String refNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java new file mode 100644 index 0000000..ebd1dbe --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +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 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; + +/** + * @Description : 库存需求报警 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Data +@Table(name = "SWEB_REQUIRE_ALARM") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api("库存需求报警") +public class SwebRequireAlarm extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_NO") + @ApiParam("供应商代码") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "START_QTY") + @ApiParam("开班库存") + private Double startQty; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警级别") + private String alarmLevel; + + @Column(name = "REASON") + @ApiParam("原因分析") + private String reason; + + @Column(name = "TRACK_REMARK") + @ApiParam("跟踪情况") + private String trackRemark; + + @Column(name = "COUNT_DATE") + @ApiParam("日期") + private String countDate; + + @Column(name = "REQUEST_QTY") + @ApiParam("需求数量") + private String requestQty; + + @Transient + @ApiParam("日期") + private String dateStart; + + @Transient + @ApiParam("日期") + private String dateEnd; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java new file mode 100644 index 0000000..997fe7d --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 供应商报警单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-27 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_ALARM") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api("供应商报警单") +public class SwebVendorAlarm extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_NO") + @ApiParam("供应商代码") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "ALARM_CONTENT") + @ApiParam("报警内容") + private String alarmContent; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警级别") + private Integer alarmLevel; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + private String orderNo; + + @Column(name = "PART_SPEC") + @ApiParam("物料描述") + private String partSpec; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java index d4afe0c..4e3afa7 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java @@ -8,9 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : @@ -25,6 +23,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("供应商关系表") public class SwebVendorRel extends BaseBean { @@ -38,6 +37,14 @@ public class SwebVendorRel extends BaseBean { private String vendorName; @ApiParam("供应商代码") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; + + @ApiParam("物料代码") + @Column(name = "PART_NO") + private String partNo; + + @ApiParam("物料名称") + @Column(name = "PART_NAME_ADD") + private String partNameAdd; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java new file mode 100644 index 0000000..d935126 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +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 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; + +/** + * @Description : 供应商安全库存 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_STOCK") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api("供应商安全库存") +public class SwebVendorStock extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_NO") + @ApiParam("供应商代码") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "SAFE_TYPE") + @ApiParam("安全库存计算类型") + private Integer safeType; + + @Column(name = "SAFE_VALUE") + @ApiParam("计数值") + private String safeValue; + + @Column(name = "QTY") + @ApiParam("库存数量") + private Double qty; + + @Column(name = "COUNT_MONTH") + @ApiParam("月份") + private String countMonth; + + @Column(name = "COUNT_WEEK") + @ApiParam("周") + private String countWeek; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + + @Transient + @ApiParam("日期") + private String dateStart; + + @Transient + @ApiParam("日期") + private String dateEnd; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java new file mode 100644 index 0000000..81e480a --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java @@ -0,0 +1,95 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +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 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; + +/** + * @Description : 供应商供货能力 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-16 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_SUPPLIER_CAPCITY") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api("供应商供货能力") +public class SwebVendorSupplierCapcity extends BaseBean { + private static final long serialVersionUID = 2327910806789997252L; + + @Column(name = "VENDOR_NO") + @ApiParam("供应商代码") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "CURRENT_QTY") + @ApiParam("当前库存") + private Double currentQty; + + @Column(name = "PLAN_PRODUCT_QTY") + @ApiParam("计划生产或到货") + private Double planProductQty; + + @Column(name = "PLAN_REQUEST_QTY") + @ApiParam("计划需求数量") + private Double planRequestQty; + + @Column(name = "END_QTY") + @ApiParam("期末库存") + private Double endQty; + + @Column(name = "IS_DANGER") + @ApiParam("是否存在风险") + private Integer isDanger; + + @Column(name = "DANGER_SPEC") + @ApiParam("风险描述") + private String dangerSpec; + + @Column(name = "STATUS") + @ApiParam("状态") + private String status; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + + @Column(name = "TRACK_DATE") + @ApiParam("日期") + private String trackDate; + + @Transient + @ApiParam("日期") + private String dateStart; + + @Transient + @ApiParam("日期") + private String dateEnd; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java deleted file mode 100644 index 0733e25..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.bean; - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_MOVEMENT_TO_SWEB") -@Api("库存移动单处理成功后的记录") -public class WmsMovementToSweb extends BaseBean { - private static final long serialVersionUID = 49215041475324487L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java deleted file mode 100644 index 4ec038f..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.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 : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_PO_TO_SWEB") -@Api("库存移动单处理成功后的记录") -public class WmsPoToSweb extends BaseBean { - private static final long serialVersionUID = 4710841067412420270L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java index ce5dc84..50ee5d7 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java @@ -17,4 +17,10 @@ public class SwebMovementModel { @ApiParam(value = "需求数量") private Double qty; + + @ApiParam("计划日期") + private String planDate; + + @ApiParam("计划时间") + private String planTime; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java index bad9575..890ff90 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java @@ -23,7 +23,7 @@ public class SwebPOBatchInsertEnterModel extends BaseBean { private String orderNo; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam("供应商名称") private String vendorName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java index 03b46e7..604e860 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java @@ -24,7 +24,7 @@ public class SwebPOBatchInsertItemEnterModel implements Serializable { private String partName; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam("供应商名称") private String vendorName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java index e0e7a1f..a6b71a5 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java @@ -21,7 +21,7 @@ public class SwebPODetailsUpdateHistoryModel extends BaseBean { private String orderNo; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam(value = "零件号") private String partNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java index 0f47fc7..46dda5b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java @@ -19,7 +19,7 @@ public class SwebPOForPubListEnterModel extends BaseBean { private String orderNo; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam(value = "订单类型", example = "1") public Integer orderType; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java index d8e7886..ac0d652 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java @@ -28,8 +28,8 @@ public class SwebPOForPubListResultItemModel extends BaseBean { private String partNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java deleted file mode 100644 index 6059cb8..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.SwebMovementToWms; -import org.springframework.stereotype.Repository; - -@Repository -public interface SwebMovementToWmsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java deleted file mode 100644 index 4fea058..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.SwebPoToWms; -import org.springframework.stereotype.Repository; - -@Repository -public interface SwebPoToWmsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java new file mode 100644 index 0000000..e9397f8 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebRequireAlarm; +import org.springframework.stereotype.Repository; + +/** + * @Description : 库存需求报警 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Repository +public interface SwebRequireAlarmRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java similarity index 53% rename from modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java rename to modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java index 419d43c..cfb7325 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java @@ -1,9 +1,9 @@ package cn.estsh.i3plus.pojo.sweb.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.WmsPoToSweb; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorAlarm; import org.springframework.stereotype.Repository; @Repository -public interface WmsPoToSwebRepository extends BaseRepository { +public interface SwebVendorAlarmRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java new file mode 100644 index 0000000..1616b4b --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorStock; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商安全库存 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Repository +public interface SwebVendorStockRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java new file mode 100644 index 0000000..653d469 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorSupplierCapcity; +import org.springframework.stereotype.Repository; + +/** + * @Description :供应商供货能力 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Repository +public interface SwebVendorSupplierCapcityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java deleted file mode 100644 index 83a31be..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.WmsMovementToSweb; -import org.springframework.stereotype.Repository; - -@Repository -public interface WmsMovementToSwebRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 459a7e8..8028951 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -11,6 +11,9 @@ import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * @Description : hql 封装 * @Reference : @@ -27,7 +30,7 @@ public class SwebHqlPack { * @param hqlStr * @return */ - private static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) { + public static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); @@ -45,16 +48,43 @@ public class SwebHqlPack { return hqlStr; } - public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) { + public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder, List vendorNos) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); + if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { + DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), + purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); + } + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); + return buildHql(purchaseOrder, result); + } + + public static DdlPackBean getPurchaseOrderForSnPrintWhereHql(SwebPurchaseOrder purchaseOrder, List vendorNos) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); + if (StringUtil.isEmpty(purchaseOrder.getVendorNo())) { + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); + } else { + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorNo(), "vendorNo", result); + } if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); } + + List poStatus = new ArrayList<>(); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue()); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue()); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue()); + DdlPreparedPack.getInPackList(poStatus, "poStatus", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(purchaseOrder, result); } @@ -63,7 +93,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebPackage, result); } @@ -71,7 +101,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result); DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebConfig, result); } @@ -83,69 +113,69 @@ public class SwebHqlPack { HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result); HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + HqlPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result); HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result); HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result); // 封装有效状态和删除状态 HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return result.toString(); } public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result); DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); // 封装有效状态和删除状态 DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(model, result); } public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrder, result); } public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrderDetails, result); } public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(vendorRel.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(vendorRel, result); } public static DdlPackBean getPurchaseOrderDetailsPublishListQtyWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); - DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } @@ -157,9 +187,7 @@ public class SwebHqlPack { public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); -// DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); return buildHql(details, result); } @@ -175,22 +203,75 @@ public class SwebHqlPack { return buildHql(details, result); } - public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) { - DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); - return buildHql(master, result); - } - public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(details, result); } + + public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List vendorNos) { + DdlPackBean result = new DdlPackBean(); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); + } + DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result); + if (!StringUtil.isEmpty(capcity.getDateStart())) { + DdlPreparedPack.getStringBiggerPack(capcity.getDateStart(), "trackDate", result); + } + if (!StringUtil.isEmpty(capcity.getDateEnd())) { + DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result); + } + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); + return buildHql(capcity, result); + } + + public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List vendorNos) { + DdlPackBean result = new DdlPackBean(); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); + } + DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); + if (!StringUtil.isEmpty(alarm.getDateStart())) { + DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); + } + if (!StringUtil.isEmpty(alarm.getDateEnd())) { + DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); + } + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); + return buildHql(alarm, result); + } + + public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List vendorNos) { + DdlPackBean result = new DdlPackBean(); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); + } + DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); + return buildHql(stock, result); + } + + public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List vendorNos) { + DdlPackBean result = new DdlPackBean(); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); + } + DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); + return buildHql(alarm, result); + } } diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..d221913 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-DEV-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/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 80ee2b6..9bdfa77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "AMP_JIS收货", description = "AMP_JIS收货") public class AmpJisRec extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java index 97aaabd..ecd9cd0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="AMP_PART") @Api("AMP_物料") public class AmpPart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java index f5fde23..447cea5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="AMP_STOCK_CURRENT") @Api("AMP_实时库存表") public class AmpStockCurrent extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 2ea88ea..cf6566e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户信息表",description = "客户信息表") public class BasCustomer extends BaseBean { @@ -70,4 +73,13 @@ public class BasCustomer extends BaseBean { @ApiParam(value = "传真") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custFax; + + @Column(name = "SAFETY_STOCK") + @ApiParam(value = "安全库存") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private Double safetyStock; + + public double getSafetyStockVal() { + return this.safetyStock == null ? 0.0d : this.safetyStock; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index 583e70a..4641032 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_VENDOR") @Api("供应商信息") public class BasVendor extends BaseBean{ @@ -55,6 +58,7 @@ public class BasVendor extends BaseBean{ @Column(name="VENDOR_ADDR") @ApiParam("供应商地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorAddr; @Column(name="VENDOR_OWNER") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java index 345b775..da7d4e1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java @@ -3,16 +3,14 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * 脚本持久化实体类 @@ -26,7 +24,10 @@ import javax.persistence.Transient; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"}) +}) @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { private static final long serialVersionUID = 7893111140559759490L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java index 18c15f2..e9528e0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Transient; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "SCRIPT_PERSISTENCE_HISTORY") @Api("系统动态脚本") public class EngineScriptPersistenceHistory extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java new file mode 100644 index 0000000..ed9db98 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** +* @Description : LPS库存 +* @Reference : +* @author: jessica.chen +* @date: 2019/12/10 17:10 +* @Modify: +*/ + +@Data +@Api(value="LPS库存模板",description = "LPS库存模板") +public class LpsStockQuanModel extends BaseBean { + + private static final long serialVersionUID = 2167743108452607913L; + + //源存储区 + @ApiParam(value = "FromLocation") + @AnnoOutputColumn + private String srcZoneNo; + + //目标库位 + @ApiParam(value = "ToBIn") + @AnnoOutputColumn + private String locateNo; + + //零件号 + @ApiParam(value = "Item") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "Qty") + @AnnoOutputColumn + private String qty; + + @ApiParam(value = "下标值") + @AnnoOutputColumn(required = false) + private Integer index; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java index 04436ff..16b9e28 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,15 +27,16 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_PP_DETAILS") @Api("MES_生产计划明细表") public class MesPpDetails extends BaseBean{ private static final long serialVersionUID = 9214639813072592727L; - @Column(name="WROKORDER_NO") + @Column(name="WORK_ORDER_NO") @ApiParam("工单号") - private String woekorderNo; + private String workOrderNo; @Column(name="ITEM") @ApiParam("行号") @@ -52,6 +55,11 @@ public class MesPpDetails extends BaseBean{ @ApiParam(value = "工单数量", example = "0") public Double qty; + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "处理数量", example = "0") + public Double transQty = 0D; + @Column(name="PART_GROUP_NO") @ApiParam("零件组号") public String partGroupNo; @@ -63,4 +71,8 @@ public class MesPpDetails extends BaseBean{ public Double getQty() { return qty == null ? 0D : this.qty.doubleValue(); } + + public Double getTransQty() { + return transQty == null ? 0D : this.transQty.doubleValue(); + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 2eb3864..72ea57f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -13,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : MES_生产计划主表 @@ -26,16 +29,17 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_PP_MASTER") @Api("MES_生产计划主表") public class MesPpMaster extends BaseBean{ private static final long serialVersionUID = 9214639813072592726L; - @Column(name="WROKORDER_NO") + @Column(name="WORK_ORDER_NO") @ApiParam("工单号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) - private String woekorderNo; + private String workOrderNo; @Column(name="PDLINE_NO") @ApiParam("产线代码") @@ -44,6 +48,13 @@ public class MesPpMaster extends BaseBean{ searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String pdlineNo; + @Column(name="PDLINE_NAME_RDD") + @ApiParam("产线名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterName") + private String pdlineNameRdd; + @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) @@ -71,11 +82,30 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_MASTER_STATUS") private Integer orderStatus = 0; + @Column(name="ORDER_TYPE") + @ApiParam(value = "单据类型", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_TYPE") + private Integer orderType = 0; + @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq = 0; + @Column(name = "REMARK") + @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String remark; + + @Column(name = "WORK_ORDER_PLAN_STATUS", columnDefinition = "int default 10") + @ApiParam("工单计划状态") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS") + private Integer workOrderPlanStatus; + + @Transient + @ApiParam("是否要从拉动计算中扣除") + private boolean needMinutPullQty = false; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java index 697f6dd..4db6547 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java @@ -22,7 +22,7 @@ public class MesPpTemplate extends BaseBean { @ApiParam(value = "工单号") @AnnoOutputColumn - private String woekorderNo; + private String workOrderNo; @ApiParam(value = "产线代码") @AnnoOutputColumn diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index 1e942f7..5711261 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -9,6 +9,8 @@ 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 org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="QAD_BOP") +@Inheritance(strategy = InheritanceType.JOINED) @Api("QAD_BOP信息") public class QadBop implements Serializable { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java index b1433df..f9e9e49 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java @@ -9,6 +9,8 @@ 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 org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.GenericGenerator; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="QAD_ITEM_PACKING") +@Inheritance(strategy = InheritanceType.JOINED) @Api("零件包装主数据信息") public class QadItemPacking implements Serializable { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java index 5a96543..2c26e98 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "QMS_CHECK_TYPE") @Api("物料子检测项") public class QmsCheckType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java index 566dc2b..2787390 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="QMS_STOCK_SN_EXT_BH") @Api("BH库存条码扩展表") public class QmsStockSnExtBh extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index b816bfe..205dbff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -14,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="SAP_DOC_FG_SUM") @Api("SAP_产品报工汇总表") public class SapDocFgSum extends BaseBean { @@ -114,6 +117,10 @@ public class SapDocFgSum extends BaseBean { @ApiParam(value = "备注") private String errorMsg; + @Column(name = "LINE_NO") + @ApiParam("生产线") + public String lineNo; + @JsonSerialize(using = ToStringSerializer.class) @Transient public Long wdfdId; @@ -159,6 +166,32 @@ public class SapDocFgSum extends BaseBean { this.seqNo = seqNo; this.itemSeqNo = itemSeqNo; } + + public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, + String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, + String effStartTime, String bomVersion, String fGOrderNo, String seqNo, String itemSeqNo, String lineNo) { + this.wdfdId = wdfdId; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.unit = unit; + this.erpWorkCenter = erpWorkCenter; + this.inAreaNo = inAreaNo; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.itemUnit = itemUnit; + this.outAreaNo = outAreaNo; + this.itemQty = itemQty; + this.src = src; + this.isLock = isLock; + this.effStartTime = effStartTime; + this.bomVersion = bomVersion; + this.fGOrderNo = fGOrderNo; + this.seqNo = seqNo; + this.itemSeqNo = itemSeqNo; + this.lineNo = lineNo; + } + public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { this.wdfdId = wdfdId; @@ -177,4 +210,13 @@ public class SapDocFgSum extends BaseBean { this.isLock = isLock; this.effStartTime = effStartTime; } + + //wdfd.partNo,wdfd.lineNo,sum(wdfd.qty),sum(wdfd.createDatetime) + public SapDocFgSum(String partNo, String lineNo, Double qty, String createDatetime) { + this.partNo = partNo; + this.lineNo = lineNo; + this.qty = qty; + this.createDatetime = createDatetime; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java index 4de7f0e..0a34ee8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java @@ -9,6 +9,8 @@ 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 org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.GenericGenerator; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="SOD_DET") +@Inheritance(strategy = InheritanceType.JOINED) @Api("SOD_DET信息") public class SodDet implements Serializable { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index 6069c18..4cf4124 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -6,12 +6,15 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +29,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SWEB_PROCUREMENT_PLAN_ORDER") +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="SWEB_PROCUREMENT_PLAN_ORDER", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "VENDOR_CODE"), + @Index(columnList = "PART_NO") +}) @Api("开口合同主表") public class SwebProcurementPlanOrder extends BaseBean { @@ -69,4 +77,15 @@ public class SwebProcurementPlanOrder extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer consignment=2; + @Column(name = "EXP_DATE") + @ApiParam(value = "过期日期") + private String expDate; + + @Column(name = "ITEM") + @ApiParam("行号") + private Integer item; + + @Column(name = "START_DATE") + @ApiParam(value = "起始日期") + private String startDate; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index 55e2498..78b12b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_WAREHOUSE") @Api("工厂仓库信息") public class WareHouse extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 00036f6..2494f18 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_ASN_MASTER", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "ORGANIZE_CODE") @@ -75,6 +78,10 @@ public class WmsASNMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; + @Column(name = "REASON") + @ApiParam(value = "原因", example = "1") + public String reason; + @ApiParam("ASN详情列表") @Transient public List asnMasterDetailsList; @@ -191,6 +198,14 @@ public class WmsASNMaster extends BaseBean { @Transient private List orderNoList; + @Transient + @ApiParam(value = "窗口开始时间") + public String windowStartTime; + + @Transient + @ApiParam(value = "窗口结束时间") + public String windowEndTime; + public WmsASNMaster() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 9ff19b8..9cf635d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -25,6 +27,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_ASN_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @@ -121,7 +124,7 @@ public class WmsASNMasterDetails extends BaseBean { public Double recQty; @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java new file mode 100644 index 0000000..aef56f0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import lombok.Data; + +/** + * @Description : 调用流程处理组件时的返回对象 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-08-03 20:54 + * @Modify: + **/ +@Data +public class WmsActionCallResult { + private Object resultObj; + /** + * 执行耗时，单位 ms + */ + private Integer duration; + + public WmsActionCallResult(Object resultObj, Integer duration) { + this.resultObj = resultObj; + this.duration = duration; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 889b2b3..2ccb28b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -8,11 +8,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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 作业流程 @@ -26,6 +29,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_GROUP") @Api("作业流程") public class WmsActionGroup extends BaseBean { @@ -95,6 +99,9 @@ public class WmsActionGroup extends BaseBean { @Transient @ApiParam(value = "提交步骤序号") private Integer submitStepSeq; + @Transient + @ApiParam(value = "流程级别组件参数") + private List agAmParamsList; public long getInitAmIdVal() { return this.initAmId == null ? 0 : this.initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 095ae01..b3fa87f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_GROUP_DETAILS") @Api("作业流程明细") public class WmsActionGroupDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index 4b8e558..e7172db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_LOG") @Api(value = "作业记录表") public class WmsActionLog extends BaseBean { @@ -124,6 +127,10 @@ public class WmsActionLog extends BaseBean { @ApiParam(value = "结束组件编号", example = "0") public Long endAmId; + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index b96ae52..06a9880 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -1,12 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,18 +30,49 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="作业记录参数表",description = "作业记录参数表") public class WmsActionLogData extends BaseBean { private static final long serialVersionUID = -8150713013135101134L; - @Column(name = "ALD_ID") - @ApiParam(value = "记录明细编号") + + @Column(name = "TASK_NO") + @ApiParam(value = "作业任务编号", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public String taskNo; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型编号") + public String transTypeCode; + + @Column(name = "ORDER_NO") + @ApiParam(value = "业务单号") + public String orderNo; + + @Column(name = "MOVE_NO") + @ApiParam(value = "移动单单号") + public String moveNo; + + @Column(name = "AG_ID") + @ApiParam(value = "作业流程编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) - private Long aldId; + public Long agId; - @Column(name = "ALD_SEQ") - @ApiParam(value = "步骤序号") - private Integer aldSeq; + @Column(name = "AL_NAME_RDD") + @ApiParam(value = "流程名称") + public String agNameRdd; + + @Column(name = "ACTION_USER_NAME") + @ApiParam(value = "作业人员") + public String actionUserName; + + @Column(name = "FIX_NO") + @ApiParam(value = "设备编号") + public String fixNo; + + @Column(name = "AGD_SEQ") + @ApiParam(value = "作业步骤序号") + private Integer agdSeq; @Column(name = "CALL_CLASS") @ApiParam(value = "实现类") @@ -54,21 +86,17 @@ public class WmsActionLogData extends BaseBean { @ApiParam(value = "执行状态") private Integer executeStatus; - @Column(name = "START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00") - private String startTime; - - @Column(name = "END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") - private String endTime; - + /** + * 保存调用组件时的 params + */ @Lob @Column(name = "IN_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输入参数") private String inParams; + /** + * 保存调用组件后的返回值 + */ @Lob @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输出参数") @@ -78,4 +106,8 @@ public class WmsActionLogData extends BaseBean { @Column(name = "ERROR_MSG", columnDefinition = "TEXT") @ApiParam(value = "异常信息") private String errorMsg; + + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index facb1fc..1849252 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_LOG_DETAILS") @Api(value = "作业记录明细表", description = "作业记录表") public class WmsActionLogDetails extends BaseBean { @@ -116,6 +119,11 @@ public class WmsActionLogDetails extends BaseBean { @Column(name="MOVE_NO") @ApiParam(value = "移动单单号") public String moveNo; + + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; + public Long getAsId() { if (asId != null) { return asId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index 28efa4f..3c4a3fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,11 +27,15 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_MODULE") @Api("作业步骤处理组件") public class WmsActionModule extends BaseBean { - private static final long serialVersionUID = 9117362998863937579L; + + private static final int TRUE = 1; + private static final int FALSE = 2; + @Column(name = "AM_NAME",nullable = false) @ApiParam("组件名称") @AnnoOutputColumn @@ -63,6 +69,22 @@ public class WmsActionModule extends BaseBean { @ApiParam(value = "作业类型名称") public String opTypeName; + @Column(name = "IS_SCRIPT_MODULE", columnDefinition = "int default 2") + @ApiParam(value = "是否脚本组件") + private Integer isScriptModule; + + /** + * 是否脚本组件 + * @return + */ + public boolean isScriptModule() { + if (this.isScriptModule != null && this.isScriptModule.intValue() == TRUE) { + return true; + } + + return false; + } + public WmsActionModule() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index 1923bb0..c9dddca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_MODULE_PARAM") @Api("作业步骤处理组参数") public class WmsActionModuleParam extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 8144c65..064a9de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="作业步骤信息",description = "作业步骤信息") public class WmsActionStep extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index c354a66..358dd4b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_STEP_CALL", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "AS_ID"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index 41ceb88..6c748fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "作业步骤调用参数表", description = "作业步骤调用参数表") public class WmsActionStepCallParam extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java index 4f8536b..28df3f9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "作业步骤类型信息", description = "作业步骤类型信息") public class WmsActionStepType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index 12f5c0e..1953b63 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="责任区域分配信息",description = "责任区域分配信息") public class WmsAreaOwner extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java index 3086942..b26b237 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -33,6 +35,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "无人叉车任务明细", description = "喜德无人叉车任务明细") public class WmsAutoForkCallBackDetails extends BaseBean { private static final long serialVersionUID = -8103992000562208799L; @@ -93,7 +96,7 @@ public class WmsAutoForkCallBackDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String robotCode; - @Column(name = "STATUS", nullable = false, columnDefinition = "default 10") + @Column(name = "STATUS", nullable = false, columnDefinition = "int default 10") @ApiParam("处理标准") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "AUTO_FORK_TASK_STATUS") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java index e5fb349..675807c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_AUTO_STRATEGY_DETAIL", indexes = { @Index(columnList = "AUTO_STRATEGY_NO"), @Index(columnList = "STRATEGY_ITEM_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java index 9a4437d..0c7f53b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_AUTO_STRATEGY_MASTER", indexes = { @Index(columnList = "STRATEGY_NO"), @Index(columnList = "ROUTING_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java index 31f0174..c945ab8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_AUTO_STRATEGY_METHOD", indexes = { @Index(columnList = "STRATEGY_ACTION") }) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java index 640c0d4..639d463 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "自动任务日志", description = "自动任务日志") public class WmsAutoTaskLog extends BaseBean { private static final long serialVersionUID = -7839329617395574378L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index 649bea3..0d70135 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -1,11 +1,15 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_BH_CHILD_DETECTION_ITEM") @Api("BH子检测项") public class WmsBhChildDetectionItem extends BaseBean { @@ -50,5 +55,6 @@ public class WmsBhChildDetectionItem extends BaseBean { @Column(name = "VALUE_TYPE") @ApiParam("值类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class) private Integer valueType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 9d9f33f..c21561e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -31,6 +33,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物料清单", description = "物料清单") public class WmsBom extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java index 88525bb..c74ebb7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -32,6 +34,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "bom历史记录", description = "bom历史记录") public class WmsBomHistory extends BaseBean { private static final long serialVersionUID = -2781401699752981565L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index b1643f2..1acf77d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -11,7 +11,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description 全量BOM @@ -19,16 +22,23 @@ import javax.persistence.Table; * @Author dragon * @CreateDate 2019/6/19 21:23 * @Modify + * 2020-09-24 18:58 Rock.Yu 增加 Category 属性，Magna 的 BOM 是多层结构，需要靠这个字段标记是否虚阶 */ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_BOM_TOTAL") @Api("全量BOM") public class WmsBomTotal extends BaseBean { private static final long serialVersionUID = 8196235268344152723L; + /** + * 麦格纳 SAP 中表示虚阶BOM的代码 + */ + public static final String MGANA_BOM_HAS_CHILD = "5"; + @Column(name = "PART_NO") @ApiParam("父物料号") private String partNo; @@ -82,4 +92,34 @@ public class WmsBomTotal extends BaseBean { @Column(name = "SID") @ApiParam(value = "SID") private String sid; + + /** + * SAP Category == 5 表示零件是虚阶 + */ + @Column(name = "CATEGORY") + @ApiParam(value = "是否虚阶物料") + private String category; + + /** + * 是否包含子阶 + * @return + */ + public boolean hasChild() { + return category != null && category.trim().equals(MGANA_BOM_HAS_CHILD); + } + + /** + * 导入列 + */ + @Transient + @ApiParam(value = "行数") + private Integer rows; + + @Transient + @ApiParam(value = "状态") + private Integer status; + + @Transient + @ApiParam(value = "异常信息") + private String errorMsg; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index 3657a64..4cc03bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_BUSI_TYPE") @Api("业务类型信息") public class WmsBusiType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java index f8b58d3..5ed3c99 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_CS_ADJUST_RANGE") @Api("盘点调差范围信息") public class WmsCSAdjustRange extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 69772a7..58c5249 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_CS_FACTTRANS") @Api("盘点实盘信息") public class WmsCSFactTrans extends BaseBean { @@ -38,15 +41,15 @@ public class WmsCSFactTrans extends BaseBean { public String orderNo; @Column(name="WH_NO") - @ApiParam("仓库代码") + @ApiParam("仓库编码") public String whNo; @Column(name="ZONE_NO") - @ApiParam("存储区编号") + @ApiParam("存储区编码") public String zoneNo; @Column(name="LOCATE_NO") - @ApiParam("库位编号") + @ApiParam("库位编码") public String locateNo; @Column(name="PART_NO") @@ -70,9 +73,12 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("单位") public String unit; + /** + * 实盘数量 + **/ @Column(name="FACT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") - @ApiParam(value = "实盘数量", example = "0") + @ApiParam(value = "数量", example = "0") public Double factQty; /** @@ -80,7 +86,7 @@ public class WmsCSFactTrans extends BaseBean { */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ITEM_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; @Column(name="REMARK") @@ -150,6 +156,19 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("行号") private String item; + + @ApiParam("应盘人") + public String detailsCreateUser; + + @ApiParam("应盘时间") + public String detailsCreateDatetime; + + @ApiParam("实盘人") + public String factCreateUser; + + @ApiParam("实盘时间") + public String factCreateDatetime; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java index 02314f0..df17fea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_CS_LOCATE") @Api("盘点库位信息") public class WmsCSLocate extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index f6e866e..d7dd874 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -14,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_CS_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "VENDOR_NO"), @@ -53,7 +56,7 @@ public class WmsCSOrderDetails extends BaseBean { @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") + @ApiParam(value = "数量", example = "0") public Double qty; @Column(name = "UNIT") @@ -80,7 +83,6 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("条码") public String sn; - /** * 质检状态:1=未质检,10=质检中,20=质检合格, * 30=质检不合格,40=已退货 @@ -117,6 +119,11 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "LOT_NO") + @ColumnDefault("") + @ApiParam("收货批次") + public String lotNo = ""; + @Transient @ApiParam(value = "实盘数量", example = "1") @AnnoOutputColumn(hidden = true) @@ -148,7 +155,7 @@ public class WmsCSOrderDetails extends BaseBean { public String[] zoneNos; /** - * 差异类型：10：盘平，20：盘亏，30盘赢 + * 差异类型：10：盘平，20：盘亏，30盘盈 */ @Transient @ApiParam("差异类型") @@ -156,13 +163,17 @@ public class WmsCSOrderDetails extends BaseBean { public Integer differenceType; /** - * 差异类型：10：盘平，20：盘亏，30盘赢 + * 差异类型：10：盘平，20：盘亏，30盘盈 */ @Transient @ApiParam("差异集合") @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description") public List differenceTypeList; + @ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer orderStatus; + public Integer getDifferenceTypeVal() { return this.differenceType == null ? -1: this.differenceType; @@ -225,4 +236,9 @@ public class WmsCSOrderDetails extends BaseBean { this.factQty=factQty; this.locateNo=locateNo; } + + public WmsCSOrderDetails(String partNo,String partNameRdd) { + this.partNo=partNo; + this.partNameRdd = partNameRdd; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index f6030f5..db8544f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_CS_ORDER") @Api("盘点单主表信息") public class WmsCSOrderMaster extends BaseBean { @@ -83,6 +86,10 @@ public class WmsCSOrderMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isSyncErp; + @Column(name = "CS_LOCATE") + @ApiParam("盘点中库位") + public String cslocate; + @Transient @ApiParam(value = "盘点明细集") public List wmsCSOrderDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java index a85ae4a..52136d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_CS_PART") @Api("盘点区物料信息") public class WmsCSPart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 7bea734..1bc0430 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -5,7 +5,10 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_CS_RANGE") @Api("盘点范围信息") public class WmsCSRange extends BaseBean { @@ -47,6 +51,10 @@ public class WmsCSRange extends BaseBean { @ApiParam("物料名称") public String partNameRdd; + @Column(name = "WH_NO") + @ApiParam("仓库代码") + public String whNo; + @Column(name = "ZONE_NO") @ApiParam("存储区编号") public String zoneNo; @@ -64,17 +72,65 @@ public class WmsCSRange extends BaseBean { @ApiParam("原单号") public String srcOrderNo; + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "库存数量", example = "0") + public Double qty; + + @Column(name = "LOT_NO") + @ApiParam("收货批次") + public String lotNo; + @Transient @ApiParam("存储区编号组") @AnnoOutputColumn(hidden = true) public String[] zoneNos; + @Transient + @ApiParam("库存地代码") + @AnnoOutputColumn(hidden = true) + public String areaNo; + + @Transient + @ApiParam("存储区") + @AnnoOutputColumn(hidden = true) + public String basZoneNo; + + @Transient + @ApiParam("状态") + @AnnoOutputColumn(hidden = true) + public Integer orderStatus; + public WmsCSRange(){} + public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ this.zoneNo = zoneNo; this.partNo = partNo; this.partNameRdd = partNameRdd; } + public WmsCSRange(String zoneNo, String basZoneNo, String areaNo, String partNo, String partNameRdd) { + this.zoneNo = zoneNo; + this.basZoneNo = basZoneNo; + this.areaNo = areaNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } + + public WmsCSRange(String zoneNo, String locateNo) { + this.zoneNo = zoneNo; + this.locateNo = locateNo; + } + + public WmsCSRange(String zoneNo) { + this.zoneNo = zoneNo; + } + + public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) { + this.orderNo = orderNo; + this.partNo = partNo; + this.zoneNo = zoneNo; + this.orderStatus = orderStatus; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java index 42e1250..4a7c639 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_CS_ZONE") @Api("盘点存储区信息") public class WmsCSZone extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index fa3d7d1..afcc787 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -14,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 车辆信息 @@ -27,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_CAR") @Api("车辆信息") public class WmsCar extends BaseBean { @@ -84,4 +88,28 @@ public class WmsCar extends BaseBean { @ApiParam("经纬度") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; + + @Column(name = "VOLUME", columnDefinition = "decimal(18,8)") + @ApiParam(value = "容积", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double volume; + + @Transient + @ApiParam(value = "需要(辆)") + private Integer carQty; + + @Transient + @ApiParam(value = "车辆序号") + private Integer seq; + + public WmsCar() { + } + + public WmsCar(WmsCar car, Integer seq, String carDesc) { + this.id = car.id; + this.organizeCode = car.organizeCode; + this.volume = car.volume; + this.carNo = seq.toString(); + this.carDesc = carDesc; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index f39695e..19ffd3e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_IB_CHECK_FACT") @Api("抽点记录信息") public class WmsCheckFactRecord extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java index e07cb5f..0aba7f1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="COI对照表",description = "COI对照表") public class WmsCoi extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java index a941bf2..7643f8a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_CONFIG") @Api(value="系统配置",description = "WMS系统配置") public class WmsConfig extends BaseBean { @@ -53,6 +56,9 @@ public class WmsConfig extends BaseBean { @ApiParam(value ="参数值类型") private String configValueType; + /** + * SQL Server 2005:请使用 varchar(max)、nvarchar(max) 和 varbinary(max) 数据类型，而不要使用 text、ntext 和 image 数据类型。 + */ @Lob @Column(name="CONFIG_VALUE", columnDefinition = "TEXT") @ApiParam(value ="参数值") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java index 5529e33..7fca097 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_CONTAINER_TYPE") @Api("容器类型") public class WmsContainerType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 4933c46..91654d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -31,6 +33,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "盘点策略表", description = "盘点策略表") public class WmsCsStrategy extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java index 95e581d..9fd8b1c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户窗口时间",description = "客户窗口时间") public class WmsCustWindow extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java index 3e7e870..a5f88d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户零件关系表",description = "客户零件关系表") public class WmsCustomerPart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java index a071ed1..337077d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户物料发往地",description = "客户物料发往地") public class WmsCustomerPartShipping extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index 1995c1c..bcba788 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="数据权限信息",description = "数据权限信息") public class WmsDataAuth extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java index 34ed123..33a9b4e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DATA_MIGRATION_CONFIG") @Api("WMS数据迁移配置表") public class WmsDataMigrationConfig extends BaseBean{ 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 6447a3a..7095697 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 @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -14,6 +16,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** @@ -28,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_FG_DETAIL") @Api("WMS_产品报工明细信息") public class WmsDocFgDetail extends BaseBean { @@ -182,10 +187,60 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "jis编号") private String jisNo; + @Column(name = "TERMINAL_NO") + @ApiParam(value = "工位号") + private String terminalNo; + + @Column(name = "PROCESS_TIME") + @ApiParam(value = "离开时间") + private String processTime; + + @Column(name = "PRODUCT_STATUS") + @ApiParam(value = "成品条码状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description") + private Integer productStatus; + + @Column(name = "CURRENT_SEQ") + @ApiParam(value = "当前序号") + private Integer currentSeq; + + @Column(name = "MAX_SEQ") + @ApiParam(value = "最大序号") + private Integer maxSeq; + + @Column(name = "RC_TIME") + @ApiParam(value = "接收时间") + private String rcTime; + + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "产品条码") + private String serialNumber; + + + + public WmsDocFgDetail(String jisNo) { this.jisNo = jisNo; } public WmsDocFgDetail() { } + + public WmsDocFgDetail(String jisNo, String queueGroupNo, String processTime, Integer temp) { + this.jisNo = jisNo; + this.queueGroupNo = queueGroupNo; + this.processTime = processTime; + } + + public WmsDocFgDetail(String jisNo, String sn) { + this.jisNo = jisNo; + this.sn = sn; + } + + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { + this.sn = sn; + this.mfgLocNo = mfgLocNo; + this.partNo = partNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 80a7f60..f17dccb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,6 +17,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; @@ -32,6 +35,7 @@ import javax.persistence.Version; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_MOVEMENT_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @@ -103,6 +107,18 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "计划时间") private String planTime; + @Transient + @ApiParam(value = "超时时间(单位:分钟)") + private Integer timeOut; + + @Transient + @ApiParam(value = "窗口时间") + private String windowTime; + + @Transient + @ApiParam(value = "紧急程度") + private Integer urgentStatus; + @Column(name = "SRC_NO") @ApiParam(value = "源单号") private String srcNo; @@ -111,9 +127,48 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工序") + private String workCellCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + + @Transient + @ApiParam(value = "完成状态") + public Integer orderStatus; + + @Transient + @ApiParam(value = "客户名称") + public String custName; + + @Transient + @ApiParam(value = "道口") + public String dock; /** * 已创建，已收货，已发运，已拣货 @@ -126,6 +181,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; + @Transient + @ApiParam(value = "完成数百分比") + private String number; + /** * 是否免费:0=计费,1=免费 */ @@ -179,6 +238,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; + + @Column(name = "DEST_XB_ZONE_NO") + @ApiParam("目的线边存储区代码") + public String destXBZoneNo; + @Column(name = "LOT_NO") @ApiParam("批次") public String lotNo; @@ -187,6 +251,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("源单行号") public String srcItem; + @Column(name = "CUST_ORDER_NO") @ApiParam("客户订单号") public String custOrderNo; @@ -239,6 +304,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "替代物料编码") private String subPartNo; + @Transient + @ApiParam(value = "颜色") + private String color; @Transient @ApiParam(value = "替代物料名称") @@ -268,6 +336,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("生产日期") public String dateCode; + @Transient + @ApiParam("生产线") + public String line; + @ApiParam(value = "散件移库输入移库数量") @Transient public Double inputMoveQty; @@ -277,6 +349,14 @@ public class WmsDocMovementDetails extends BaseBean { private Double snp; @Transient + @ApiParam(value = "订单总数量") + private Long itemCount; + + @Transient + @ApiParam(value = "完成订单数量") + private Integer completeCount; + + @Transient @ApiParam(value = "条码总数量", example = "1") private Double detailsSnCount; @@ -328,6 +408,24 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "子位置号") private String itemSeqNo; + @ApiParam(value = "最早需求时间") + private String firstTime; + + @Transient + @ApiParam(value = "实际发运时间") + private String actualPlanTime; + + @Transient + @ApiParam(value = "目的库位名称") + public String destLocateName; + + @Transient + @ApiParam("报废类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description") + public Integer scrapType; + + + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } @@ -360,8 +458,15 @@ public class WmsDocMovementDetails extends BaseBean { return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); } + public String getLine() { + if (StringUtil.isEmpty(this.line)) { + return ""; + } + return this.line; + } + @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; @@ -384,9 +489,79 @@ public class WmsDocMovementDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; + @Transient + @ApiParam("产线代码") + private String workCenterCode; + + @Transient + @ApiParam("箱数") + private Double boxQty; + + @Transient + @ApiParam("窗口领料开始时间") + private String windowPickStartTime; + + @Transient + @ApiParam("窗口领料结束时间") + private String windowPickEndTime; + + @Transient + @ApiParam("项目编号") + String prodCfgTypeCode; + + @Transient + @ApiParam("项目名称") + String prodCfgTypeName; + + @Transient + @ApiParam("完成时间") + public String complateDateTime; + + + + + + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) { + this.custNo = custNo; + this.orderNo = orderNo; + this.planDate = planDate; + this.planTime = planTime; + this.itemStatus = itemStatus; + this.projectNo = projectNo; + this.partNo=partNo; + } + public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + + } + + + public WmsDocMovementDetails (String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String partNo) { + this.createDatetime = createDatetime; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.itemStatus= itemStatus; + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.partNo=partNo; + } - public WmsDocMovementDetails () { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planDate, String planTime, Long itemCount) { + this.createDatetime = createDatetime; + this.srcZoneNo = srcZoneNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.itemStatus = itemStatus; + this.orderNo = orderNo; + this.planDate = planDate; + this.planTime = planTime; + this.itemCount = itemCount; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { @@ -403,7 +578,6 @@ public class WmsDocMovementDetails extends BaseBean { this.priority = priority; this.orderNo = orderNo; } - public WmsDocMovementDetails (String partNo,String orderNo) { this.partNo = partNo; this.orderNo = orderNo; @@ -451,4 +625,197 @@ public class WmsDocMovementDetails extends BaseBean { this.custNo = custNo; } + public WmsDocMovementDetails(){ + + } + + + public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo,Integer priority,String createDatetime) { + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.priority = priority; + this.createDatetime = createDatetime; + } + + public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, String color) { + this.id = wmsDocMovementDetails.getId(); + this.orderNo = wmsDocMovementDetails.getOrderNo(); + this.partNo = wmsDocMovementDetails.getPartNo(); + this.qty = wmsDocMovementDetails.getQty(); + this.seqNo = wmsDocMovementDetails.getSeqNo(); + this.partNameRdd = wmsDocMovementDetails.getPartNameRdd(); + this.partSpec = wmsDocMovementDetails.getPartSpec(); + this.workOrderCode = wmsDocMovementDetails.getWorkOrderCode(); + this.productionGroup = wmsDocMovementDetails.getProductionGroup(); + this.item = wmsDocMovementDetails.getItem(); + this.planTime = wmsDocMovementDetails.getPlanTime(); + this.planDate = wmsDocMovementDetails.getPlanDate(); + this.unit = wmsDocMovementDetails.getUnit(); + this.custNo = wmsDocMovementDetails.getCustNo(); + this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo(); + this.srcWhNo = wmsDocMovementDetails.getSrcWhNo(); + this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo(); + this.destWhNo = wmsDocMovementDetails.getDestWhNo(); + this.destZoneNo = wmsDocMovementDetails.getDestZoneNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo(); + this.destAreaNo = wmsDocMovementDetails.getDestAreaNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); + this.color = color; + } + + public WmsDocMovementDetails(String orderNo, Double qty, Double pickQty, String modifyDateTime, String createDateTime, String planDate, String planTime, Integer orderStatus) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.modifyDatetime = modifyDateTime; + this.createDatetime = createDateTime; + this.planDate = planDate; + this.planTime = planTime; + this.orderStatus = orderStatus; + } + + public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty,String srcLocateNo) { + this.id = wmsDocMovementDetails.getId(); + this.orderNo = wmsDocMovementDetails.getOrderNo(); + this.partNo = wmsDocMovementDetails.getPartNo(); + this.partNameRdd = wmsDocMovementDetails.getPartNameRdd(); + this.qty = wmsDocMovementDetails.getQty(); + this.unit = wmsDocMovementDetails.getUnit(); + this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.createDatetime = wmsDocMovementDetails.getCreateDatetime(); + this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); + this.boxQty = boxQty; + this.srcLocateNo = srcLocateNo; + } + + public WmsDocMovementDetails(String orderNo, Integer orderStatus, Double qty, Double pickQty, String modifyDatetime, String planTime) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.qty = qty; + this.pickQty = pickQty; + this.modifyDatetime = modifyDatetime; + this.planTime = planTime; + } + + public WmsDocMovementDetails (String erpSrcNo,String orderNo,String projectNo,Double qty,Double pickQty, + String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + this.erpSrcNo = erpSrcNo; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + this.partNo = partNo; + this.itemStatus = itemStatus; + + } + + public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty, + String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + this.partNo = partNo; + this.itemStatus = itemStatus; + + } + + public WmsDocMovementDetails(String erpSrcNo, String orderNo, String prodCfgTypeCode, String prodCfgTypeName, + Double qty, String planDate, String planTime, String custNo) { + this.erpSrcNo = erpSrcNo; + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + } + + public WmsDocMovementDetails(String orderNo, String prodCfgTypeCode, String prodCfgTypeName, + Double qty, String planDate, String planTime, String custNo) { + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + } + + + public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode, String custNo) { + this.orderNo = orderNo; + this.pickQty = pickQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.custNo = custNo; + } + + public WmsDocMovementDetails(String orderNo,String custPartNo,String srcZoneNo, String destZoneNo,String destLocateNo,Double qty,Double pickQty, String createDatetime,Integer orderStatus,String createUser) { + this.orderNo = orderNo; + this.custPartNo = custPartNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.qty = qty; + this.pickQty = pickQty; + this.createDatetime = createDatetime; + this.orderStatus = orderStatus; + this.createUser = createUser; + + } + public WmsDocMovementDetails(String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo, String locateName) { + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.destLocateName = locateName; + } + + public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo, Integer moveType, Integer busiType, + String item, String partNo, String partNameRdd, String unit, Double qty, + Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo, String assignDateCode) { + this.organizeCode = organizeCode; + this.workOrderCode = workOrderCode; + this.orderNo = orderNo; + this.moveType = moveType; + this.busiType = busiType; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.qty = qty; + this.isSn = isSn; + this.orderMasterStatus = orderMasterStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.seqNo = seqNo; + this.assignDateCode = assignDateCode; + } + + public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) { + this.orderNo = orderNo; + this.partNo = partNo; + this.custPartNo = custPartNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.qty = qty; + this.pickQty = pickQty; + this.createDatetime = createDatetime; + this.orderStatus = orderStatus; + this.createUser = createUser; + + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index f20b634..de0b0aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -16,6 +16,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -32,6 +34,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_MOVEMENT_MASTER", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "REF_NO"), @@ -46,7 +49,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "ORDER_NO") @ApiParam(value = "移库单单号") private String orderNo; - /** + /**e * 移动类型:IN=入库,OUT=出库,MOVE=移库 */ @Column(name = "MOVE_TYPE") @@ -117,6 +120,14 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("司机") public String driverNo; + @Column(name = "TMS_CAR_NO") + @ApiParam(value = "TMS车牌号") + private String tmsCarNo; + + @Column(name = "TMS_DRIVER_NO") + @ApiParam("TMS司机") + public String tmsDriverNo; + @Column(name = "CUST_ORDER_NO") @ApiParam(value = "客户单号") private String custOrderNo; @@ -125,6 +136,21 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("备注") private String remark; + @Column(name = "REASON") + @ApiParam("原因") + public String reason; + + @Column(name = "DEPARTMENT") + @ApiParam(value = "部门") + private String department; + + @Column(name = "RECEIVER") + @ApiParam("领用人") + private String receiver; + + @Column(name = "PROD_DFG_TYPE_CODE") + @ApiParam("项目号") + private String prodCfgTypeCode; @Transient private List movementDetailsList; @@ -225,16 +251,58 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "COST_CENTER") @ApiParam(value = "成本中心") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_COST_CENTER", listColumnName = "name", explicitColumnName = "dictionaryValue") private String costCenter; @Column(name = "REMAKE") @ApiParam(value = "备注1") private String remake; + + /** + * 10=未生成，20=生成成功，30=生成失败 + */ + @Column(name = "PICKING_ORDER_STATUS", columnDefinition = "int default 10") + @ApiParam(value = "领料单生成状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer pickingOrderStatus; + + /** + * 备注2 + **/ @Column(name = "SECONDARY_REMAKE") - @ApiParam(value = "备注2") + @ApiParam(value = "单据原因") private String secondaryRemake; + /**备注3**/ + @Column(name = "THIRD_REMAKE") + @ApiParam(value = "财务类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue") + private String thirdRemake; + + @Column(name = "FOURTH_REMAKE") + @ApiParam(value = "备注4") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue") + private String fourthRemake; + + + /** + * + */ + @Column(name = "SCRAP_TYPE") + @ApiParam("报废类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description") + public Integer scrapType; + + + + @Column(name = "IS_REMOVE_ORDER") + @ApiParam(value = "是否撤销单据") + private Integer isRemoveOrder = CommonEnumUtil.FALSE; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; @@ -251,11 +319,19 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("物料编号") public String partNo; - @ApiParam(value = "标题") @Transient + @ApiParam(value = "标题") public String title; @Transient + @ApiParam(value = "生产小组") + private String productionGroup; + + @Transient + @ApiParam(value = "父位置号") + private String seqNo; + + @Transient @ApiParam("物料编号组") public String[] partNos; @@ -263,6 +339,83 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("工厂集合") private List organizeCodeList; + @Transient + @ApiParam("物料名称") + public String partNameRdd; + + @Transient + @ApiParam(value = "简称") + private String partSpec; + + @Transient + @ApiParam(value = "工单码") + private String workOrderCode; + + @Transient + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Transient + @ApiParam(value = "客户简称") + private String custName; + + @Transient + @ApiParam(value = "客户全称") + private String custDesc; + + @Transient + @ApiParam(value = "客户地址") + private String custAddr; + + @Transient + @ApiParam(value = "联系人") + private String custOwner; + + @Transient + @ApiParam(value = "电话号码") + private String custTel; + + @Transient + @ApiParam(value = "过滤业务类型") + private String filterBusiType; + + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + + @Transient + @ApiParam("查询状态集合") + public List orderStatusList; + + @Transient + @ApiParam("一个应拣数里面的料子") + public Double snp; + + @Transient + @ApiParam("实拣数") + public int pickQty; + + + @Transient + @ApiParam("拣货状态") + public Integer pickOrderStatus; + + @Transient + @ApiParam("完成时间") + public String complateDatetime; + + @Transient + @ApiParam("应拣数") + public Integer inQty; + + @Transient + @ApiParam("供应商名称") + public String vendorName; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -278,4 +431,45 @@ public class WmsDocMovementMaster extends BaseBean { public WmsDocMovementMaster() { } + public WmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster,String seqNo,String assignSrcZoneNo,String partNo,String partNameRdd, + String partSpec,String workOrderCode,Double qty,String productionGroup,Integer busiType,String modifyDatetime, + String custName,String custDesc,String custAddr,String custOwner,String custTel) { + + this.id = wmsDocMovementMaster.getId(); + this.orderNo = wmsDocMovementMaster.getOrderNo(); + this.custNo = wmsDocMovementMaster.getCustNo(); + this.organizeCode = wmsDocMovementMaster.getOrganizeCode(); + this.orderStatus = wmsDocMovementMaster.getOrderStatus(); + this.vendorNo = wmsDocMovementMaster.getVendorNo(); + this.erpSrcNo = wmsDocMovementMaster.getErpSrcNo(); + this.seqNo = seqNo; + this.assignSrcZoneNo = assignSrcZoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.partSpec = partSpec; + this.workOrderCode = workOrderCode; + this.qty = qty; + this.productionGroup = productionGroup; + this.busiType = busiType; + this.modifyDatetime = modifyDatetime; +// this.color = color; + this.custName = custName; + this.custDesc = custDesc; + this.custAddr = custAddr; + this.custOwner = custOwner; + this.custTel = custTel; + } + + + public WmsDocMovementMaster(String orderNo,String createDatetime,Integer inQty,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { + this.orderNo = orderNo; + this.createDatetime = createDatetime; + this.inQty = inQty; + this.orderStatus = orderStatus; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.assignPlanDate = planDate; + this.assignPlanTime = planTime; + + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 2db18a2..9833571 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -14,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_MOVEMENT_SN", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @@ -86,8 +89,6 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "工单码") private String workOrderCode; - @Column(name = "SEQ_NO") - @ApiParam(value = "父位置号") private String seqNo; @Column(name = "SN_TYPE") @@ -95,13 +96,18 @@ public class WmsDocMovementSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") private Integer snType; + @Column(name = "DEST_LOCATE_NO") + @ApiParam(value = "目标库位代码") + public String destLocateNo; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + private String packageNo; + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; - @Transient - @ApiParam("目标库位代码") - public String destLocateNo; @Transient @ApiParam("源库位代码") @@ -156,10 +162,146 @@ public class WmsDocMovementSn extends BaseBean { @Transient private String requerimentCode; + @Transient + @ApiParam(value = "客户编号") + private String custNo; + + @Transient + @ApiParam("汇总数量") + private Double sumQty; + + @Transient + @ApiParam(value = "送货批号") + public String lotNo; + + @Transient + @ApiParam("仓库") + private String whNo; + + @Transient + @ApiParam("源仓库") + private String srcWhNo; + + @Transient + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + @Transient + @ApiParam(value = "版本") + private Integer version; + public WmsDocMovementSn(){} public WmsDocMovementSn(Long countBox,String partNo) { this.countBox = countBox; this.partNo = partNo; } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, + String whNo,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.custNo = custNo; + this.partNameRdd = partNameRdd; + this.whNo = whNo; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, + String whNo,String erpSrcNo,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.custNo = custNo; + this.partNameRdd = partNameRdd; + this.whNo = whNo; + this.erpSrcNo = erpSrcNo; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, + String whNo,String erpSrcNo,Integer version,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.custNo = custNo; + this.partNameRdd = partNameRdd; + this.whNo = whNo; + this.erpSrcNo = erpSrcNo; + this.version = version; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime, + String whNo,String erpSrcNo,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.whNo = whNo; + this.erpSrcNo = erpSrcNo; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + Integer version,String whNo,String custNo, + String erpSrcNo,String planDate,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.version = version; + this.whNo = whNo; + this.custNo = custNo; + this.erpSrcNo = erpSrcNo; + this.planDate = planDate; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + Integer version,String whNo,Integer snStatus,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.version = version; + this.whNo = whNo; + this.snStatus = snStatus; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + Integer version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.version = version; + this.whNo = whNo; + this.srcWhNo = assignSrcWhNo; + this.snStatus = snStatus; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String erpSrcNo,String vendorNo,String whNo,String assignSrcWhNo,String planDate,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.erpSrcNo = erpSrcNo; + this.vendorNo = vendorNo; + this.whNo = whNo; + this.srcWhNo = assignSrcWhNo; + this.planDate = planDate; + this.sumQty = sumQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index 32ce767..a247f85 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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 lombok.ToString; import org.hibernate.annotations.ColumnDefault; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_SO_DETAILS") @Api("销售订单明细表") @ToString @@ -72,4 +75,34 @@ public class WmsDocSoDetails extends BaseBean { @Transient @ApiParam(value = "客户编号") private String custCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料编码") + public String custPartNo; + + + @Column(name = "REMAIN_QTY", columnDefinition = "decimal(18,8)") + @ApiParam(value = "剩余数量", example = "0") + public Double remainQty; + + @Transient + @ApiParam(value = "存储区代码") + private String zoneNo; + + @Transient + @ApiParam(value = "单据编号") + private String docOrderNo; + + @Transient + @ApiParam(value = "数量") + private Double docQty; + + @Transient + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + public Integer busiType; + + @Transient + @ApiParam(value = "客户发往地代码") + private String custDeliveryCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java index 863ea9c..ba64098 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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 lombok.ToString; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_SO_MASTER") @Api("销售订单主表") @ToString @@ -64,5 +67,9 @@ public class WmsDocSoMaster extends BaseBean { @ApiParam(value = "客户发往地名称") private String flagName; + @Column(name = "PLAN_DELIVERY_DATE") + @ApiParam(value = "交期") + private String planDeliveryDate; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java index f48da84..de3eb36 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOCK") @Api("道口预约信息") public class WmsDock extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java index d8dd810..1139aeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOCK_ORDER_INFO") @Api("道口预约信息") public class WmsDockOrderInfo extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java index 4ccaabf..0757eca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOCK_WINDOW_TIME") @Api("道口窗口时间") public class WmsDockWindowTime extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java new file mode 100644 index 0000000..b7d22d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 数据字典-枚举 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-07-30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "WMS_ENUM") +@Api("数据字典-枚举") +public class WmsEnum extends BaseBean { + private static final long serialVersionUID = -6422649826279645604L; + + @Column(name = "ENUM_TYPE") + @ApiParam(value = "枚举类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumType; + + @Column(name = "ENUM_TYPE_DESC") + @ApiParam(value = "枚举类型描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumTypeDesc; + + @Column(name = "ENUM_VALUE_SEQ") + @ApiParam(value = "枚举值序号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer enumValueSeq; + + @Column(name = "ENUM_VALUE") + @ApiParam(value = "枚举值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumValue; + + @Column(name = "ENUM_VALUE_DESC") + @ApiParam(value = "枚举值描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumValueDesc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 66d6249..13630ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_FG_INSTOCK") @Api("产品入库信息") public class WmsFGInStock extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java index 4a71d08..8a577f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -22,6 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_FILE", uniqueConstraints = {@UniqueConstraint(columnNames = {"FILE_NAME", "REF_SRC", "REF_TYPE"})}) @Api("附件信息") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java index c8fa3f5..f94f8fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_FIX") @Api("WMS设备信息") public class WmsFix extends BaseBean{ @@ -33,8 +36,8 @@ public class WmsFix extends BaseBean{ @ApiParam("设备编号") public String fixId; - @Column(name = "FIX_MAC") - @ApiParam("设备mac地址") + @Column(name = "FIX_MAC") @ApiParam("设备mac地址") + public String fixMac; @Column(name = "FIX_NAME") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java index f64bf33..8564ccb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_FURNITURE") @Api("家具表") public class WmsFurniture extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java index d9dd033..920a6c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_FURNITURE_TYPE") @Api("家具类型表") public class WmsFurnitureType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java index 2ef602d..d163189 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度指标",description = "仓库健康度指标") public class WmsHealthIndicator extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java index 317c3e9..084f03c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度指标分级",description = "仓库健康度指标分级") public class WmsHealthIndicatorLevel extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java index f5d7d59..b62f75d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度指标结果",description = "仓库健康度指标结果") public class WmsHealthIndicatorResult extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java index d3572e5..5d078f4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度变量",description = "仓库健康度变量") public class WmsHealthVariable extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java index cd066ab..aba0dee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度变量测算结果",description = "仓库健康度变量测算结果") public class WmsHealthVariableResult extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index 3e63579..800d4fe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="抽点比例表",description = "抽点比例表") public class WmsIbCheckPlan extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java index afc6da3..ff022ef 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="线边库物料信息",description = "线边库物料信息") @Deprecated public class WmsLineLocatePart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 657c4cc..f66fa49 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -8,11 +8,17 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库位表 @@ -25,10 +31,12 @@ import javax.persistence.*; @Entity @Table(name = "WMS_LOCATE", indexes = { @Index(columnList = "LOCATE_NO"), - @Index(columnList = "ZONE_NO")}) + @Index(columnList = "ORGANIZE_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库位表", description = "库位表") public class WmsLocate extends BaseBean { @@ -185,6 +193,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") private Integer upY; + @Column(name = "LOCATE_ALIAS") + @ApiParam(value = "库位别名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String locateAlias; + // 导入用 @ApiParam(value = "工厂") @Transient @@ -230,6 +243,18 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "不等于库位类型") private Integer notLocateType; + @Transient + @ApiParam(value = "总库位") + private Integer totalQty; + + @Transient + @ApiParam(value = "已用库位") + private Integer usedQty; + + @Transient + @ApiParam(value = "空库位") + private Integer emptyQty; + public WmsLocate() { } @@ -246,8 +271,8 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", this.z = z; } - public WmsLocate(Integer boxQty , Double partQty,String locateNo){ - this.boxQty=boxQty; + public WmsLocate(Long boxQty , Double partQty,String locateNo){ + this.boxQty=boxQty.intValue(); this.partQty=partQty; this.locateNo=locateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 47d5248..0a500ac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -14,6 +16,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 库位物料表 @@ -28,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库位物料表", description = "库位物料表") public class WmsLocatePart extends BaseBean { @@ -87,6 +91,26 @@ public class WmsLocatePart extends BaseBean { @ApiParam("库位类型") private Integer locateType; + @Transient + @ApiParam("库位类型") + private List locateTypeList; + + @Transient + @ApiParam("物料类型") + private List partTypeList; + + @Transient + @ApiParam(value = "存储区") + private String zoneNo; + + @Transient + @ApiParam(value = "仓库") + private String whNo; + + @Transient + @ApiParam(value = "库存单位") + private String stockUnit; + public Double getMin() { return this.min == null ? 0 : this.min; } @@ -106,6 +130,27 @@ public class WmsLocatePart extends BaseBean { public double getMinValue(){ return this.min ==null?0:this.min.doubleValue(); } + public double getSafetyStockVal(){ + return this.safetyStock ==null?0:this.safetyStock.doubleValue(); + } + public WmsLocatePart() { + } + public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double min, + Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo, + String stockUnit) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.pullQty = pullQty; + this.max = max; + this.min = min; + this.isGeneratePicklist = isGeneratePicklist; + this.safetyStock = safetyStock; + this.moq = moq; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.stockUnit = stockUnit; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java index 0f53480..5a2b332 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流费用记录") public class WmsLogisticExpenseRecords extends BaseBean { private static final long serialVersionUID = 6512855224667052310L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java index 711686f..ef26044 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流费用记录明细") public class WmsLogisticExpenseRecordsDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java index acc1cb6..4459456 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,27 +31,24 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流费用管理") public class WmsLogisticsCosts extends BaseBean { - private static final long serialVersionUID = -5307311210847854654L; - @Column(name = "ORGANIZE_NAME") - @ApiParam(value = "工厂名称") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String organizeName; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class) + private Integer transportType; @Column(name = "PLACE_OF_ORIGIN") - @ApiParam(value = "发出地") + @ApiParam(value = "发出地存储区") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String placeOfOrigin; - @Column(name = "DESTINATION_WAREHOUSE") - @ApiParam(value = "目的仓库") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String destinationWarehouse; - @Column(name = "SHIPPING_FLAG") - @ApiParam(value = "发往地") + @ApiParam(value = "发往地存储区") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shippingFlag; @@ -58,16 +57,26 @@ public class WmsLogisticsCosts extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String logisticsVendorNo; + @Column(name = "part_no") + @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "part_name") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partName; + @Column(name = "SALES_UNIT") @ApiParam(value = "计价单位") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String salesUnit; - @Column(name = "TRANSPORT_TYPE") + @Column(name = "TRANSPORT_MODE") @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) - private Integer transportType; + private Integer transportMode; @Column(name = "price") @ApiParam(value = "单价") @@ -80,7 +89,7 @@ public class WmsLogisticsCosts extends BaseBean { private String startDate; @Column(name = "END_DATE") - @ApiParam(value = "结束日期") + @ApiParam(value = "失效日期") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String endDate; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java index c641bc9..f038805 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_LOGISTICS_FREIGHT_APPROVAL") @Api("物流运费审批") public class WmsLogisticsFreightApproval extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java index 6ef36b6..9d910e9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java @@ -1,3 +1,4 @@ + package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; @@ -6,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "运输方式", description = "运输方式") public class WmsModeTransport extends BaseBean { @@ -36,11 +40,6 @@ public class WmsModeTransport extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String organizeName; - @Column(name = "ORGANIZE_CODE") - @ApiParam(value = "工厂代码") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String organizeCode; - @Column(name = "TRANSPORT_TYPE") @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, dataSrc = "TRANSPORT_TYPE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 4e5da1c..4176d58 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -8,6 +8,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -32,10 +36,12 @@ import javax.persistence.Version; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_DETAILS", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "ITEM_STATUS"), + @Index(columnList = "REF_SRC"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单明细信息") @@ -110,43 +116,43 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", - searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") public String srcWhNo; @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", - searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String srcZoneNo; @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String srcLocateNo; @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", - searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") public String destWhNo; @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", - searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String destZoneNo; @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, -dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String destLocateNo; /** @@ -176,6 +182,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; + @Column(name = "REF_SN") + @ApiParam("关联条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refSn; + @Column(name = "GROUP_NO") @ApiParam("分组号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) @@ -186,11 +197,22 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomVersion; - @ApiParam(value = "待出库数量", example = "0") + + @ApiParam(value = "源库位余额") + @ColumnDefault("0") + @Column(name = "SRC_LOCATE_REST_QTY", columnDefinition = "decimal(18,8)") + private Double srcLocateRestQty = 0D; + + @ApiParam(value = "目标库位余额") + @ColumnDefault("0") + @Column(name = "DEST_LOCATE_REST_QTY", columnDefinition = "decimal(18,8)") + private Double destLocateRestQty = 0D; + + @ApiParam(value = "待出库数量") @Transient private Long waitingCounts; - @ApiParam(value = "已出库数量", example = "0") + @ApiParam(value = "已出库数量") @Transient private Long finishedCounts; @@ -236,11 +258,19 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", private String createDateTime; @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + @Transient + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Transient @ApiParam(value = "快照时间") private String snapshotTime; @@ -260,6 +290,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @ApiParam(value = "jis料架号") private String queueGroupNo; + @Transient + @ApiParam(value = "来源存储区/目标存储区") + private Integer srcOrDestZoneno; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -345,9 +379,16 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", this.modifyUser = modifyUser; } + public WmsMoveDetails(String refSrc, String prodCfgTypeCode, String createDatetime) { + this.refSrc = refSrc; + this.prodCfgTypeCode = prodCfgTypeCode; + this.createDatetime = createDatetime; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } + public Double getHandledQtyVal() { return this.handledQty == null ? 0 : this.handledQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 0c358df..6312a19 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -13,9 +13,12 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 库存移动单主表信息 @@ -29,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_MASTER", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), @@ -90,9 +94,13 @@ public class WmsMoveMaster extends BaseBean { private String partNo; @Transient - @ApiParam("状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") - private Integer itemStatus; + @ApiParam("历史数据") + private Boolean lookHistory; + + @Transient + @ApiParam("明细状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class) + private String itemStatus; @Transient @ApiParam("erp库存地") @@ -135,10 +143,14 @@ public class WmsMoveMaster extends BaseBean { private String srcZoneNo; @Transient - @ApiParam("处理数量") + @ApiParam("需求数量") private Double transQty; @Transient + @ApiParam("处理数量") + private Double handledQty; + + @Transient @ApiParam("不合格处理数量") private Double rejectQty; @@ -163,12 +175,37 @@ public class WmsMoveMaster extends BaseBean { private String snapshotTime; @Transient + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Transient private Integer isSnapshot; @Transient @ApiParam("总行数") private Long itemQty; + @Transient + @ApiParam("存储区") + private String zoneNo; + + @Transient + @ApiParam("仓库") + private String whNo; + + @Transient + @ApiParam("状态集合") + private List orderStatusList; + + @Transient + @ApiParam("交易类型集合") + private List filterTransTypeCodeList; + + @Transient + @ApiParam("交易类型集合") + private List transTypeCodeList; + + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") @@ -181,6 +218,29 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster() { } + + public WmsMoveMaster(String organizeCode, String partNo, String partNameRdd, String transTypeCode, + String transTypeName, String unit, String destZoneNo, Double transQty, Double handledQty, Double rejectQty, + Integer busiTypeCode, String createDatetime, String createUser, String modifyUser, + String modifyDatetime, String refSrc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.unit = unit; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.handledQty = handledQty; + this.rejectQty = rejectQty; + this.busiTypeCode = busiTypeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.refSrc = refSrc; + } + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark, String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId, @@ -193,7 +253,7 @@ public class WmsMoveMaster extends BaseBean { this.errorMessage = errorMessage; this.busiTypeCode = busiTypeCode; this.partNo = partNo; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.refOrderNo = refOrderNo; this.carNo = carNo; this.refSrc = refSrc; @@ -216,7 +276,7 @@ public class WmsMoveMaster extends BaseBean { this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo; @@ -233,22 +293,25 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } - public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, - String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, - String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) { + public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, + String transTypeName, Integer itemStatus,String unit, String srcWhNo, String srcZoneNo, + String destWhNo, String destZoneNo, Double transQty,Double handledQty,Double rejectQty, + String fixId, Integer busiTypeCode,String createDatetime, String createUser, String modifyUser, + String modifyDatetime, String refSrc) { this.orderNo = orderNo; this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo; this.destWhNo = destWhNo; this.destZoneNo = destZoneNo; this.transQty = transQty; + this.handledQty = handledQty; this.rejectQty = rejectQty; this.fixId = fixId; this.busiTypeCode = busiTypeCode; @@ -259,6 +322,30 @@ public class WmsMoveMaster extends BaseBean { this.refSrc = refSrc; } + public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, + String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, + String createDatetime, String createUser, String modifyUser, String modifyDatetime) { + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus.toString(); + this.unit = unit; + this.srcWhNo = srcWhNo; + this.srcZoneNo = srcZoneNo; + this.destWhNo = destWhNo; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.rejectQty = rejectQty; + this.fixId = fixId; + this.busiTypeCode = busiTypeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ this.itemQty = itemQty; this.transTypeCode = transTypeCode; @@ -294,4 +381,9 @@ public class WmsMoveMaster extends BaseBean { public int getBusiTypeCodeVal() { return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue(); } + + public WmsMoveMaster(String createDatetime, String createUser) { + this.createDatetime = createDatetime; + this.createUser = createUser; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 40da59c..b194f43 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -30,11 +32,14 @@ import javax.persistence.Version; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_SN", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "ITEM_STATUS"), @Index(columnList = "SN"), + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "PACKAGE_NO"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单条码信息") @@ -86,6 +91,11 @@ public class WmsMoveSn extends BaseBean { @ApiParam("批次编号") public String lotNo; + @Column(name = "LEFT_CODE") + @ApiParam(value = "生产批次") + private String leftCode = ""; + + @Column(name = "PACKAGE_NO") @ApiParam("容器编号") public String packAgeNo; @@ -178,6 +188,10 @@ public class WmsMoveSn extends BaseBean { public String serialSn; @Transient + @ApiParam("客户编号") + public String custNo; + + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @@ -195,11 +209,16 @@ public class WmsMoveSn extends BaseBean { private String ZoneNo; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + + @Transient @ApiParam("交易类型名称") private String transTypeName; @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; @@ -262,6 +281,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("委外收货时间") public String rcDatetime; + @Transient + @ApiParam("条码数量") + public Integer snCount; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -344,6 +367,42 @@ public class WmsMoveSn extends BaseBean { this.modifyUser = modifyUser; } + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, + String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, + Integer destSnStatus, String lotNo, String dateCode, String leftCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn, + String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcQty = srcQty; + this.srcQty = srcQty; + this.destQty = destQty; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo = destWhNo; + this.busiTypeCode = busiTypeCode; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) { this.id = id; this.organizeCode = organizeCode; @@ -374,4 +433,39 @@ public class WmsMoveSn extends BaseBean { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; } + + public WmsMoveSn(String partNo, String partNameRdd,String sn,String vendorNo,String custNo,String srcLocateNo,String destLocateNo,String srcZoneNo, + Double srcQty,Double destQty,String orderNo,String srcWhNo, Integer srcQcStatus ,Integer descQcStatus, + Integer srcSnStatus,Integer destSnStatus ) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.vendorNo = vendorNo; + this.custNo = custNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcQty = srcQty; + this.destQty = destQty; + this.orderNo = orderNo; + this.srcWhNo = srcWhNo; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus;; + } + + + public WmsMoveSn(String sn, String refSrc,String transTypeCode, String transTypeName, Integer itemStatus) { + this.sn = sn; + this.refSrc = refSrc; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + } + + public WmsMoveSn(Integer snCount, String createDatetime) { + this.snCount = snCount; + this.createDatetime = createDatetime; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 5b06475..9f83850 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -1,10 +1,14 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -28,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_TO_ERP", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), @@ -47,6 +52,7 @@ public class WmsMoveToERP extends BaseBean { * 状态:1=创建,10=待处理,20=已处理 */ @Column(name = "ORDER_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") @ApiParam(value = "状态", example = "0") public Integer orderStatus; @@ -74,6 +80,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("司机") public String driverNo; + @Column(name = "TMS_CAR_NO") + @ApiParam(value = "TMS车牌号") + private String tmsCarNo; + + @Column(name = "TMS_DRIVER_NO") + @ApiParam("TMS司机") + public String tmsDriverNo; + @Column(name="ITEM") @ApiParam(value = "行号") public String item; @@ -229,6 +243,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "jis料架号") private String queueGroupNo; + @Column(name = "CUST_ORDER_NO") + @ApiParam(value = "客户单号") + private String custOrderNo; + + @Column(name = "IS_SYNC2") + @ApiParam("同步标识2") + public Integer isSync2 = CommonEnumUtil.FALSE; + @Transient private Long shippingId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index aa73f97..771f78b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_OP_TYPE") @Api("作业类型") public class WmsOpType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 382f210..1fcf83b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -42,4 +42,7 @@ public class WmsOperationBean extends BaseBean { @ApiParam("选中的明细数据") public List details; + + @ApiParam("是否确认重置") + public int isConfirmReset; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java index 2260cd7..8463307 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.NoArgsConstructor; import java.io.Serializable; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 902425b..323b3f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_PO_MASTER", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "ORGANIZE_CODE") @@ -112,6 +115,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "发货日期") private String sendDate; + @Transient + @ApiParam(value = "实际到货时间") + private String arrDate; + @Column(name = "IS_SN") @ApiParam(value = "是否生成条码", example = "1") public Integer isSn; @@ -161,6 +168,30 @@ public class WmsPOMaster extends BaseBean { private String planDateEnd; @Transient + @ApiParam("计划日期") + private String planDate; + + @Transient + @ApiParam("计划时间") + private String planTime; + + @Transient + @ApiParam("看板状态") + private Integer boardStatus; + + @Transient + @ApiParam("物料编码") + private String partNo; + + @Transient + @ApiParam("需求数量") + private Double qty; + + @Transient + @ApiParam("实收数量") + private Double rcqty; + + @Transient private List orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @@ -179,6 +210,63 @@ public class WmsPOMaster extends BaseBean { @Column(name = "ERP_SRC_NO") private String erpSrcNo; + @Column(name = "DEPART_NAME") + @ApiParam(value = "部门名称", example = "1") + public Integer departName; + + @Column(name = "REASON") + @ApiParam(value = "原因", example = "1") + public String reason; + + @Column(name = "RECEIVE_DATE") + @ApiParam(value = "收货日期") + public String receiveDate; + + @Column(name = "RECEIVE_TIME") + @ApiParam(value = "收货时间") + public String receiveTime; + + @Column(name = "WINDOW_START_TIME") + @ApiParam(value = "窗口开始时间") + public String windowStartTime; + + @Column(name = "WINDOW_END_TIME") + @ApiParam(value = "窗口结束时间") + public String windowEndTime; + + + @Transient + @ApiParam("周总数") + private Integer weekRcCount; + + @Transient + @ApiParam("容差") + private Integer delayHour; + + @Transient + @ApiParam("当前状态") + private String nowStatus; + + @ApiParam(value = "延迟次数") + private Long delayCount; + + @ApiParam(value = "延迟次数") + private Long sumDelayCount; + + @ApiParam(value = "延迟到货百分比") + private String delayPercent; + + @ApiParam("计划交货时间") + private String planPlanDateTime; + + @Transient + @ApiParam(value = "收货日期时间") + public String receiveDateTime; + + + + + public WmsPOMaster() { } @@ -193,6 +281,45 @@ public class WmsPOMaster extends BaseBean { this.createDatetime = createDateTime; this.createDateTimeStart = receiveDateTime; } + public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, + String dockCode, String planDate, String planTime) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.vendorNo = vendorNo; + this.dock = dockCode; + this.planDate = planDate; + this.planTime = planTime; + } + + public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName, + String dockCode, String planDate, String planTime, Integer delayHour) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.dock = dockCode; + this.planDate = planDate; + this.planTime = planTime; + this.delayHour = delayHour; + } + + public WmsPOMaster(String vendorNo, Long delayCount) { + this.vendorNo = vendorNo; + this.delayCount = delayCount; + } + + public WmsPOMaster(String orderNo, String reason, String planDate, String planTime, + String receiveTime,String receiveDate, String vendorNo, String vendorName, String organizeCode) { + this.orderNo = orderNo; + this.reason = reason; + this.planDate = planDate; + this.planTime = planTime; + this.receiveTime = receiveTime; + this.receiveDate= receiveDate; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.organizeCode = organizeCode; + } public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 2f5c2fb..1ccf8d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -6,12 +6,20 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; +import java.util.List; /** * @Description : PO订单明细信息 @@ -25,6 +33,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_PO_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @@ -52,7 +61,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("行号") private Integer item; - @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") private Double qty; @@ -69,14 +78,14 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("订单号") private String orderNo; - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") private Double printQty; //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; } - @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") private Double rcQty = 0d; @@ -105,6 +114,18 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("计划交货时间") private String planTime; + @Transient + @ApiParam("当前状态") + private String nowStatus; + + @Transient + @ApiParam(value = "实际到货日期") + private String arrDate; + + @Transient + @ApiParam(value = "实际到货时间") + private String arrTime; + @Column(name = "ERP_AREA_NO") @ApiParam("默认收货库存地") private String erpAreaNo; @@ -128,6 +149,22 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "是否免费", example = "1") private Integer isFree; + @Column(name = "DELAY_HOUR", columnDefinition = "int default 0") + @ApiParam(value = "容差") + private Integer delayHour; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + + @Column(name = "REMARK1") + @ApiParam("备注1") + private String remark1; + + @Column(name = "REMARK2") + @ApiParam("备注2") + private String remark2; + @Transient @ApiParam(value = "散件收货输入数量", example = "0") private Double inputRcQty; @@ -137,17 +174,31 @@ public class WmsPOMasterDetails extends BaseBean { private String dateCode; @Transient + @ApiParam(value = "颜色控制") + private String color; + + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; @Transient + @ApiParam("道口，临时使用") + private String dock; + + @Transient + @ApiParam("收货状态，临时使用") + private String receiveStatus; + + + + @Transient @ApiParam("供应商批次字段是否可编辑") private Boolean isDateCodeEdit = true; //private Double getInputRcQty(){ return this.inputRcQty == null ? new Double(0) : this.inputRcQty; } @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") private transient Integer lockVersion; @@ -185,9 +236,30 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("结束时间") private String planEndDate; - @Column(name = "REMARK") - @ApiParam("备注") - private String remark; + @Transient + @ApiParam("erp单号") + private String erpSrcNo; + + @Transient + @ApiParam("汇总数量") + private Double sumQty; + + @Transient + @ApiParam("汇总收货数量") + private Double sumRcQty; + + @Transient + @ApiParam("单据集合") + private List orderNoLst; + + + /** + * 状态:1=新建,10=收货中,20=收货完成, + * 30=入库中,40=入库完成,90=已关闭,91=已取消 + */ + @Transient + @ApiParam(value = "状态", example = "1") + public Integer poStatus; public Double getSnpVal() { return snp; @@ -206,10 +278,11 @@ public class WmsPOMasterDetails extends BaseBean { this.rcQty = rcQty; } - public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode){ + public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode, String createDatetime){ this.orderNo = orderNo; this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; + this.createDatetime = createDatetime; } public WmsPOMasterDetails( @@ -245,4 +318,50 @@ public class WmsPOMasterDetails extends BaseBean { this.modifyDatetime = modifyDatetime; this.remark = remark; } + + public WmsPOMasterDetails(String partNo,String partNameRdd,String planDate, + Double snp,Long totalBoxes,Double qty){ + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.planDate = planDate;//批次号（yyyyMMdd） + this.snp=snp; + this.totalBoxes = totalBoxes.intValue(); + this.qty = qty; + } + + public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime, + Double snp, Long totalBoxes, Double qty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.planDate = planDate;//批次号（yyyyMMdd） + this.planTime = planTime;//批次号（yyyyMMdd） + this.snp = snp; + this.totalBoxes = totalBoxes.intValue(); + this.qty = qty; + } + + public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, + Double rcQty, Integer itemStatus) { + this.orderNo = orderNo; + this.erpSrcNo = erpSrcNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.rcQty = rcQty; + this.itemStatus = itemStatus; + } + + public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double sumQty,Double sumRcQty) { + this.orderNo = orderNo; + this.planDate=planDate; + this.planTime=planTime; + this.vendorNo=vendorNo; + this.dock=dock; + this.poStatus=poStatus; + this.sumQty = sumQty; + this.sumRcQty = sumRcQty; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java index 98f1b1b..625753b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="包装箱条码表",description = "包装箱条码表") public class WmsPackSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java index 8b08f24..16d17ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PACKAGE") @Api("物理包装信息") public class WmsPackage extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 1d9ed2e..6494e00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PACKAGE_SPEC") @Api("包装规格") public class WmsPackageSpec extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index d0c88bb..cbcbc49 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -16,6 +16,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -31,7 +33,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART", indexes = { + @Index(columnList = "PART_NO"), @Index(columnList = "ORGANIZE_CODE") }) @Api("物料表") @@ -105,7 +109,7 @@ public class WmsPart extends BaseBean { @Column(name = "ABC") @ApiParam(value = "分类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PART_ABC") private String abc; @Column(name = "BUY_UNIT") @@ -143,7 +147,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_GROUP") @ApiParam(value = "物料组") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, - isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + isMultiple = 1, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String partGroup; @Column(name = "LOT_CHECK_RULE") @@ -215,11 +219,16 @@ public class WmsPart extends BaseBean { isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") private String productLines; - @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") + @Column(name = "PROPORTION", columnDefinition = "decimal(10,8)") @ApiParam(value = "待质检比例", example = "1") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; + @Column(name = "STD_CHECK_TIME", columnDefinition = "decimal(10,2)") + @ApiParam(value = "标准质检时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double stdCheckTime; + @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE") @@ -290,6 +299,16 @@ public class WmsPart extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true) private Integer frequency; + @Column(name = "LIMIT_QUALITY_DAYS") + @ApiParam(value = "卡控周期", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer limitQualityDays; + + @Column(name = "WEIGHT") + @ApiParam(value = "重量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double weight ; + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); @@ -306,6 +325,7 @@ public class WmsPart extends BaseBean { return partVol == null ? 0 : partVol; } + public Double getWeightVal() { return this.weight == null ? 0d : this.weight.doubleValue(); } public Double getQty() { return qty == null ? 0 : qty; @@ -342,4 +362,24 @@ public class WmsPart extends BaseBean { this.qty = cqty; this.createDatetime = createDateTime; } + + public WmsPart(String partNo, String partName, String inLocateNo, String stockUnit, Double snp, String partSpec) { + this.partNo = partNo; + this.partName = partName; + this.inLocateNo = inLocateNo; + this.stockUnit = stockUnit; + this.snp = snp; + this.partSpec = partSpec; + } + + public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, String stockUnit, Integer snControl, Double qty) { + this.partNo = partNo; + this.partName = partName; + this.partSpec = partSpec; + this.snp = snp; + this.buyUnit = buyUnit; + this.stockUnit = stockUnit; + this.snControl = snControl; + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java new file mode 100644 index 0000000..9490b59 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.wms.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; + +/** + * @Description : 零件转换信息 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-08-19 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_PART_CHANGE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api(value = "零件装换信息", description = "零件装换信息") +public class WmsPartChange extends BaseBean { + private static final long serialVersionUID = -2857107665974689720L; + + @Column(name = "BEF_PART_NO") + @ApiParam(value = "转换前物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") + private String befPartNo; + + @Column(name = "AFT_PART_NO") + @ApiParam(value = "转换后物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") + private String aftPartNo; + + + @Column(name = "REMARK") + @ApiParam(value = "备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String remark; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 57acbe8..00b2a5d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART_CHECK_TYPE") @Api("物料检测大类") public class WmsPartCheckType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index aa6cdcf..cc1a5c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART_EXTEND", indexes = { @Index(columnList = "ORGANIZE_CODE") }) @@ -93,6 +96,9 @@ public class WmsPartExtend extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotControl; + /** + * 单位：天 + */ @Column(name = "RANGE_LOT") @ApiParam(value = "批次容差") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @@ -157,4 +163,31 @@ public class WmsPartExtend extends BaseBean { @ApiParam(value = "自动采购数量") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer autoPurchaseQty; + + @Column(name = "QC_SKIP_CYCLE") + @ApiParam(value = "质检跳批周期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer qcSkipCycle; + + @Column(name = "QC_PASS_COUNT") + @ApiParam(value = "质检合格次数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer qcPassCount; + + @Column(name = "LAST_QC_TIME") + @ApiParam(value = "首次质检时间合格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lastQcTime; + + @Column(name = "CYCLE_IQC") + @ApiParam(value = "周期内免检", example = "1") + private Integer cycleIqc; + + public Integer getQcPassCount() { + return this.qcPassCount == null ? 0 :this.qcPassCount.intValue(); + } + + public Integer getQcSkipCycle() { + return this.qcSkipCycle == null ? 0 :this.qcSkipCycle.intValue(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java index 5265509..9b96499 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PART_GROUP") @Api("物料组信息") public class WmsPartGroup extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java index d2e7f87..e750735 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PART_GROUP_DETAILS") @Api("物料组明细信息") public class WmsPartGroupDetails extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java index 80cc3af..3c846ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PART_GROUP_ROUTE") @Api("物料组物流路线信息") public class WmsPartGroupRoute extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index b6099d9..c96e9a2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -1,11 +1,15 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART_ITEM_CHECK") @Api("物料子检测项") public class WmsPartItemCheck extends BaseBean { @@ -59,11 +64,13 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "VALUE_TYPE") @ApiParam("子检测箱值类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class) private Integer valueType; @Column(name = "STANDARD") @ApiParam("标准值") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_PART_CHECK_STD.class) private Integer standard; @Column(name = "MAX") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java index 2896d6e..da81e19 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART_PACKAGE") @Api("物料包装关系") public class WmsPartPackage extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java index 1a083df..50f38ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="物料关系表",description = "物料关系表") public class WmsPartRelation extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java index 6d68047..30173d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="物料线路关系表",description = "物料线路关系表") public class WmsPartRouting extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java index 236cf72..9ac4b1c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java @@ -5,6 +5,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PICK_COUNT") @Api("供应商物料每月数量") public class WmsPickCount extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java new file mode 100644 index 0000000..0880a11 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 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; + +/** + * @Description : 领料时长分区 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-10-21 19:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "WMS_PICKING_WINDOW_TIME") +@Api("领料时长分区") +public class WmsPickingWindowTime extends BaseBean { + + private static final long serialVersionUID = 9214639813072592714L; + + @Column(name = "SHIFT_NO") + @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shiftNo; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String endTime; + + @Column(name = "LATEST_END_TIME") + @ApiParam("最晚领料时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String latestEndTime; + + @Transient + @ApiParam("班次开始时间") + private String shiftStartTime; + + @Transient + @ApiParam("班次结束时间") + private String shiftEndTime; + + @Transient + @ApiParam("今日结束时间") + private String todayEndTime; + + @Transient + @ApiParam("次日开始时间") + private String nextDayStartTime; + + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + + + + + public WmsPickingWindowTime() { + } + + public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime, String createDatetime, String modifyDatetime, Integer isDeleted, Integer isValid) { + this.id = id; + this.shiftNo = shiftNo; + this.startTime = startTime; + this.endTime = endTime; + this.latestEndTime = latestEndTime; + this.shiftStartTime = shiftStartTime; + this.shiftEndTime = shiftEndTime; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.isDeleted = isDeleted; + this.isValid = isValid; + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java new file mode 100644 index 0000000..d089328 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-10-28 9:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "WMS_PLC") +@Api("WMSPLC配置表") +public class WmsPlc extends BaseBean { + + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.PLC_BUSI_TYPE.class) + private Integer busiType; + + @Column(name = "OPC_URL") + @ApiParam("OPC路径") + private String opcUrl; + + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + + @Column(name = "TAG_NAME") + @ApiParam("标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam("标签地址") + private String tagAddress; + + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + + /*@Column(name = "DATA_TYPE") + @ApiParam("标签类别") + private Integer dataType;*/ + + @Column(name = "USER_NAME") + @ApiParam("用户名") + private String userName; + + @Column(name = "PASSWORD") + @ApiParam("密码") + private String password; + + @Column(name = "START_VALUE") + @ApiParam("开始节点") + private Integer startValue; + + @Column(name = "end_VALUE") + @ApiParam("结束节点") + private Integer endValue; + + @Column(name = "NAME_SPACE_INDEX") + @ApiParam("空间索引") + private Integer nameSpaceIndex = 2; + + @Column(name = "REQUEST_INTERVAL") + @ApiParam("请求间隔") + private Double requestInterval = 500.0; + + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 63e1e37..102931b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -1,9 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +28,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_PO_SN", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @@ -103,6 +108,11 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; +// @Column(name = "DATE_CODE", nullable = false) +// @ApiParam(value = "供应商生产批次") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) +// public String dateCode = ""; + @ApiParam(value = "供应商名称") @Transient public String vendorNameRdd; @@ -119,8 +129,9 @@ public class WmsPoSn extends BaseBean { @Transient public String lotNo; - @Transient - @ApiParam(value = "生产日期") + @Column(name = "DATE_CODE", nullable = false) + @ApiParam(value = "供应商生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String dateCode; @Transient @@ -155,6 +166,29 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "生产批次") private String leftCode = ""; + @Transient + @ApiParam("erp单号") + private String erpSrcNo; + + @Transient + @ApiParam("仓库") + private String whNo; + + @Transient + @ApiParam("汇总数量") + private Double sumQty; + + @Transient + @ApiParam("物料库位") + private String partLocateNo; + + @Transient + @ApiParam("备注1") + private String remark1; + + @Transient + @ApiParam("备注2") + private String remark2; public WmsPoSn(){} @@ -163,4 +197,17 @@ public class WmsPoSn extends BaseBean { this.earliestReceTime = earliestReceTime; this.latestReceTime = latestReceTime; } + + public WmsPoSn(String orderNo,String erpSrcNo,String item,String partNo,String lotNo,String dateCode,String whNo, + String createDatetime,Double sumQty){ + this.orderNo = orderNo; + this.erpSrcNo = erpSrcNo; + this.item = item; + this.partNo = partNo; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.whNo = whNo; + this.createDatetime = createDatetime; + this.sumQty = sumQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java index 7c8bf61..4677311 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PRINTER_CONFIGURE") @Api("打印机配置表") public class WmsPrinterConfigure extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index 9aac6f4..1e586b1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -10,6 +10,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PRINTING_QUEUE") @Api("待打印队列表") public class WmsPrintingQueue extends BaseBean{ @@ -52,4 +55,19 @@ public class WmsPrintingQueue extends BaseBean{ @Column(name="PRINT_STATUS") @ApiParam("打印状态") private Integer printStatus; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编码") + private String vendorNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + public WmsPrintingQueue() { + } + + public WmsPrintingQueue(String printIdentification) { + this.printIdentification = printIdentification; + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java index e7c329b..f01a5ad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PROCUREMENT_PLAN_CONTRACT") @Api("开口合同PO关系表") public class WmsProcurementPlanContract extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java index a90107b..95ced68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PROD_CFG_TYPE") @Api("项目信息") public class WmsProdCfgType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java index e415a70..772a940 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import java.io.Serializable; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java index 3baae85..e994f4c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PRODUCT_VERSION") @Api("生产版本") public class WmsProductVersion extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java index fefe223..849530d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流供应商关系", description = "库存物流供应商关系条码信息") public class WmsProviderFlag extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java index ed602bf..26ebc61 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -13,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description 拉动规则实体 @@ -25,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PULL_RULE") @Api("拉动规则") public class WmsPullRule extends BaseBean { @@ -48,4 +52,8 @@ public class WmsPullRule extends BaseBean { @ApiParam(value = "尾数计算方式", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") private Integer tailQtyMode; + + @Transient + @ApiParam(value = "通过存储区物料获取物流路线") + private boolean routingbyZonePartDisAble; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index eccb351..3bea985 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,15 +27,16 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PULL_TASK_DETAILS") @Api("WMS_拉动计划任务明细表") public class WmsPullTaskDetails extends BaseBean{ private static final long serialVersionUID = 9214639813072592736L; - @Column(name="WROKORDER_NO") + @Column(name="WORK_ORDER_NO") @ApiParam("工单号") - private String woekorderNo; + private String workOrderNo; @Column(name="ITEM") @ApiParam(value = "行号", example = "0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java index 00fa875..069e2b1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,16 +28,17 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PULL_TASK_MASTER") @Api("WMS_拉动计划任务主表") public class WmsPullTaskMaster extends BaseBean{ private static final long serialVersionUID = 9214639813072592736L; - @Column(name="WROKORDER_NO") + @Column(name="WORK_ORDER_NO") @ApiParam("工单号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String woekorderNo; + private String workOrderNo; @Column(name="PDLINE_NO") @ApiParam("产线代码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java index 8691970..62fa603 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java @@ -7,6 +7,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PURCHASE_PLAN_HISTORY") @Api("采购计划历史") public class WmsPurchasePlanHistory extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index f527605..1c6cb1d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -4,14 +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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : 推送信息配置 @@ -25,6 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PUSH_CONFIG") @Api("推送配置") public class WmsPushConfig extends BaseBean{ @@ -60,10 +60,18 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SQL_STR", columnDefinition = "TEXT") private String sqlStr; - @ApiParam("脚本编号") + @ApiParam("数据获取脚本编号") @Column(name = "SCRIPT_NO") private String scriptNo; + @ApiParam("脚本入参") + @Column(name = "SCRIPT_PARAM") + private String scriptParam; + + @ApiParam("附件脚本编号") + @Column(name = "ATTACH_SCRIPT_NO") + private String attachScriptNo; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT") @@ -94,4 +102,8 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "CONTENT_LABEL") private String contentLabel; + // 临时存储 + @ApiParam("附件的文件路径") + @Transient + private String attachFilePath; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java index e22e520..3265282 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PUSH_LOG") @Api("推送日志") public class WmsPushLog extends BaseBean{ @@ -48,5 +51,7 @@ public class WmsPushLog extends BaseBean{ @ApiParam("推送地址") private String pathUrl; - + @ApiParam("附件地址") + @Column(name = "ATTACH_FILE_PATH") + private String attachFilePath; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 8d77ca7..ea6576a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -1,9 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -12,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import javax.persistence.Version; /** @@ -26,6 +31,7 @@ import javax.persistence.Version; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_QC_DETAILS") @Api("质检单明细信息") public class WmsQCDetails extends BaseBean { @@ -60,6 +66,7 @@ public class WmsQCDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_ITEM_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; @Column(name = "REMARK") @@ -83,7 +90,70 @@ public class WmsQCDetails extends BaseBean { public Double rejectQty; @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; + + @Transient + @ApiParam(value = "单据状态") + public Integer orderStatus; + + @Transient + @ApiParam(value = "供应商编号") + public String vendorNo; + + @Transient + @ApiParam(value = "供应商名称") + public String vendorDesc; + + public WmsQCDetails() { + } + + public WmsQCDetails(String organizeCode, String partNo, String partNameRdd, String item, + Double qty, String unit, String orderNo, + Integer itemStatus, String remark, Double factQty, + Double passQty, Double rejectQty, + Integer orderStatus, String vendorNo, String vendorDesc, + String createUser, String createDatetime,String modifyUser,String modifyDatetime) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.item = item; + this.qty = qty; + this.unit = unit; + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.remark = remark; + this.factQty = factQty; + this.passQty = passQty; + this.rejectQty = rejectQty; + this.orderStatus = orderStatus; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } + + public WmsQCDetails(String partNo, String partNameRdd, String item, + Double qty, String unit, String orderNo, + Integer itemStatus, String remark, Double factQty, + Double passQty, Double rejectQty, + Integer orderStatus, String vendorNo,String vendorDesc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.item = item; + this.qty = qty; + this.unit = unit; + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.remark = remark; + this.factQty = factQty; + this.passQty = passQty; + this.rejectQty = rejectQty; + this.orderStatus = orderStatus; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + } } 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 bfe28bc..9003e5f 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 @@ -14,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_QC_MASTER") @Api("质检单主表信息") public class WmsQCMaster extends BaseBean { @@ -53,11 +56,20 @@ public class WmsQCMaster extends BaseBean { * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消 */ @Column(name = "ORDER_STATUS") - @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS") + @ApiParam(value = "单据状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_STATUS") public Integer orderStatus; + /** + * 状态:10=质检中,20=合格,30=不合格 + */ + @Column(name = "QC_STATUS") + @ApiParam(value = "质检状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PO_QC_STATUS") + public Integer qcStatus; + @Column(name = "REMARK") @ApiParam("备注") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) @@ -103,8 +115,8 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "供应商全称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", - searchColumnName = "vendorNo,VendorDesc", listColumnName = "vendorNo,VendorDesc", explicitColumnName = "vendorNo") - private String VendorDesc; + searchColumnName = "vendorNo,vendorDesc", listColumnName = "vendorNo,vendorDesc", explicitColumnName = "vendorNo") + private String vendorDesc; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") @@ -122,6 +134,14 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "零件号") public String partNo; + @Transient + @ApiParam(value = "零件名称") + public String partNameRdd; + + @Transient + @ApiParam(value = "收货数量") + public Double qty; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -137,4 +157,27 @@ public class WmsQCMaster extends BaseBean { this.refSrc = refSrc; this.partNo = partNo; } + + public WmsQCMaster(String orderNo, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + this.orderNo = orderNo; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + this.refType = refType; + this.refSrc = refSrc; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.createDatetime = createDatetime; + } + + public WmsQCMaster(String orderNo, Double qty, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + this.orderNo = orderNo; + this.qty = qty; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + this.refType = refType; + this.refSrc = refSrc; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.createDatetime = createDatetime; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java new file mode 100644 index 0000000..eac7880 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java @@ -0,0 +1,130 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +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; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : 质检单条码质检不良清单表 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-01 14:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_QC_SN_ERROR_LIST", + indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN") +}) +@Api("质检单条码质检不良清单表") +public class WmsQCSNErrorList extends BaseBean { + private static final long serialVersionUID = 4905945381732744790L; + + @Column(name="ORDER_NO") + @ApiParam("单号") + private String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + private String item; + + /** + * 状态:10=创建,20=已处理 + */ + @Column(name="ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + private Integer itemStatus; + + @Column(name="REMARK") + @ApiParam("备注") + private String remark; + + @Column(name="SAMPLE_QTY", nullable = false) + @ApiParam("检验数量") + @ColumnDefault("0") + private double sampleQty; + + @Column(name="REJECT_QTY", nullable = false) + @ApiParam("不合格数量") + @ColumnDefault("0") + private double rejectQty; + + @Column(name="UNIT") + @ApiParam("单位") + private String unit; + + @Column(name="PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="SN") + @ApiParam("条码") + private String sn; + + @Column(name = "QC_USER") + @ApiParam("检验员") + private String qcUser; + + @Column(name = "QC_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") + private String qcTime; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "ERROR_CODE") + @ApiParam("不良代码") + private String errorCode; + + @Column(name = "ERROR_DESC_RDD") + @ApiParam("不良描述") + private String errorDescRdd; + + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") + @ApiParam(value = "收货数量", example = "0") + public Double rcQty; + + @Column(name = "QC_SCALE", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") + @ApiParam(value = "质检比例", example = "0") + public String qcScale; + + @Column(name = "REF_SRC") + @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refSrc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index d02e9b0..339464e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_QC_TRANS") @Api("质检单操作明细信息") public class WmsQCTrans extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java new file mode 100644 index 0000000..fc9f032 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : MGN质检报表(通过查询视图实现) + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-09-01 14:37 + * @Modify: + **/ +@Data +@Api("质检报表") +public class WmsQCViewReport extends BaseBean { + private static final long serialVersionUID = 4905945381732744790L; + + @ApiParam("单号") + private String orderNo; + + @ApiParam("检验数量") + private double sampleQty; + + @ApiParam("不合格数量") + private double rejectQty; + + @ApiParam("检验员") + private String qcUser; + + @ApiParam(value = "检验时间") + private String qcTime; + + @ApiParam(value = "收货数量") + public Double rcQty; + + @ApiParam(value = "质检比例") + public String qcScale; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java index 8efb843..2e813f4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_RFID_OPERATE_RECORD") @Api("RFID条码操作记录表") public class WmsRfidOperateRecord extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java index 67c0edd..c33521f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="物流线路信息表",description = "物流线路信息表") public class WmsRouting extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java index c4f0157..71633b0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ROUTING_ASSIGN") @Api("物流路线分配表") public class WmsRoutingAssign extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java index 4fe577d..eda93fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ROUTING_DETAIL") @Api("物流路线明细表") public class WmsRoutingDetail extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java index db8be1d..31f515c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ROUTING_MASTER") @Api("物流路线主表") public class WmsRoutingMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 4bf40f2..a03e599 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="物流线路规则表",description = "物流线路规则表") public class WmsRoutingRule extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 71b81f7..e36d958 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "SAP_ORDER_LOCK") @Api("SAP_单据锁定") public class WmsSapOrderLock extends BaseBean { @@ -33,9 +36,9 @@ public class WmsSapOrderLock extends BaseBean { @ApiParam("订单号") public String orderNo; - @Column(name = "BUSI_TYPE") + @Column(name = "ORDER_TYPE") @ApiParam("业务类型") - public String busiType; + public String orderType; @Column(name = "ITEM") @ApiParam("行号") @@ -49,4 +52,18 @@ public class WmsSapOrderLock extends BaseBean { @ApiParam("同步标识") public Integer isSync = 2; + @Column(name = "BUSI_TYPE_CODE") + @ApiParam(value = "类型编号") + private Integer busiTypeCode; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @Column(name = "ERP_ORDER_NO") + @ApiParam("源单号") + public String erpOrderNo; + + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java index 8723563..03629f3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -9,6 +9,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -32,11 +34,13 @@ import javax.persistence.Table; @Index(columnList = "BATCH_NO"), @Index(columnList = "STOCK_SN"), @Index(columnList = "PART_NO"), - @Index(columnList = "SERIAL_SN") + @Index(columnList = "SERIAL_SN"), + @Index(columnList = "ORGANIZE_CODE") }) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "产品条码信息", description = "产品条码信息") public class WmsSerialSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index e92e884..ae4fa00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,13 +32,14 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_SERIAL_SN_TRANS") @Api("产品条码事务表") public class WmsSerialSnTrans extends BaseBean { @Column(name = "BATCH_NO") @ApiParam(value = "BATCH号") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String batchNo; @Column(name="SERIAL_SN") @@ -47,7 +50,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="BH_TYPE") @ApiParam("BH类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) private Integer bhType; @Column(name = "PART_NO") @@ -77,19 +80,34 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="TRANS_TYPE") @ApiParam("操作类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class) private Integer transType; @Column(name = "IS_OK") @ApiParam(value = "是否合格") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE", isRequire = 2) private Integer isOk; + @Column(name = "LOT_NO") + @ApiParam("生产批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lotNo; + + @Column(name = "STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_DETAILS_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_DETAILS_STATUS.class) + @ApiParam("状态") + private Integer status; + @Transient @ApiParam("操作类型") private List transTypeLst; + public int getIsOkVal() { + return this.isOk == null ? 0 : this.isOk; + } + public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) { this.organizeCode = wmsSerialSn.getOrganizeCode(); this.batchNo = wmsSerialSn.getBatchNo(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java new file mode 100644 index 0000000..abc3bbb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 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; + +/** + * @Description : 用户需要查询的服务调用详细日志 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-19 15:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "WMS_SERVICE_LOG") +@Api("服务调用详细日志") +public class WmsServiceLog extends BaseBean { + + private static final long serialVersionUID = 1285495680337747968L; + + @Column(name = "CALL_TIME") + @ApiParam("调用时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String callTIme; + + @Column(name = "SERVICE_CODE") + @ApiParam("服务代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String serviceCode; + + @Column(name = "SERVICE_NAME") + @ApiParam("服务名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String serviceName; + + @Column(name = "JOB_CODE") + @ApiParam(value = "JOB代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String jobCode; + + @Column(name = "JOB_NAME") + @ApiParam(value = "JOB名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String jobName; + + @Lob + @Column(name = "OUTPUT_MESSAGE") + @ApiParam(value = "输出信息") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String outPutMessage; + + @Column(name = "LEVEL") + @ApiParam(value = "日志级别") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String level; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java index 40f637d..4c499e7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -13,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 班次表 @@ -26,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_SHIFT") @Api("班次信息") public class WmsShift extends BaseBean{ @@ -51,4 +55,9 @@ public class WmsShift extends BaseBean{ @ApiParam("结束时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endTime; + + @Transient + @ApiParam("结束时间&结束时间") + private boolean startTimeAndEndTime; + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java index 103808a..e91836e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_SHIFT_REST") @Api("班休信息") public class WmsShiftRest extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 46b0051..774ae39 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_SHIPPING") @Api("产品发运信息") public class WmsShipping extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java index ff6c631..a7738bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户发往地信息表",description = "客户发往地信息表") public class WmsShippingFlag extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java index 928d2d4..9b104d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流费用管理") public class WmsShortLogisticsCosts extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 0ef223b..7b2cb55 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="条码操作记录表",description = "条码操作记录表") public class WmsSnOperateRecord extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java index 0b7ae2f..32c2cce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_SN_PRINT") @Api("打印队列信息") public class WmsSnPrint extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java index d48a771..97fab1a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "条码补打印记录表", description = "条码补打印记录表") public class WmsSnPrintRcd extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index 9ee5464..dd5b91c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_STOCK_INITIALIZE") @Api("库存初始化信息") public class WmsStockInitialize extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index a587db3..599f637 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -9,8 +9,16 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; import java.util.List; +import java.util.Map; /** * @Description : 库存信息 @@ -29,6 +37,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存信息", description = "库存信息") public class WmsStockQuan extends BaseBean { @@ -70,6 +79,10 @@ public class WmsStockQuan extends BaseBean { private Boolean includeZeroStock = false; @Transient + @ApiParam(value = "无差异库存显示") + private Boolean showNoDiffStock = false; + + @Transient @ColumnDefault("0") @ApiParam(value = "库存数量总和") private Double sumQty; @@ -78,6 +91,11 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "库位信息") private WmsLocate wmsLocate; + @Transient + @ApiParam(value = "库位名称") + private String locateName; + + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "可用数量") @@ -115,6 +133,11 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量") private Double scrapQty; + @Version + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") + @ApiParam(value = "乐观锁", defaultValue = "0") + public Integer lockVersion; + @Transient @ApiParam(value = "总数量") private Double totalQty; @@ -154,6 +177,16 @@ public class WmsStockQuan extends BaseBean { @Transient private Integer isSnapshot; + + @Transient + @ApiParam(value = "应有数量") + private Double theoryQty; + + @Transient + @ApiParam(value = "差异数量MAP") + private Map> differenceQtyMap; + + public Integer getIsSnapshot() { return this.isSnapshot == null ? 0 : this.isSnapshot; } @@ -162,6 +195,11 @@ public class WmsStockQuan extends BaseBean { return areaNo; } + public Double getTotalQtyVal() { + return this.getQtyVal() + this.getFailQtyVal()+ this.getHoldQtyVal()+ this.getQcQtyVal() + + this.getRinQtyVal()+ this.getFreezeQtyVal()+ this.getConsignQtyVal()+ this.getScrapQtyVal(); + } + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } @@ -210,6 +248,16 @@ public class WmsStockQuan extends BaseBean { return this.boxQty == null ? 0 : this.boxQty; } + + public Integer getLockVersion() { + return this.lockVersion == null ? 0 : this.lockVersion; + } + + public boolean getShowNoDiffStock() { + return this.showNoDiffStock == null ? false : this.showNoDiffStock; + } + + public WmsStockQuan() { } @@ -229,6 +277,30 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.sumQty = sumQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; + } + + public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partName; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.totalQty = totalQty; this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; @@ -287,4 +359,42 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty; } + + public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty, String areaNo) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partName; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.totalQty = totalQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; + this.areaNo = areaNo; + } + + public WmsStockQuan(String partNo, String partNameRdd, Double qty) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + } + + public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 7c2aaa7..37f3706 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -17,6 +17,8 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; @@ -43,11 +45,13 @@ import java.util.List; @Index(columnList = "LOT_NO"), @Index(columnList = "FIX_LOT_NO"), @Index(columnList = "DATE_CODE"), - @Index(columnList = "VENDOR_NO") + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "ORGANIZE_CODE") }) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存条码信息", description = "库存条码信息") public class WmsStockSn extends BaseBean { @@ -228,6 +232,16 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seqNo; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; + + @ApiParam("容器编号") + @Column(name = "CT_NO") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String ctNo; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; @@ -236,6 +250,10 @@ public class WmsStockSn extends BaseBean { @Transient public String zoneNameRdd; + @ApiParam(value = "时间") + @Transient + public String date; + @ApiParam(value = "库位名称") @Transient public String locateNameRdd; @@ -284,6 +302,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "jis料架号") private String queueGroupNo; + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "产品条码") + private String serialNumber; + @Transient @ApiParam(value = "工厂名称") public String organizeName; @@ -347,6 +369,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("是否寄售 1-是 2-否") private Integer consignation; + @Column(name = "REMARK") + @ApiParam("备注") + public String remark; + @Transient @ApiParam(value = "是否最早批次") public String isFifo; @@ -384,6 +410,10 @@ public class WmsStockSn extends BaseBean { private Integer boxQty; @Transient + @ApiParam(value = "箱数") + private String boxQtyStr; + + @Transient @ApiParam(value = "是否报工") private String isReport; @@ -470,7 +500,6 @@ public class WmsStockSn extends BaseBean { @ApiParam("父位置号") public String parentPositionNo; - @Transient @ApiParam(value = "材料类型") private String melType; @@ -507,6 +536,73 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "颜色") private String color; + @Transient + @ApiParam(value = "单据") + private String orderNo; + + @Transient + @ApiParam("物料库位") + private String partLocateNo; + + @Transient + @ApiParam("数量检查") + private Integer checkQyt; + + @Transient + @ApiParam("数量总和") + private Double sumQty; + + @Transient + @ApiParam("原数量") + private Double srcQty; + + @Transient + @ApiParam("库位X") + private Integer x; + + @Transient + @ApiParam("库位Y") + private Integer y; + + @Transient + @ApiParam("库位Z") + private Integer z; + + @Transient + @ApiParam("总重量") + private Double weight; + + @Transient + @ApiParam("道口") + private String dock; + + @Transient + @ApiParam("泊位") + private String zdoc; + + @ApiParam("打印类型") + private Integer printType; + + public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z, + String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) { + this.sn = sn; + this.vendorNo = vendorNo; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.locateNo = locateNo; + this.x = x; + this.y = y; + this.z = z; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.qualityDate = qualityDate; + } + public WmsStockSn() { } @@ -536,6 +632,15 @@ public class WmsStockSn extends BaseBean { this.locateNo = locateNo; } + public WmsStockSn(String locateNo, String partNo, String partName, String zoneNo, String unit, String whNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partName; + this.zoneNo = zoneNo; + this.unit = unit; + this.whNo = whNo; + } + //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid public WmsStockSn(String locateNo, String partNo, Integer snStatus, Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) { @@ -753,7 +858,7 @@ public class WmsStockSn extends BaseBean { String shippingFlag, String workCenterCode, Integer snType, String packagePartNo, Integer useCount, Integer seqNo, String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, - String prodCfgTypeName, String custNameRdd, String workOrderCode, String color) { + String prodCfgTypeName, String custNameRdd, String workOrderCode, String color, String orderNo) { this.organizeCode = organizeCode; this.id = id; this.sn = sn; @@ -801,6 +906,68 @@ public class WmsStockSn extends BaseBean { this.custNameRdd = custNameRdd; this.workOrderCode = workOrderCode; this.color = color; + this.orderNo = orderNo; + } + + public WmsStockSn(String organizeCode, Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo, + String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, + String qualityDate, String custNo, String custSn, String sn2d, + String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser, + String parentPositionNo, Date pdate, Integer printed, String refSrc, String refType, + String shippingFlag, String workCenterCode, Integer snType, + String packagePartNo, Integer useCount, Integer seqNo, + String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, + String prodCfgTypeName, String custNameRdd, String workOrderCode, String color, String orderNo, String serialNumber) { + this.organizeCode = organizeCode; + this.id = id; + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.vendorNameRdd = vendorNameRdd; + this.qualityDate = qualityDate; + this.custNo = custNo; + this.custSn = custSn; + this.sn2d = sn2d; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + this.parentPositionNo = parentPositionNo; + this.pdate = pdate; + this.printed = printed; + this.refSrc = refSrc; + this.refType = refType; + this.shippingFlag = shippingFlag; + this.workCenterCode = workCenterCode; + this.snType = snType; + this.packagePartNo = packagePartNo; + this.useCount = useCount; + this.seqNo = seqNo; + + this.whNameRdd = whNameRdd; + this.locateNameRdd = locateNameRdd; + this.zoneNameRdd = zoneNameRdd; + this.partTypeDesc = partTypeDesc; + this.prodCfgTypeName = prodCfgTypeName; + this.custNameRdd = custNameRdd; + this.workOrderCode = workOrderCode; + this.color = color; + this.orderNo = orderNo; + this.serialNumber = serialNumber; } public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) { @@ -813,5 +980,53 @@ public class WmsStockSn extends BaseBean { this.fixLotNo = fixLotNo; } + public WmsStockSn(String sn, Double qty, String unit, String partNo, String partNameRdd, String partTypeDesc, String lotNo, String leftCode, String fixLotNo, String vendorNo, String organizeCode) { + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.partTypeDesc = partTypeDesc; + this.lotNo = lotNo; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.organizeCode = organizeCode; + } + + public WmsStockSn(WmsStockSn wmsStockSn, Double sumQty) { + this.partNo = wmsStockSn.getPartNo(); + this.vendorNo = wmsStockSn.getVendorNo(); + this.unit = wmsStockSn.getUnit(); + this.partNameRdd = wmsStockSn.getPartNameRdd(); + this.sumQty = sumQty; + } + public WmsStockSn( String zoneNo, String locateNo, String partNo, + String partNameRdd, String sn, Double qty, String qualityDate, + Integer snStatus,String lotNo) { + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.qty = qty; + this.qualityDate = qualityDate; + this.snStatus = snStatus; + this.lotNo = lotNo; + } + + public WmsStockSn(String organizeCode, String sn, String partNo, String locateNo, String whNo, String zoneNo, String vendorNo) { + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.locateNo = locateNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.vendorNo = vendorNo; + } + public WmsStockSn(String partNo, Double qty) { + this.partNo = partNo; + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java index dfe3b86..779895c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_SUB_PART", indexes = { @Index(columnList = "ORGANIZE_CODE") }) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java index 0470492..ac52c32 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java @@ -8,7 +8,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.apache.commons.lang3.StringUtils; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -32,6 +35,7 @@ import java.util.Map; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_SUSPEN_STOCK_SYNC", indexes = { @Index(columnList = "ORGANIZE_CODE") }) @@ -68,7 +72,7 @@ public class WmsSuspenStockSync extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private Double qtyA; - @Column(name = "qty_b") + @Column(name = "QTY_B") @ApiParam(value = "数量B") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private Double qtyB; @@ -114,4 +118,31 @@ public class WmsSuspenStockSync extends BaseBean { @ApiParam(value = "物料数据Map") private Map partNameMap; + public String getLocateNoVal() { + return this.locateNo == null ? StringUtils.EMPTY : this.locateNo; + } + + public String getPartNoAVal() { + return this.partNoA == null ? StringUtils.EMPTY : this.partNoA; + } + + public String getPartNoBVal() { + return this.partNoB == null ? StringUtils.EMPTY : this.partNoB; + } + + public Double getQtyAVal() { + return this.qtyA == null ? 0 : this.qtyA; + } + + public Double getQtyBVal() { + return this.qtyB == null ? 0 : this.qtyB; + } + + public String getLotNoAVal() { + return this.lotNoA == null ? StringUtils.EMPTY : this.lotNoA; + } + + public String getLotNoBVal() { + return this.lotNoB == null ? StringUtils.EMPTY : this.lotNoB; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java index 95e23ab..c9593f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TASK_CREATE_LOG") @Api("作业任务生成日志表") public class WmsTaskCreateLog extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 99716c7..3ad127e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -1,9 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +33,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TASK_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @@ -145,6 +150,11 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("交易类型") public String transTypeCodeRdd; + @Column(name = "REF_ITEM") + @ApiParam("关联单据行号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refItem; + @Transient @ApiParam("工厂代码集合") private List organizeCodeList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 67fd34b..31ac6d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TASK",indexes = { @Index(columnList = "TASK_STATUS"), @Index(columnList = "TRANS_TYPE_CODE") @@ -92,6 +95,18 @@ public class WmsTaskInfo extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isCheckSn; + @Column(name = "SYNC_STATUS") + @ApiParam("是否同步") + public Integer syncStatus = 10; + + @Column(name = "SYNC_DATE_TIME") + @ApiParam(value = "同步时间", example = "1") + public String syncDateTime; + + @Column(name = "SYNC_USER") + @ApiParam(value = "同步人", example = "1") + public String syncUser; + @Transient @ApiParam("计划日期") private String zdate; @@ -126,4 +141,14 @@ public class WmsTaskInfo extends BaseBean { this.custNo = custNo; this.vendorNo = vendorNo; } + + public WmsTaskInfo(String orderNo, Integer taskStatus, String transTypeCode, String createUser, String createDatetime, String organizeCode, String userNo) { + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.transTypeCode = transTypeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.organizeCode = organizeCode; + this.userNo = userNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index 9927324..d2e158d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TASK_SRC") @Api("作业任务数据来源表") public class WmsTaskSrc extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java index d35daea..ba99c80 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TMP_ORDER_LOCK") @Api("单据操作并发锁定信息") public class WmsTempOrderLock extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java index 6d7bec2..4e14b9d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TERMINAL") @Api("工位信息") public class WmsTerminal extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index aeb6e6a..1a2e7d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -33,6 +35,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("检测结果明细表") public class WmsTestResultDetails extends BaseBean { @@ -75,7 +78,7 @@ public class WmsTestResultDetails extends BaseBean { @ApiParam("检测值") public String checkValue; - @Column(name = "IS_SYNC", nullable = false) + @Column(name = "IS_SYNC") @ApiParam("是否同步") @AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description") public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 29121cc..60b5370 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -14,6 +16,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; +import java.util.Map; /** * @Description :检测结果汇总表 @@ -28,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TEST_RESULT_SUMMARY") @Api("检测结果汇总表") public class WmsTestResultSummary extends BaseBean { @@ -94,9 +99,27 @@ public class WmsTestResultSummary extends BaseBean { private String sn; @Transient + @ApiParam("BH号集合") + private Map bhTypes; + + @Transient @ApiParam("库存条码二维码") private String serialSn; + @Transient + @ApiParam("返回给mes") + private List wmsForMes; + + @Transient + @ApiParam("是否合格最大值") + private Integer maxQualified; + + + @Transient + @ApiParam("是否合格最小值") + private Integer minQualified; + + public WmsTestResultSummary(String organizeCode, String bhCode, String workCenterCode, String partNo, String partName, String flagNo, Integer isQualified, @@ -132,6 +155,14 @@ public class WmsTestResultSummary extends BaseBean { this.bhType = bhType; } + public WmsTestResultSummary(Integer bhType, Integer maxQualified, Integer minQualified, String workCenterCode, String partNo) { + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.bhType = bhType; + this.maxQualified = maxQualified; + this.minQualified = minQualified; + } + public WmsTestResultSummary() { } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java index fdcf3d7..b315365 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_THYMELEAF") @Api("WMS回显模板数据") public class WmsThymeleaf extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java index ffbfba7..78b338f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java @@ -7,6 +7,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TMS_DRIVER") @Api("驾驶员信息") public class WmsTmsDriver extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index 4b47141..0f4a349 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -28,6 +25,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TMS_SHIPPING_EXT") @Api("装车单信息") public class WmsTmsShippingExt extends BaseBean { @@ -134,6 +132,11 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("调拨单录入字段") private String defectiveAllocation; + //关联单号 + @Column(name="ORDER_NO") + @ApiParam("关联单号") + private String orderNo; + // @Transient // @ApiParam("打印模板列表") // private String defectiveAllocation; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java index 2935a37..08a1033 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="策略表",description = "策略表") public class WmsTractics extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 5818f82..19d71a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="库存交易记录表",description = "库存交易记录表") public class WmsTrans extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java index 026c7ab..d4de6d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="交易代码方法表",description = "交易代码方法表") public class WmsTransCode extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java index be80316..059fcff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "交易处理组件表", description = "交易处理组件表") public class WmsTransModule extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 14fbf1f..26fabac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TRANS_QUAN", indexes = { @Index(columnList = "WH_NO"), @Index(columnList = "ZONE_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index fe49873..a1b49d0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库交易归档表",description = "仓库交易归档表") public class WmsTransRcd extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index b4f5ed5..30418b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -1,9 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -25,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TRANS_SN") @Api("库存交易条码信息") public class WmsTransSn extends BaseBean { @@ -87,4 +92,95 @@ public class WmsTransSn extends BaseBean { @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") private Integer snStatus; + + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "交易数量") + public Double transQty; + + @Column(name = "SRC_PART_NO") + @ApiParam("源物料编码") + public String srcPartNo; + + @Column(name = "NEW_PART_NO") + @ApiParam("新物料编码") + public String newPartNo; + + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "源数量") + public Double srcQty; + + @Column(name = "NEW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "新数量") + public Double newQty; + + @Column(name = "SRC_SN_STATUS") + @ApiParam(value = "源条码状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class) + public Integer srcSnStatus; + + @Column(name = "NEW_SN_STATUS") + @ApiParam(value = "目的条码状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class) + public Integer newSnStatus; + + @Column(name = "SRC_QC_STATUS") + @ApiParam(value = "源质量状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class) + public Integer srcQcStatus; + + @Column(name = "NEW_QC_STATUS") + @ApiParam(value = "目的质量状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class) + public Integer descQcStatus; + + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; + + @Column(name = "NEW_WH_NO") + @ApiParam("新仓库代码") + public String newWhNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Column(name = "NEW_ZONE_NO") + @ApiParam("新存储区代码") + public String newZoneNo; + + @Column(name = "NEW_LOCATE_NO") + @ApiParam("新库位代码") + public String newLocateNo; + + @Column(name = "SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name = "SRC_ORGANIZE_CODE") + @ApiParam("源工厂代码") + public String srcOrganizeCode; + + @Column(name = "NEW_ORGANIZE_CODE") + @ApiParam("新工厂代码") + public String newOrganizeCode; + + @Column(name = "SRC_IS_DELETED") + @ApiParam("旧软删标识") + public Integer srcIsDeleted; + + @Column(name = "NEW_IS_DELETED") + @ApiParam("新软删标识") + public Integer newIsDeleted; + + @Column(name = "SRC_IS_VALID") + @ApiParam("旧有效标识") + public Integer srcIsValid; + + @Column(name = "NEW_IS_VALID") + @ApiParam("新有效标识") + public Integer newIsValid; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 2c5f6e1..28e7b60 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -8,6 +8,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "交易类型表", description = "交易类型表") public class WmsTransType extends BaseBean { @@ -81,6 +84,10 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "交易处理组件名称") private String tmName; + @Column(name = "DIRECT") + @ApiParam(value = "交易的方向：IN,OUT,MOVE") + private String direct; + @Transient @ApiParam("菜单URL") private String menuUrl; @@ -96,4 +103,17 @@ public class WmsTransType extends BaseBean { public long getTmIdVal() { return this.tmId == null ? 0 : this.tmId; } + + public WmsTransType(String transTypeCode) { + this.transTypeCode = transTypeCode; + } + + public WmsTransType() { + + } + + public WmsTransType(String transTypeCode, String transTypeName) { + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 49ce84f..9dad565 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -31,6 +33,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TRANSPORT_RULE") @Api("运输规则表") public class WmsTransportRule extends BaseBean { @@ -50,7 +53,8 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=BUSI_SCENE_TYPE_DICTIONARY", listColumnName = "name", explicitColumnName = "dictionaryValue") public Integer busiSceneType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 84ce516..ed41e05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="单位定义",description = "单位定义") public class WmsUnit extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 5fbc76e..5da5bd1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -6,12 +6,15 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,10 +26,15 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_UNIT_CONVERT") +@Table(name="WMS_UNIT_CONVERT", indexes = { + @Index(columnList = "UNIT_CODE"), + @Index(columnList = "DEST_UNIT_CODE"), + @Index(columnList = "ORGANIZE_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="单位换算",description = "单位换算") public class WmsUnitConvert extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java new file mode 100644 index 0000000..2a8b64a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description 用户打印机绑定信息 + * @Reference + * @Author dragon + * @CreateDate 2020/12/17 15:38 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_USER_PRINTER_INFO") +@Api("用户打印机绑定信息") +public class WmsUserPrinterInfo extends BaseBean{ + + @Column(name="PRINTER_NO") + @ApiParam("打印机编号") + private String printerNo; + + @Column(name="USER_NO") + @ApiParam("用户编码") + private String userNo; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java new file mode 100644 index 0000000..4a4a21f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +/** + * @Description 供应商道口信息 + * @Reference + * @Author dragon + * @CreateDate 2020/11/25 13:43 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_VENDOR_DOCK") +@Api("供应商道口信息") +public class WmsVendorDock extends BaseBean { + private static final long serialVersionUID = 662346332597842770L; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String vendorNo; + + @Column(name="DOCK_CODE") + @ApiParam("道口代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String dockCode; + + @Column(name="DOCK_ADDRESS") + @ApiParam("道口发运地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String dockAddress; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index bcd0499..ee2ea45 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "供应商零件关系", description = "供应商零件关系") public class WmsVendorPart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java index ee0536c..31e174d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="供应商计划员",description = "供应商计划员") public class WmsVendorPlanner extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java index fa72ef5..0cdbd64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="供应商父子关系",description = "供应商父子关系") public class WmsVendorRelation extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java index 4902c6a..10e60d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="供应商窗口时间",description = "供应商窗口时间") public class WmsVendorWindow extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java index dad3549..f097008 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_WAVE_RULE") @Api(value = "波次规则数据表") public class WmsWaveRule extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java index 360d029..9ebabdf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_WAVE_RULE_DETAILS") @Api(value = "波次规则明细数据表") public class WmsWaveRuleDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index 241599c..91de6b5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="工作中心",description = "工作中心") public class WmsWorkCenter extends BaseBean { @@ -72,4 +75,23 @@ public class WmsWorkCenter extends BaseBean { searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; + @Column(name = "PRE_WO_MINUTE", columnDefinition = "int default 600") + @ApiParam(value = "计算未完成工单的提前时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer preWoMinute; + + @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180") + @ApiParam(value = "提前拉动时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer preReadyMinute; + + @Column(name = "PULL_RANGE_MINUTE", columnDefinition = "int default 180") + @ApiParam(value = "拉动区间时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer pullRangeMinute; + + @Column(name = "NEXT_PULL_TIME", columnDefinition = "varchar(50) default '' ") + @ApiParam(value = "下次拉动时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private String nextPullTime; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java index 1a792c6..0753668 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="工作中心线边库区关系",description = "工作中心线边库区关系") public class WmsWorkCenterZone extends BaseBean { private static final long serialVersionUID = 950689993212839817L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java index 78913f6..921635f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -14,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库区物料 @@ -27,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_ZONE_PART") @Api("库区物料") public class WmsZonePart extends BaseBean{ @@ -87,4 +91,24 @@ public class WmsZonePart extends BaseBean{ @ApiParam(value = "安全量", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double safetyQty; + + @Transient + @ApiParam(value = "总件数") + private Double totalSnQty ; + + @Transient + @ApiParam(value = "库存是否正常") + private Integer isNormal ; + + public WmsZonePart() { + } + + public WmsZonePart(String zoneNo, String partNo, String partNameRdd, Double min, Double max, Double totalSnQty) { + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.min = min; + this.max = max; + this.totalSnQty = totalSnQty; + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 5d1e4b0..676d2e2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -6,6 +6,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "存储区信息表", description = "存储区信息表") public class WmsZones extends BaseBean { @@ -136,6 +139,10 @@ public class WmsZones extends BaseBean { @ApiParam(value = "子存储区列表") private List childList; + @Transient + @ApiParam(value = "库位利用率百分比") + private String Location; + public WmsZones(String zoneNo) { this.zoneNo = zoneNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index d7c87ee..be8e419 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "WMS字段信息表", description = "WMS字段信息表") public class WmsFieldInfo extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java index 5ebf953..b5bde49 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="WMS列表元素表",description = "WMS列表元素表") public class WmsListElement extends BaseBean { @@ -104,4 +107,14 @@ public class WmsListElement extends BaseBean { @Column(name = "EXPLICIT_COLUMN_NAME") @ApiParam(value = "回显列名") private String explicitColumnName; + + public WmsListElement() { + } + + public WmsListElement(Integer seq, String userCode, Long functionId, String organizeCode) { + this.seq = seq; + this.userCode = userCode; + this.functionId = functionId; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java index 9a6f4b8..d06d706 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="WMS列表元素菜单关系表",description = "WMS列表元素菜单关系表") public class WmsListElementFunction extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java index 7a9cbbb..09ed3de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +30,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="WMS搜索元素表",description = "WMS搜索元素表") public class WmsSearchElement extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java index b400277..46e69c0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -31,6 +33,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="WMS搜索元素菜单关系表",description = "WMS搜索元素菜单关系表") public class WmsSearchElementFunction extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendPartCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendPartCheck.java new file mode 100644 index 0000000..dd3264d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendPartCheck.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.bean.mesdata; + + +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description 发运物料校验基础数据（源于MES同步） + * @Reference + * @Author dragon + * @CreateDate 2021/3/22 11:32 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "wms_send_part_check") +@Api("发运物料校验数据") +public class WmsSendPartCheck extends BaseBean { + private static final long serialVersionUID = 5370578735799188359L; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "IS_CHECK") + @ApiParam("是否校验") + public Integer isCheck; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendSnCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendSnCheck.java new file mode 100644 index 0000000..44b42d1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendSnCheck.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.bean.mesdata; + + +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.*; + +/** + * @Description 发运条码校验基础数据（源于MES同步） + * @Reference + * @Author dragon + * @CreateDate 2021/3/22 11:32 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "wms_send_sn_check") +@Api("发运条码绑定关系校验数据") +public class WmsSendSnCheck extends BaseBean { + private static final long serialVersionUID = 2140873585281055846L; + + @Column(name = "SN") + @ApiParam("产品条码") + public String sn; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java index af83020..6bac44c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_PLUGIN") @Api("插件信息") public class BasPlugin extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java index d2f97fd..a77cc36 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java @@ -3,6 +3,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_PLUGIN_CLASS") @Api("插件类信息") public class BasPluginClass extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java new file mode 100644 index 0000000..691c19a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java @@ -0,0 +1,157 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; +import java.io.Serializable; + +@Data +@MappedSuperclass +public class SnapshotBean implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @GenericGenerator(name = "generator", strategy = "increment") + @GeneratedValue(generator = "generator") + @Column(name = "snap_id") + private Long snapId; + + //此处使用hibernate的主键策略方式 + //手动设置,使用iplus-platform-common中的idtool生成 + //将Long类型系列化成String避免精度丢失 + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="ORGANIZE_CODE", nullable = false) + @ApiParam(value ="组织代码") +// @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) + public String organizeCode; + + @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "有效性",example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + public Integer isValid; //CommonEnumUtil.IS_VAILD; + + @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否已删除",example = "2") + @AnnoOutputColumn(hidden = true) + //逻辑删除，软删除 + public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA + + @Column(name="CREATE_USER",updatable = false) + @ApiParam(value = "创建用户") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String createUser; + + @Column(name="CREATE_DATE_TIME",updatable = false) + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String createDatetime; + + @Column(name="MODIFY_USER") + @ApiParam(value = "修改人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String modifyUser; + + @Column(name="MODIFY_DATE_TIME") + @ApiParam(value = "修改日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String modifyDatetime; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeEnd; + + @Transient + @ApiParam(value = "排序属性") + @AnnoOutputColumn(hidden = true) + public String orderByParam = ""; + + @Transient + @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + @AnnoOutputColumn(hidden = true) + //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc + public transient Integer ascOrDesc = 1; + + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid.intValue(); + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + } + + //排序方式 + public String orderBy(){ + String result = ""; + if (orderByParam!=null&&orderByParam.trim().length()>0) { + result = " order by " + orderByParam; + if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + }else{ + result += " desc"; + } + } + return result; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java index 1a5b744..c5d5f38 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -16,6 +18,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_CHECK_POINT") public class WmsCheckPoint extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java index 29477e4..f3c460b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -1,11 +1,14 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -25,6 +28,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_MOVE_DETAILS_SNAPSHOT", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @@ -32,7 +36,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单明细信息") -public class WmsMoveDetailsSnapshot extends BaseBean { +public class WmsMoveDetailsSnapshot extends SnapshotBean { private static final long serialVersionUID = -4095410692227226944L; @@ -141,6 +145,31 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @Transient private Long finishedCounts; + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomVersion; + + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer consignation = 2; + + @Column(name = "GROUP_NO") + @ApiParam("分组号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String groupNo; + + @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "已处理数量", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + public Double handledQty; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + @Transient @ApiParam("交易类型") private String transTypeCode; @@ -182,10 +211,6 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @ApiParam("创建时间") private String createDateTime; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java index 7679f39..9d71d9b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java @@ -1,11 +1,12 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +25,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_MASTER_SNAPSHOT", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), @@ -31,7 +33,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单主表信息") -public class WmsMoveMasterSnapshot extends BaseBean { +public class WmsMoveMasterSnapshot extends SnapshotBean { private static final long serialVersionUID = 3569874772643448726L; @@ -150,7 +152,6 @@ public class WmsMoveMasterSnapshot extends BaseBean { @ApiParam(value = "设备编号") public String fixId; - @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 453d372..a4f2d6f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -1,17 +1,22 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单条码信息 @@ -25,6 +30,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_SN_SNAPSHOT", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @@ -33,7 +39,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单条码信息") -public class WmsMoveSnSnapshot extends BaseBean { +public class WmsMoveSnSnapshot extends SnapshotBean { private static final long serialVersionUID = 2588101374261238353L; @@ -168,6 +174,11 @@ public class WmsMoveSnSnapshot extends BaseBean { @ApiParam("供应商编号") private String vendorNo; + @Column(name = "LEFT_CODE") + @ApiParam(value = "生产批次") + private String leftCode; + + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") @@ -189,11 +200,6 @@ public class WmsMoveSnSnapshot extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; - public WmsMoveSnSnapshot() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index 724a81d..97f7c7f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -1,10 +1,11 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; 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; @@ -32,8 +33,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存信息", description = "库存信息") -public class WmsStockQuanSnapshot extends BaseBean { +public class WmsStockQuanSnapshot extends SnapshotBean { private static final long serialVersionUID = 8335719859185712904L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index 8d15ecc..b00ddde 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -1,11 +1,12 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -44,8 +45,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存条码信息", description = "库存条码信息") -public class WmsStockSnSnapshot extends BaseBean { +public class WmsStockSnSnapshot extends SnapshotBean { private static final long serialVersionUID = 8641922373097608315L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java new file mode 100644 index 0000000..804945c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : ERP COGI快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_ERP_COGI_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME"), + @Index(columnList = "MOVE_TYPE") +}) +public class WmsErpCOGISnapshot extends BaseBean { + private static final long serialVersionUID = -4095222692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + private String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private String moveType; + + @Column(name = "KEYIN_TIME") + @ApiParam("录入时间") + private String keyInTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java new file mode 100644 index 0000000..b0cc952 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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 : ERP 数据快照时间 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_ERP_CHECK_POINT") +public class WmsErpCheckPoint extends BaseBean { + + private static final long serialVersionUID = 5589607687871639189L; + + @Column(name="SNAPSHOT_TIME", columnDefinition="varchar(225) default ''", nullable=false) + @ApiParam("快照时间") + public String snapshotTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java new file mode 100644 index 0000000..b2b8294 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : ERP 报文接口快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_ERP_INTERFACE_SNAPSHOT", indexes = { + @Index(columnList = "SID"), + @Index(columnList = "SENDER"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "RECEIVER"), + @Index(columnList = "SNAPSHOT_TIME") +}) +public class WmsErpInterfaceSnapshot extends BaseBean { + private static final long serialVersionUID = -4095333692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "SID") + @ApiParam("业务唯一编号") + public String sid; + + @Column(name = "SENDER") + @ApiParam("发送方") + public String sender; + + @Column(name = "SEND_TIME") + @ApiParam("发出时间") + public String sendTime; + + @Column(name = "RECEIVER") + @ApiParam("接收方") + public String receiver; + + @Column(name = "RECEIVED_TIME") + @ApiParam("接收时间") + public String receivedTime; + + @Column(name = "TRANS_TIME") + @ApiParam("处理时间") + public String transTime; + + @Column(name = "TRANS_STATUS") + @ApiParam("处理状态") + public String transStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java new file mode 100644 index 0000000..a0a52fc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +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 : ERP 库存比对包含的库存地点 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-27 14:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_ERP_QUAN_AREAS") +public class WmsErpQuanAreas extends BaseBean implements Comparable { + private static final long serialVersionUID = 5560607687871639209L; + + @Column(name="AREA_NO") + @ApiParam("库存地点") + public String areaNo; + + @Override + public int compareTo(WmsErpQuanAreas o) { + return this.getAreaNo().compareTo(o.getAreaNo()); + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java new file mode 100644 index 0000000..793b418 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : ERP 库存结余快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_ERP_STOCK_QUAN_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME") +}) +public class WmsErpStockQuanSnapshot extends BaseBean { + private static final long serialVersionUID = -4095444692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java new file mode 100644 index 0000000..157206d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : ERP 交易快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_ERP_TRANS_SNAPSHOT", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME"), + @Index(columnList = "MOVE_TYPE") +}) +public class WmsErpTransSnapshot extends BaseBean { + private static final long serialVersionUID = -4095555692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "ORDER_NO") + @ApiParam("单据编号") + private String orderNo; + + @Column(name = "YEAR") + @ApiParam("凭证年度") + private String year; + + @Column(name = "ITEM") + @ApiParam("行项目") + private String item; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private String moveType; + + @Column(name = "KEYIN_TIME") + @ApiParam("录入时间") + private String keyInTime; + + @Column(name = "VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; + + @Column(name = "CUSTOMER_NO") + @ApiParam("客户编号") + private String customerNo; + + @Column(name = "AMOUNT") + @ApiParam("金额") + private Double amount; + + @Column(name = "DR_AND_CR") + @ApiParam("借贷标识：H=贷方- S=借方+") + private String drandcr; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java index 81f5de7..4b5934f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -4,6 +4,8 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,6 +28,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_IMPORT_TEMPLATE") @Api("导入模板信息") public class BasImportTemplate extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java index d45be01..21c1237 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -10,6 +10,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_IMPORT_TEMPLATE_DETAILS") @Api("导入模板明细信息") public class BasImportTemplateDetails extends BaseBean{ @@ -114,4 +117,9 @@ public class BasImportTemplateDetails extends BaseBean{ @Column(name="SHEET_NAME") @ApiParam("工作薄名称") private String sheetName; + + + @Column(name = "IS_EXPORT_TITLE") + @ApiParam("是否导出表头") + private Integer isExportTitle; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 9dfdc8c..825d8c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * WMS - SAP 中间数据库接口映射关系 @@ -123,6 +124,17 @@ public class WmsInterfaceDataMapper extends BaseBean { public Integer syncFrequency; /** + * 同步时间 CRON 表达式 + */ + @Column(name = "SYNC_CRON") + public String syncCron; + /** + * 下次同步时间，与 syncCron 属性同时使用 + */ + @Column(name = "NEXT_SYNC_TIME") + public String nextSyncTime; + + /** * 上次同步时间 */ @Column(name = "LAST_SYNC_TIME") @@ -173,4 +185,20 @@ public class WmsInterfaceDataMapper extends BaseBean { @ColumnDefault("10") @AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false) public Integer softDataType; + + @ApiParam("接口名称") + @Column(name = "INTERFACE_NAME") + public String interfaceName; + + /** + * 本次发送报文使用的 SID + */ + @Transient + public Long sid; + + @Column(name = "SPLIT_SIGN") + @ApiParam("分割符号") + private String splitSign; + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java new file mode 100644 index 0000000..b49778e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -0,0 +1,96 @@ +package cn.estsh.i3plus.pojo.wms.dbinterface; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +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.Index; +import javax.persistence.Table; + +/** + * WMS - SAP 中间数据库接口映射关系 + * + * @author Rock.Yu + * @since 2019-06-09 20:08 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_INTERFACE_DATA_RECORD", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SRC_TABLE_NAME"), + @Index(columnList = "DEST_BEAN_NAME"), + @Index(columnList = "SOFT_ADAPTOR_CODE"), + @Index(columnList = "SID"), + @Index(columnList = "MOVE_TO_ERP_ID"), + @Index(columnList = "ERP_DOC_NO") +}) +@Api("接口数据收发记录") +public class WmsInterfaceDataRecord extends BaseBean { + private static final long serialVersionUID = 4139055040492108499L; + + @ApiParam("来源表名") + @Column(name = "SRC_TABLE_NAME", length = 50) + private String srcTableName; + + @ApiParam("目标实体对象的名字，多个字段用半角逗号分隔") + @Column(name = "DEST_BEAN_NAME", length = 500) + private String destBeanName; + + @ApiParam("软适配编号") + @Column(name = "SOFT_ADAPTOR_CODE") + private String softAdaptorCode; + + @ApiParam("接口名称") + @Column(name = "INTERFACE_NAME") + private String interfaceName; + + @ApiParam("报文唯一编号") + @Column(name = "SID") + private Long sid; + + @ApiParam("MOVE_TO_ERP表的ID") + @Column(name = "MOVE_TO_ERP_ID") + private Long moveToErpID; + + @ApiParam("报文校验状态") + @Column(name = "VERIFY_STATUS") + @ColumnDefault("10") + @AnnoOutputColumn(refClass = WmsEnumUtil.INTERFACE_DATA_VERIFY_STATUS.class, refForeignKey = "value", value = "description", required = false) + private int verifyStatus; + + @ApiParam("备注信息") + @Column(name = "REMARK") + private String remark; + + @ApiParam("ERP文档编号") + @Column(name = "ERP_DOC_NO") + private String erpDocNo; + + // 必须有默认值 + @ApiParam("ERP状态代码") + @Column(name = "ERP_STATUS_CODE", columnDefinition = "varchar(225) default ''") + private String erpStatusCode; + + @ApiParam("ERP状态描述") + @Column(name = "ERP_STATUS_DESC") + private String erpStatusDesc; + + @ApiParam("ERP最后更新时间") + @Column(name = "ERP_LAST_MODIFY_TIME") + private String erpLastModifyTime; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 752e8bb..98cb42f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -10,7 +10,12 @@ public class WmsInterfaceEnumUtil { WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), - SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"); + SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), + SWEB2SAP(60, "SWEB2SAP", "SWEB --> SAP"), + WMS2SWEB(70, "WMS2SWEB", "WMS --> SWEB"), + SAP2SWEB(80, "SAP2SWEB", "SAP --> SWEB"), + SAP2MES(90, "SAP2MES", "SAP --> WMS"), + ; private int value; private String name; @@ -59,6 +64,7 @@ public class WmsInterfaceEnumUtil { /** * -1 不在范围内 + * * @param desc * @return */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java new file mode 100644 index 0000000..7416abb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description :单据 + * @Reference : + * @Author :puxiao.liao + * @CreateDate : 2020-07-21 2:37 下午 + * @Modify: + **/ +@Data +@Api("单据") +public class WmsDocMovementMasterDto implements Serializable { + + private static final long serialVersionUID = -1388177116144308137L; + + @ApiParam("工厂编号") + private String organizeCode; + + @ApiParam("单据明细") + private List wmsDocMovementDetailsList; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java index c9fcfd4..4781543 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.wms.engine.rule; -import cn.estsh.i3plus.pojo.wms.bean.WmsZones; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -54,5 +53,10 @@ public class GenerateLocateRule { */ private boolean orderByAxle; + /** + * 是否空库位 + */ + private boolean isEmptyLocate; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java new file mode 100644 index 0000000..449c54d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +/** + * @Description : 自动生成领料看板model + * @Author : shun.cui + * @CreateDate : 2020/12/17 10:34 + * @Modify : + **/ +@Data +@Api("自动生成领料看板") +public class AutoPickingModel { + @ApiParam("工厂名") + private String organizeCode; + @ApiParam("计划日期") + private String planDate; + @ApiParam("sap单号") + private String erpSrcNo; + @ApiParam("状态") + private int orderStatus; + @ApiParam("父零件号") + private String partNo; + @ApiParam("简称") + private String partNameRdd; + @ApiParam("成品数量") + private Double productQty; + @ApiParam("完成数量") + private Double printQty; + @ApiParam("总数量") + private Double qty; + @ApiParam("操作时间") + private String modifyDateTime; + @ApiParam("操作人") + private String modifyUser; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java new file mode 100644 index 0000000..43e1cb4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : Bom接口数据Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-08-17 10:03 + * @Modify: + **/ +@Data +@Api("Bom接口数据Model") +@AllArgsConstructor +@NoArgsConstructor +public class BomItemModel { + + @ApiParam("父物料号") + private String partNo; + @ApiParam("父物料描述") + private String partName; + @ApiParam(value = "数量") + private Double qty; + @ApiParam(value = "计量单位") + private String unit; + + @ApiParam(value = "子物料号") + private String itemPartNo; + @ApiParam(value = "子料物料描述") + private String itemPartNam; + @ApiParam(value = "子计量单位") + private String itemUnit; + @ApiParam(value = "子用量") + private Double itemQty; + + @ApiParam(value = "是否虚阶物料") + private String category; + + @ApiParam(value = "有效起始日期") + private String effStartTime; + @ApiParam(value = "有效截止日期") + private String effEndTime; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + private boolean isVirtualPart = false; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java new file mode 100644 index 0000000..3f50ac6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +@Api("JIS发运报表明细模型") +public class JisReportDetailModel extends BaseBean { + @ApiParam("客户工厂") + private String customerNo; + @ApiParam("计划发货数量") + private Integer planShipingCount; + @ApiParam("计划发货时间") + private String planLoadTime; + @ApiParam("料架号") + private String fixLotNo; + @ApiParam("排序单号") + private String queneGroupNo; + @ApiParam("JIS号") + private String jisNo; + @ApiParam("箱条码") + private String sn; + @ApiParam("实际发货时间") + private String actualLoadTime; + @ApiParam("实际上线时间") + private String custOnLineTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java new file mode 100644 index 0000000..827a1a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +@Api("JIS发运报表模型") +public class JisReportModel extends BaseBean { + + @ApiParam("客户工厂") + private String custOrganizeCode; + @ApiParam("计划装车时间") + private String planLoadTime; + @ApiParam("计划发货数量") + private Double planShipingCount; + @ApiParam("实际装车时间") + private String actualLoadTime; + @ApiParam("实际发货数量") + private Double actualShipingCount; + @ApiParam("状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.TIME_STATUS.class,refForeignKey = "value",value = "description") + private Integer shippingStatus; + @ApiParam("料架号1") + private String queueGroupNo_1; + @ApiParam("客户上线时间1") + private String custOnLineTime_1; + @ApiParam("料架号2") + private String queueGroupNo_2; + @ApiParam("客户上线时间2") + private String custOnLineTime_2; + @ApiParam("料架号3") + private String queueGroupNo_3; + @ApiParam("客户上线时间3") + private String custOnLineTime_3; + @ApiParam("料架号4") + private String queueGroupNo_4; + @ApiParam("客户上线时间4") + private String custOnLineTime_4; + @ApiParam("客户现场库存") + private Double qty; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java new file mode 100644 index 0000000..5c4866a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 最低库存/最高库存 预警看板 Model + * @Author : shun.cui + * @CreateDate : 2020/12/17 10:55 + * @Modify : + **/ +@Data +@Api("最低库存/最高库存预警看板") +public class MinAndMaxStockModel { + @ApiParam("工厂名") + private String organizeCode; + @ApiParam("存储区") + private String zoneNo; + @ApiParam("库位") + private String locateNo; + @ApiParam("零件号") + private String partNo; + @ApiParam("简称") + private String partNameAdd; + @ApiParam("数量") + private Double qty; + @ApiParam("最低库存") + private Double min; + @ApiParam("最高库存") + private Double max; + @ApiParam("件号") + private String partTypeDesc; + @ApiParam("包装规格") + private Double snp; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java index 8c7abb5..26a77a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -1,12 +1,8 @@ package cn.estsh.i3plus.pojo.wms.modelbean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.util.List; -import java.util.Map; - @Data public class PushMessageModel { @@ -29,5 +25,6 @@ public class PushMessageModel { @ApiParam("工厂代码") private String organizeCode; - + @ApiParam("附件的文件路径") + private String attachFilePath; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index a5a55d2..92d9c88 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -28,7 +28,7 @@ public class WmsAutoPurchasePartModel extends Pager { private String unit; @ApiParam("物料数量") - private Integer qty; + private Double qty; @ApiParam("Erp库存地") private String erpWarehouse; @@ -39,11 +39,17 @@ public class WmsAutoPurchasePartModel extends Pager { @ApiParam("供应商名称") private String vendorName; - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) { + @ApiParam("要货时间") + private String arriveTime; + + private Integer preReceivingDay; + + public WmsAutoPurchasePartModel(String partNo, String partName, Double qty, String warehouse, Integer preReceivingDay) { this.partNo = partNo; this.partName = partName; this.qty = qty; this.erpWarehouse = warehouse; + this.preReceivingDay = preReceivingDay; } public WmsAutoPurchasePartModel() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java new file mode 100644 index 0000000..5d6f4d1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : Batch数据模型 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2021-04-05 14:53 + * @Modify: + **/ +@Data +@Api("Batch数据模型") +public class WmsBatchModel { + + @ApiParam("二维条码集合") + private List wmsSerialSns; + + @ApiParam("条码集合") + private List wmsStockSnList; + + @ApiParam("Batch号") + private String bhCode; + + @ApiParam("上一个熔深Batch号") + private String firstSnBatch; + + @ApiParam("新事务单号") + private String moveNo; + + @ApiParam("是否正常件") + private boolean flag; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("操作人") + private String userName; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java new file mode 100644 index 0000000..4091b66 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -0,0 +1,170 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : GCDC集装箱model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-11-24 18:17 + * @Modify: + **/ +@Data +@Api("GCDC集装箱model") +public class WmsGcdcContainerModel extends BaseBean { + + @ApiParam("移库单号号") + public String orderNo; + + @ApiParam("库存移动单号") + public String moveNo; + + @ApiParam("条码") + public String sn; + + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + @ApiParam(value = "客户编号") + private String custNo; + + @ApiParam(value = "单据状态") + public Integer orderStatus; + + @ApiParam(value = "库存移动单状态") + public Integer itemStatus; + + @ApiParam(value = "包装编号") + private String packageNo; + + @ApiParam("集装箱号") + private String containerNo; + + @ApiParam("产地") + private String productPlace; + + @ApiParam("托盘重量") + private Double packageWeight; + + @ApiParam(value = "客户名称") + public String custNameRdd; + + @ApiParam(value = "业务类型") + public Integer busiType; + + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @ApiParam(value = "物料号") + public String partNo; + + @ApiParam(value = "物料号") + public String partNameRdd; + + @ApiParam(value = "客户地址") + private String custAddr; + + @ApiParam(value = "客户联系人") + private String custOwner; + + @ApiParam(value = "客户电话号码") + private String custTel; + + @ApiParam(value = "是否集装箱号") + private Integer isContainer; + + @ApiParam("移库单号集合") + private List orderNoList; + + @ApiParam("库存移动单号集合") + private List moveNoList; + + @ApiParam("库存移动单条码集合") + private List moveSnList; + + @ApiParam("库存条码集合") + private List stockSnList; + + @ApiParam(value = "仓库代码") + private String whNo; + + @ApiParam(value = "存储区编号") + private String zoneNo; + + @ApiParam(value = "库位代码") + private String locateNo; + + @ApiParam(value = "客户发往地名称") + private String flagName; + + @ApiParam(value = "客户发往地代码") + private String flagNo; + + @ApiParam(value = "是否绑定发运") + private Integer isBindingShip = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @ApiParam("交易类型名称") + private String transTypeName; + + public WmsGcdcContainerModel() { + } + + public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo, + Integer orderStatus, String createDatetime, String createUser) { + this.id = id; + this.orderNo = orderNo; + this.moveNo = moveNo; + this.erpSrcNo = erpSrcNo; + this.custNo = custNo; + this.orderStatus = orderStatus; + this.createDatetime = createDatetime; + this.createUser = createUser; + } + + public WmsGcdcContainerModel(Long id, String orderNo,String transTypeCode, String moveNo, String erpSrcNo, String custNo, + Integer itemStatus, String createDatetime, String createUser, Integer busiType) { + this.id = id; + this.orderNo = orderNo; + this.transTypeCode = transTypeCode; + this.moveNo = moveNo; + this.erpSrcNo = erpSrcNo; + this.custNo = custNo; + this.itemStatus = itemStatus; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.busiType = busiType; + } + + public WmsGcdcContainerModel(Long id, String orderNo, String packageNo, Double packageWeight, String custNo, String partNo, String flagNo) { + this.id = id; + this.orderNo = orderNo; + this.packageNo = packageNo; + this.packageWeight = packageWeight; + this.custNo = custNo; + this.partNo = partNo; + this.flagNo = flagNo; + } + + public WmsGcdcContainerModel(Long id, String organizeCode, Double packageWeight, String packageNo, String zoneNo, + String locateNo, String whNo, String partNo, String partNameRdd, String custNo, String flagNo) { + this.id = id; + this.organizeCode = organizeCode; + this.packageWeight = packageWeight; + this.packageNo = packageNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.whNo = whNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.custNo = custNo; + this.flagNo = flagNo; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index d5b5feb..387aba1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import java.time.LocalTime; +import java.util.Map; /** * @Description : 供应商收货看板信息 @@ -48,6 +50,12 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable> gteCurrentDayResultMap; + + @ApiParam("小于今天的结果集") + private Map> ltCurrentDayResultMap; + public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName, String planTime, Double transQty, Double resQty) { this.orderNo = orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java new file mode 100644 index 0000000..432ab79 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : PO明细回传汇总Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-12 13:56 + * @Modify: + **/ +@Data +@Api("PO明细回传汇总Model") +public class WmsPoCountModel { + + @ApiParam(value = "po单号") + private String poOrderNo; + + @ApiParam(value = "收货日期") + private String rcDate; + + @ApiParam(value = "源单号") + private String srcOrderNo; + + @ApiParam(value = "源行号") + private Integer srcItem; + + @ApiParam(value = "收货批次") + private String lotNo; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "仓库") + private String whNo; + + @ApiParam(value = "汇总数量") + private Double sumQty; + + @ApiParam(value = "供应商批次") + private String venLotNo; + + @ApiParam(value = "操作人") + private String user; + + public WmsPoCountModel() { + } + + public WmsPoCountModel(String poOrderNo, String rcDate, String srcOrderNo, Integer srcItem, String lotNo, String partNo, String partName, String whNo, Double sumQty, String venLotNo, String user) { + this.poOrderNo = poOrderNo; + this.rcDate = rcDate; + this.srcOrderNo = srcOrderNo; + this.srcItem = srcItem; + this.lotNo = lotNo; + this.partNo = partNo; + this.partName = partName; + this.whNo = whNo; + this.sumQty = sumQty; + this.venLotNo = venLotNo; + this.user = user; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java new file mode 100644 index 0000000..a979929 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @质检完成状态模型 + * @author jason.niu + * @date 2020/10/16 + */ +@Data +@Api("质检完成状态模型") +public class WmsQCStatusModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("ASN单号") + private String asnOrderNo; + + @ApiParam("质检单号") + private String qcOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("标准质检时间（分钟）") + private Double stdQcTime; + + @ApiParam("收货时间") + private String receiveTime; + + @ApiParam("计划质检完成时间") + private String planCompleteTime; + + @ApiParam("实际质检完成时间") + private String actualCompleteTime; + + @ApiParam("状态") + private Integer status; + + @ApiParam("开始时间") + private String startDateTime; + + @ApiParam("结束时间") + private String endDateTime; + + @ApiParam("零件数量") + private Double qty; + + @ApiParam("待质检比例") + private Double proportion; + + @ApiParam("标准质检时间") + private Double stdCheckTime; + + @ApiParam("质检时长") + private long qcCostTime; + + public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) { + this.asnOrderNo = asnOrderNo; + this.qcOrderNo = qcOrderNo; + this.partNo = partNo; + this.partName = partName; + this.stdQcTime = stdQcTime; + this.qty = qty; + this.proportion = proportion; + this.stdCheckTime = stdCheckTime; + } + public Double getStdQcTimeVal() { + return this.stdQcTime == null ? 0 : this.stdQcTime; + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java new file mode 100644 index 0000000..ec0fc07 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 推荐车辆信息model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-02 11:17 + * @Modify: + **/ +@Data +@Api("推荐车辆信息model") +public class WmsRecommendCarModel extends BaseBean implements Serializable { + + @ApiParam(value = "计划日期") + String planTimeStart; + @ApiParam(value = "待发物料总数") + Double partNoSum; + @ApiParam(value = "标准包装") + Double snp; + @ApiParam(value = "单包装体积(m3)") + Double vol; + @ApiParam(value = "物料体积(m3)") + Double partTotalVol; + @ApiParam(value = "物料号") + String partNo; + + public WmsRecommendCarModel(String partNo, Double partNoSum, Double vol, Double snp,Double partTotalVol, + String organizeCode,Long id,String planTimeStart) { + this.partNo = partNo; + this.partNoSum = partNoSum; + this.vol = vol; + this.snp = snp; + this.partTotalVol = partTotalVol; + this.organizeCode = organizeCode; + this.id = id; + this.planTimeStart = planTimeStart; + } + + // @ApiParam(value = "车辆编号") +// String carNo; +// @ApiParam(value = "车辆名称") +// String carDesc; +// @ApiParam(value = "容积(m3)") +// Double volume; +// @ApiParam(value = "需要(辆)") +// Integer carQty; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java new file mode 100644 index 0000000..caed630 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsShipModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 委外扣减库存 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-08-31 9:44 + * @Modify: + **/ +@Data +@Api("委外扣减库存模型") +public class WmsShipModel extends BaseBean { + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam("物料编码") + private String shipPartNo; + + @ApiParam("物料名称") + public String shipPartName; + + @ApiParam("简称及版本") + private String rcPartNo; + + @ApiParam("项目名称") + private String prodCfgTypeName; + + @ApiParam("单位") + public String unit; + + @ApiParam("委外发运数量") + public Double shipQty; + + @ApiParam("发运存储区代码") + public String shipZoneNo; + + @ApiParam("ASN收货数量") + private Double rcQty; + + @ApiParam("ASN收货存储区代码") + public String rcZoneNo; + + @ApiParam("委外库存数量") + private Double shipStockQty; + + @ApiParam("委外发运时间") + private String shipTime; + + @ApiParam(value="发运时间，查询起始日期") + public String shipTimeStart; + + @ApiParam(value = "发运时间，查询结束日期") + public String shipTimeEnd; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index a3fd7c8..b719cdd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -17,6 +17,12 @@ import lombok.Data; public class WmsVendorDelayMasterModel extends BaseBean { private static final long serialVersionUID = 1589775350017343999L; + @ApiParam(value = "订单号") + private String orderNo; + + @ApiParam(value = "原因") + public String reason; + @ApiParam(value = "供应商代码") private String vendorNo; @@ -26,12 +32,31 @@ public class WmsVendorDelayMasterModel extends BaseBean { @ApiParam(value = "延迟次数") private Long delayCount; + @ApiParam(value = "延迟次数") + private Long sumDelayCount; + + @ApiParam(value = "延迟到货百分比") + private String delayPercent; + @ApiParam(value = "查询开始时间") private String startDateTime; @ApiParam(value = "查询结束时间") private String endDateTime; + @ApiParam("计划交货日期") + private String planDate; + + @ApiParam("计划交货时间") + private String planTime; + + @ApiParam("实际交货时间") + private String actualPlanTime; + + @ApiParam("计划交货时间") + private String planPlanDateTime; + + public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) { this.vendorNo = vendorNo; this.vendorName = vendorName; @@ -40,7 +65,25 @@ public class WmsVendorDelayMasterModel extends BaseBean { this.createDatetime = createDateTime; } + public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, + String actualPlanTime, String vendorNo, String vendorName, String organizeCode) { + this.orderNo = orderNo; + this.reason = reason; + this.planDate = planDate; + this.planTime = planTime; + this.actualPlanTime = actualPlanTime; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.organizeCode = organizeCode; + } + + public WmsVendorDelayMasterModel(String vendorNo, Long delayCount) { + this.vendorNo = vendorNo; + this.delayCount = delayCount; + } + public WmsVendorDelayMasterModel() { } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java index 97dad56..4d30cc8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -21,4 +21,11 @@ public interface WmsConfigRepository extends BaseRepository { * @return 配置信息 */ WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode); + + /** + * 按照配置代码查询配置信息 + * @param configCode 配置代码 + * @return 配置信息 + */ + WmsConfig getFirstByConfigCode(String configCode); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java new file mode 100644 index 0000000..06e360b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsEnum; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsEnumRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java new file mode 100644 index 0000000..114da9d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCOGISnapshot; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpCOGIRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java new file mode 100644 index 0000000..e21870a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCheckPoint; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpCheckPointRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java new file mode 100644 index 0000000..02b6561 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpQuanAreas; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpQuanAreasRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java new file mode 100644 index 0000000..2a767bb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpStockQuanSnapshot; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpStockQuanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java new file mode 100644 index 0000000..eea6e36 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataRecord; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsInterfaceDataRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java new file mode 100644 index 0000000..fca0c32 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartChange; +import org.springframework.stereotype.Repository; + +/** + * @Description : 零件装换信息数据访问层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-08-19 + * @Modify: + **/ +@Repository +public interface WmsPartChangeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java new file mode 100644 index 0000000..936dfdd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPickingWindowTime; +import org.springframework.stereotype.Repository; + +/** + * @Description :领料时长分区 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-10-21 19:21 + * @Modify: + **/ +@Repository +public interface WmsPickingWindowTimeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java new file mode 100644 index 0000000..da8fa53 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPlc; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-10-28 10:47 + * @Modify: + **/ +@Repository +public interface WmsPlcRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java new file mode 100644 index 0000000..dc6b275 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsProductVersion; +import org.springframework.stereotype.Repository; + +/** + * @Description 生产版本DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/12/4 18:49 + * @Modify + */ +@Repository +public interface WmsProductVersionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java new file mode 100644 index 0000000..8fe97a0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCSNErrorList; +import org.springframework.stereotype.Repository; + +/** + * @Description : 质检单条码不良操作类 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-02 21:06 + * @Modify: + **/ +@Repository +public interface WmsQCSNErrorListRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java new file mode 100644 index 0000000..75ea2be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsServiceLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 服务调用详细日志表 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-19 16:04 + * @Modify: + **/ +@Repository +public interface WmsServiceLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java new file mode 100644 index 0000000..c671f1b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsUserPrinterInfo; + +/** + * @Description 用户打印机绑定信息DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/12/17 15:42 + * @Modify + */ +public interface WmsUserPrinterInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java new file mode 100644 index 0000000..9a10063 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorDock; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description 供应商道口DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/11/25 14:43 + * @Modify + */ +@Repository +public interface WmsVendorDockRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendPartCheckRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendPartCheckRepository.java new file mode 100644 index 0000000..a3e14ea --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendPartCheckRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository.mesdata; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendPartCheck; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +/** +* @Description : 库存条码dao层 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-17 15:53 +* @Modify: +**/ +public interface WmsSendPartCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendSnCheckRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendSnCheckRepository.java new file mode 100644 index 0000000..9a54049 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendSnCheckRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository.mesdata; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendSnCheck; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +/** +* @Description : 库存条码dao层 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-17 15:53 +* @Modify: +**/ +public interface WmsSendSnCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index cbddf7b..571116c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -16,16 +16,14 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; -import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; /** * @Description : 仓库管理对象封装 @@ -50,7 +48,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); @@ -179,7 +176,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); - DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); @@ -220,14 +217,27 @@ public class WmsHqlPack { public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { DdlPackBean packBean = new DdlPackBean(); - //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + //查询参数封装PROD_SCRAP + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); + //滤掉业务类型 + if (!StringUtil.isEmpty(wmsDocMovementMaster.getFilterBusiType())) { + List filterBusiType = new ArrayList<>(); + for (String busiType : wmsDocMovementMaster.getFilterBusiType().split(",")) { + filterBusiType.add(Integer.parseInt(busiType)); + } + DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", System.currentTimeMillis() + "", packBean); + } DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean); DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean); + + getStringBuilderPack(wmsDocMovementMaster, packBean); return packBean; @@ -262,12 +272,12 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getErpSrcNo(), "erpSrcNo", result); DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result); if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { ArrayList numList = new ArrayList<>(); @@ -279,10 +289,10 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); } - - // 查询计划时间在指定范围的单号，查询这些单号的数据 - if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { + if (!CollectionUtils.isEmpty(wmsPOMaster.getOrderNoList())) { DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); + } else { + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); } //按创建时间查询单据信息 @@ -290,7 +300,10 @@ public class WmsHqlPack { DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(), wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true); } - + if (StringUtils.isNotBlank(wmsPOMaster.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(), + wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + } getStringBuilderPack(wmsPOMaster, result); return result; @@ -395,7 +408,16 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); - DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); + if (!StringUtil.isEmpty(wmsPart.getPartType()) && wmsPart.getPartType().contains(",")) { + String types[] = wmsPart.getPartType().split(","); + List partTypes = new ArrayList<>(); + for (String type : types) { + partTypes.add(type); + } + DdlPreparedPack.getInPackList(partTypes, "partType", result); + } else { + DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); + } DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result); getStringBuilderPack(wmsPart, result); @@ -563,7 +585,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); if (wmsLocate.getZoneNo() != null) { - DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); + DdlPreparedPack.getInPackArray(wmsLocate.getZoneNo().split(","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { DdlPreparedPack.getInPackArray(wmsLocate.getLocateNoArr(), "locateNo", result); @@ -741,7 +763,6 @@ public class WmsHqlPack { //单据来源 DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result); getStringBuilderPack(wmsShipping, result); - getStringBuilderPack(wmsShipping, result); return result; } @@ -1196,11 +1217,20 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + //实时库存待处理数据 + if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && !StringUtil.isEmpty(wmsMoveDetails.getZoneNo())) { + List columnNames = new ArrayList<>(); + columnNames.add("srcZoneNo"); + columnNames.add("destZoneNo"); + DdlPreparedPack.getMultOrPackString(wmsMoveDetails.getZoneNo(), columnNames, null, packBean); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.MOVE_ORDER_STATUS.BE_HANDLE.getValue(), "itemStatus", packBean); + } else { + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); + } DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean); - DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", packBean); DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", packBean); @@ -1343,8 +1373,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { + DdlPreparedPack.getNumberBiggerPackContainsZero(0.0, "qty", result); + } if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) { wmsStockSn.setQualityDateTimeStart(""); } @@ -1562,6 +1596,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsScriptModule(), "isScriptModule", result); return result; } @@ -1634,6 +1669,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getItem(), "item", result); DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); @@ -1717,11 +1753,14 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { DdlPackBean result = new DdlPackBean(); + //DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - DdlPreparedPack.getOrderByPack( + /*DdlPreparedPack.getOrderByPack( new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE}, - new String[]{"sn", "createDatetime"}, result); + new String[]{"sn", "createDatetime"}, result);*/ +// result.setWhereAppend(result.getWhereAppend() + " and sn <> '"+wmsStockSn.getSn()+"'"); + return result; } @@ -1971,7 +2010,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsConfig(WmsConfig wmsConfig) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + DdlPreparedPack.getStringLikerPack(wmsConfig.getConfigCode(), "configCode", result); DdlPreparedPack.getStringLikerPack(wmsConfig.getName(), "name", result); DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result); DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result); @@ -1991,6 +2030,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); + if (!StringUtil.isEmpty(wmsDocMovementSn.getItem())) { + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result); + } DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); @@ -1998,6 +2040,7 @@ public class WmsHqlPack { return result; } + /** * 移库单订单条码表 分页查询 * @@ -2510,6 +2553,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result); DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result); DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getInterfaceName(), "interfaceName", result); getStringBuilderPack(wmsInterfaceDataMapper, result); @@ -2614,7 +2658,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsActionLogByActionLogData(WmsActionLogData actionLogData) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean); + //DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean); DdlPreparedPack.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getNumEqualPack(actionLogData.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", packBean); @@ -2782,7 +2826,10 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result); DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result); - + if (wmsShift.isStartTimeAndEndTime() && !StringUtil.isEmpty(wmsShift.getStartTime())) { + result.setWhereAppend(result.getWhereAppend() + " and model.startTime<='" + wmsShift.getStartTime() + "'"); + result.setWhereAppend(result.getWhereAppend() + " and model.endTime>='" + wmsShift.getStartTime() + "'"); + } getStringBuilderPack(wmsShift, result); return result; @@ -2815,7 +2862,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlMesPpMaster(MesPpMaster mesPpMaster) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(mesPpMaster.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringLikerPack(mesPpMaster.getWorkOrderNo(), "workOrderNo", result); DdlPreparedPack.getNumEqualPack(mesPpMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(mesPpMaster.getPdlineNo(), "pdlineNo", result); DdlPreparedPack.getStringBiggerPack(mesPpMaster.getStartProductTime(), "startProductTime", result); @@ -2836,7 +2883,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(mesPpDetails.getPartNo(), "partNo", result); - DdlPreparedPack.getStringEqualPack(mesPpDetails.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringEqualPack(mesPpDetails.getWorkOrderNo(), "workOrderNo", result); getStringBuilderPack(mesPpDetails, result); @@ -2863,7 +2910,7 @@ public class WmsHqlPack { } DdlPreparedPack.getInPackList(integerList, "orderStatus", result); - DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWorkOrderNo(), "workOrderNo", result); DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result); DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result); DdlPreparedPack.getStringSmallerPack(wmsPullTaskMaster.getEndProductTime(), "endProductTime", result); @@ -2881,7 +2928,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWorkOrderNo(), "workOrderNo", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result); getStringBuilderPack(wmsPullTaskDetails, result); @@ -2985,7 +3032,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); - DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); getStringBuilderPack(wmsFieldInfo, result); return result; } @@ -3171,7 +3218,13 @@ public class WmsHqlPack { public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result); +/* if (details.getIsRequire() != null) { + DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result); + }*/ getStringBuilderPack(details, result); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, + new String[]{"seq"}, result); return result; } @@ -3221,7 +3274,11 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result); - DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result); + /** + * @Author : gsz 2021/04/09 + * 15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430 + **/ + DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result); if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) { @@ -3472,4 +3529,46 @@ public class WmsHqlPack { return result; } + + /** + * 字典查询 + * + * @param wmsEnum + * @return + */ + public static DdlPackBean packHqlWmsEnum(WmsEnum wmsEnum) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsEnum.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumType(), "enumType", result); + DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumValue(), "enumValue", result); + + getStringBuilderPack(wmsEnum, result); + + return result; + } + + + /** + * 领料时长分区分页查询条件 + * + * @param wmsPickingWindowTime + * @return + */ + public static DdlPackBean packHqlWmsPickingWindowTime(WmsPickingWindowTime wmsPickingWindowTime) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPickingWindowTime.getShiftNo(), "shiftNo", result); + + getStringBuilderPack(wmsPickingWindowTime, result); + + return result; + } + public static DdlPackBean packHqlWmsDock(WmsDock wmsDock) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringRightLikerPack(wmsDock.getDockCode(), "dockCode", result); + getStringBuilderPack(wmsDock, result); + return result; + } } diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..5fcd08a 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-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2eddf76..f250672 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ i3plus-pojo pom 1.0-DEV-SNAPSHOT + modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -28,7 +29,6 @@ modules/i3plus-pojo-report modules/i3plus-pojo-softswitch modules/i3plus-pojo-workflow - modules/i3plus-pojo-mes-pcn modules/i3plus-pojo-sweb modules/i3plus-pojo-andon modules/i3plus-pojo-aps @@ -36,6 +36,7 @@ modules/i3plus-pojo-ptl modules/i3plus-pojo-ics modules/i3plus-pojo-mdm + modules/i3plus-pojo-screen @@ -50,11 +51,6 @@ - - org.springframework.boot - spring-boot-starter-data-mongodb - - io.springfox diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..8c37b31 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,6 +5,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo + # defaults to 'not provided' sonar.projectVersion=1.0-DEV-SNAPSHOT