diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/.DS_Store differ 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 new file mode 100644 index 0000000..979bd4b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; + +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 = "ANDON_ACTION_MODULE") +@EqualsAndHashCode(callSuper = true) +@Api("作业组件") +public class AndonActionModule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8909733530761576575L; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "AM_NAME") + @ApiParam("组件名称") + private String amName; + + @Column(name = "AM_DESC") + @ApiParam("组件描述") + private String amDesc; + + @Column(name = "CALL_CLASS") + @ApiParam("实现类") + private String callClass; + + @Column(name = "AM_TYPE") + @ApiParam("组件类型") + private Integer amType; + + @Transient + @ApiParam("执行顺序") + private Integer seq; +} 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 new file mode 100644 index 0000000..6a3af09 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTION_MODULE_GROUP") +@EqualsAndHashCode(callSuper = true) +@Api("组件集") +public class AndonActionModuleGroup extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8905502301880084578L; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "SEQ") + @ApiParam("执行顺序") + private Integer seq; +} 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 new file mode 100644 index 0000000..5364d0b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTION_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("组件参数") +public class AndonActionModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8216680446587969610L; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_TYPE") + @ApiParam("参数类型") + private String paramType; + + @Column(name = "DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + +} 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 new file mode 100644 index 0000000..c24541f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/05/08 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTION_ROUTE") +@EqualsAndHashCode(callSuper = true) +@Api("作业流程") +public class AndonActionRoute extends BaseBean implements Serializable { + + private static final long serialVersionUID = 917593748015715793L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_NAME") + @ApiParam("流程名称") + private String routeName; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型") + private Integer routeType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS位置") + private String position; +} 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 new file mode 100644 index 0000000..9e23c15 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTOR") +@EqualsAndHashCode(callSuper = true) +@Api("ACTOR信息") +public class AndonActor extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1472090790204808649L; + + @Column(name = "ACTOR_CODE") + @ApiParam("actor代码") + private String actorCode; + + @Column(name = "ACTOR_NAME") + @ApiParam("actor名称") + private String actorName; + + @Column(name = "ACTOR_Class") + @ApiParam("actor类名") + private String actorClass; + + +} 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 new file mode 100644 index 0000000..81e2f4b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ACTOR_RULE") +@EqualsAndHashCode(callSuper = true) +@Api("ACTOR消息类型配置") +public class AndonActorRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3244584643305867326L; + + @Column(name = "ACTOR_CODE") + @ApiParam("actor代码") + private String actorCode; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "SPECIFIC_RULE") + @ApiParam("特定条件") + private String specificRule; + +} 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 749eae4..c8767a5 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_呼叫原因 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "ANDON_呼叫原因") -public class AndonAlarmCause extends BaseBean { +public class AndonAlarmCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5837347497945981811L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") 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 1ec4182..0594355 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 安灯子类型 @@ -28,7 +29,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯子类型") -public class AndonAlarmDetailType extends BaseBean { +public class AndonAlarmDetailType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1540491136291384925L; @Column(name = "ALARM_DETAIL_CODE") @ApiParam(value = "安灯子类型编码") 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 e0bbc8e..286fcbc 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_呼叫通知配置 @@ -28,7 +29,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_呼叫通知配置") -public class AndonAlarmResponseCfg extends BaseBean { +public class AndonAlarmResponseCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4302725908675374347L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") 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 new file mode 100644 index 0000000..17279ed --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ALARM_ROUTE") +@EqualsAndHashCode(callSuper = true) +@Api("安灯作业流程配置") +public class AndonAlarmRoute extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7425423934619147746L; + + @Column(name = "ALARM_CODE") + @ApiParam("安灯类型代码") + private String alarmCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型") + private Integer routeType; + + @Transient + @ApiParam("安灯类型名称") + private String alarmName; + + @Transient + @ApiParam("流程名称") + private String routeName; + +} 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 new file mode 100644 index 0000000..8a9523c --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("安灯作业流程组件参数") +public class AndonAlarmRouteModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6659953988053255710L; + + @Column(name = "ALARM_ROUTE_ID") + @ApiParam("安灯流程ID") + private Long alarmRouteId; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; +} 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 new file mode 100644 index 0000000..493a665 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ALARM_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("安灯类型") +public class AndonAlarmType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3286588436625932653L; + + @Column(name = "ALARM_CODE") + @ApiParam("安灯类型代码") + private String alarmCode; + + @Column(name = "ALARM_NAME") + @ApiParam("安灯类型名称") + private String alarmName; + + @Column(name = "CODE") + @ApiParam("菜单编号") + private String code; + + @Column(name = "COLOR") + @ApiParam("BI颜色") + private String color; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Transient + @ApiParam("安灯类型代码") + private String value; + + @Transient + @ApiParam("安灯类型名称") + private String description; + + @Transient + @ApiParam("工作中心") + private String workCenterCode; + +} 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 new file mode 100644 index 0000000..84b7e5d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_AREA_ALARM_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("区域安灯类型") +public class AndonAreaAlarmType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6551224785612729594L; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "ALARM_CODE") + @ApiParam("安灯类型代码") + private String alarmCode; + +} 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 afd4cb0..82bfda2 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :安灯广播 @@ -27,7 +28,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_BROADCAST") @Api("安灯广播") -public class AndonBroadCast extends BaseBean { +public class AndonBroadCast extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5383684820100076411L; + @Column(name="DEVICE_NUM") @ApiParam("广播设备编号") private String targetIds; 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 750e650..698bebb 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -30,7 +31,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_BROADCAST_CFG") @Api("生产区域") -public class AndonBroadCastCfg extends BaseBean { +public class AndonBroadCastCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5434544329665544113L; + @Column(name="ALARM_CODE") @ApiParam("安灯类型代码") private String alarmCode; 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 9d9df79..edaab1e 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_工作单元呼叫原因配置 @@ -29,7 +30,10 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元呼叫原因配置") -public class AndonCellAlarmCause extends BaseBean { +public class AndonCellAlarmCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3623997837738333774L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; @@ -47,10 +51,12 @@ public class AndonCellAlarmCause extends BaseBean { @ApiParam(value = "事件描述") private String acCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "安灯类型名称") private String alarmCodeName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "呼叫原因描述") private String acName; 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 1be0a94..abf5ff9 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_工作单元事件原因配置 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元事件原因配置") -public class AndonCellEventCause extends BaseBean { +public class AndonCellEventCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1641944472466007171L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") 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 00dea5f..23c8d1b 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_工作单元处理方法配置 @@ -29,7 +30,10 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元处理方法配置") -public class AndonCellEventMethod extends BaseBean { +public class AndonCellEventMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8681966862823447650L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; 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 8cfd0b7..ef790dc 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_工作单元事件现象 @@ -26,7 +27,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元事件现象") -public class AndonCellEventPhenomenon extends BaseBean { +public class AndonCellEventPhenomenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4413846938406056923L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") 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 c194faf..cd82b84 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 @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_工位分组配置 @@ -29,7 +30,10 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工位分组配置") -public class AndonCellGroupCfg extends BaseBean { +public class AndonCellGroupCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4801397986303698999L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; 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 0f39a62..a6653c7 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 系统参数配置 @@ -26,7 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_CONFIG") @Api(value="系统配置") -public class AndonConfig extends BaseBean { +public class AndonConfig extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3284234821448139251L; @Column(name="NAME") @ApiParam(value ="名称") 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 9f8d287..1db40c9 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 @@ -14,7 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.List; +import java.io.Serializable; /** * @Description : ANDON_自处理配置 @@ -30,7 +30,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_自处理配置") -public class AndonDisposalCfg extends BaseBean { +public class AndonDisposalCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 161656982939855466L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") 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 83e1572..d2bd2cd 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 @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: 自处理维护配置 @@ -29,7 +30,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("Andon自处理维护配置") -public class AndonDisposalMaintenCfg extends BaseBean { +public class AndonDisposalMaintenCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 474667557264134793L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") 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 2491043..91bb41b 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_事件原因 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "ANDON_事件原因") -public class AndonEventCause extends BaseBean { +public class AndonEventCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3051829000971794178L; @Column(name = "EC_CODE") @ApiParam(value = "事件原因代码") 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 f681bb6..c5371c6 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_事件处理方法 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "ANDON_事件处理方法") -public class AndonEventMethod extends BaseBean { +public class AndonEventMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2079366249221906256L; @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") 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 43877a3..52cf481 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_事件现象 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_事件现象") -public class AndonEventPhenoMenon extends BaseBean { +public class AndonEventPhenoMenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3844606172813258352L; @Column(name = "EPM_CODE") @ApiParam(value = "事件现象代码") 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 95aa421..a7dcae8 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 安灯停线配置数据 @@ -34,7 +35,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonHaltCfg extends BaseBean { +public class AndonHaltCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6209233767460121461L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") 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 3c89d14..4def408 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_停机类型 @@ -26,7 +27,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_停机类型") -public class AndonHaltType extends BaseBean { +public class AndonHaltType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7816748747119429173L; @Column(name = "HALT_CODE") @ApiParam(value = "停机类型编码") 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 ff4853d..6213675 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,10 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON知识库") -public class AndonKnowledgeBase extends BaseManageQueue { +public class AndonKnowledgeBase extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = -1636250887271456543L; + @Column(name = "FLOW_STATUS") @ApiParam(value = "审批状态") private Integer flowStatus; 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 f2be38c..2c741b0 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 @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -41,7 +42,22 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonManageQueue extends BaseManageQueue { +public class AndonManageQueue extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = 183865984747203897L; + + @Transient + @ApiParam(value ="触发事件") + private String triggerEvent; + + @Column(name = "ROUTE_CODE") + @ApiParam(value = "流程代码") + private String routeCode; + + @Column(name = "ROUTE_STATUS_CODE") + @ApiParam(value = "状态点代码") + private String routeStatusCode; + @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; @@ -283,9 +299,13 @@ public class AndonManageQueue extends BaseManageQueue { /** * 工位统计 构造函数 * @param workCenterCode + * @param workCenterNameRdd * @param workCellCode + * @param workCellNameRdd * @param equipmentCode + * @param equipmentNameRdd * @param shiftCode + * @param shiftNameRdd * @param alarmCode * @param andonCount */ @@ -304,12 +324,14 @@ public class AndonManageQueue extends BaseManageQueue { /** * 原因统计 使用Java内存计算（获取原始数据） + * @param acCode + * @param acNameRdd * @param workCenterCode * @param workCenterNameRdd * @param workCellCode * @param workCellNameRdd * @param alarmCode - * @param ecCodec + * @param ecCode * @param ecNameRdd * @param emCode * @param emNameRdd @@ -336,6 +358,10 @@ public class AndonManageQueue extends BaseManageQueue { /** * 人员统计 使用Java内存计算（获取原始数据） + * @param organizeCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd * @param resetUser * @param alarmCode * @param callTime @@ -356,6 +382,7 @@ public class AndonManageQueue extends BaseManageQueue { /** * 统计分析柏拉图 使用JAVA内存计算（获取原始数据） + * @param workCenterNameRdd * @param alarmCode * @param ecCode * @param ecNameRdd @@ -401,4 +428,5 @@ public class AndonManageQueue extends BaseManageQueue { e.printStackTrace(); } } + } 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 a5d557a..3e41a51 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 安灯记录 @@ -36,7 +37,17 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯记录") -public class AndonManageRecord extends BaseManageQueue { +public class AndonManageRecord extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = 4667499369694353351L; + + @Column(name = "ROUTE_CODE") + @ApiParam(value = "流程代码") + private String routeCode; + + @Column(name = "ROUTE_STATUS_CODE") + @ApiParam(value = "状态点代码") + private String routeStatusCode; @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") 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 5c81250..e34f15d 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 @@ -10,10 +10,8 @@ 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; /** * @Description: 安灯通知记录表 @@ -29,7 +27,10 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("通知记录") -public class AndonMessageRecord extends BaseBean { +public class AndonMessageRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5002185160195696080L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心") private String workCenterCode; @@ -77,4 +78,9 @@ public class AndonMessageRecord extends BaseBean { @Column(name = "MEMO") @ApiParam(value = "备注") private String memo; + + @Lob + @Column(name = "MESSAGE") + @ApiParam(value = "广播内容") + private String message; } 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 new file mode 100644 index 0000000..519d5bf --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_MESSAGE_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("消息类型") +public class AndonMessageType extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6140381522677959027L; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "MT_NAME") + @ApiParam("消息类型名称") + private String mtName; + +} 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 e9bbc29..385b069 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 @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_PLC控制 @@ -30,7 +31,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯PLC控制") -public class AndonPLC extends BaseBean { +public class AndonPLC extends BaseBean implements Serializable { + + private static final long serialVersionUID = -611094238158756163L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心") 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 33078db..ee4c926 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 @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_PLC监控记录 @@ -34,7 +35,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯PLC监控记录") -public class AndonPLCRecord extends BaseBean { +public class AndonPLCRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1593292976397416635L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") 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 31fda6a..cf92a50 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 安灯任务附属表 @@ -26,7 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_MANAGE_ATTACH") @Api(value="安灯附属表") -public class AndonQueueAttach extends BaseBean { +public class AndonQueueAttach extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6314624948969141111L; @Column(name="PROD_INFO") @ApiParam(value ="产品信息" , example ="-1") 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 fee0346..2a428d1 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -28,7 +29,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("通知方式") -public class AndonResponse extends BaseBean { +public class AndonResponse extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3558849492798328348L; @Column(name = "RESPONSE_CODE") @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") 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 b2ad1a2..7236d3a 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 @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : 安灯通知对象 @@ -28,7 +29,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯通知对象") -public class AndonResponseObject extends BaseBean { +public class AndonResponseObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7623038823371770473L; @Column(name = "RP_OBJECT_CODE") @ApiParam(value = "通知对象对象编码") 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 new file mode 100644 index 0000000..882ba39 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : ANDON_上升流程配置 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 9:53 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_RITE_ROUTE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_上升流程配置") +public class AndonRiteRoute extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5542314911937418047L; + + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description") + @Column(name = "ANDON_STATUS") + @ApiParam(value = "安灯状态") + private String andonStatus; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Column(name = "MEMO") + @ApiParam(value = "备注") + private String memo; + + @AnnoOutputColumn(hidden = true) + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; +} 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 new file mode 100644 index 0000000..b15ee39 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : ANDON_上升配置明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 9:53 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_RITE_ROUTE_DETAIL") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_上升配置明细") +public class AndonRiteRouteDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8382210828244626428L; + + @Column(name = "RITE_ROUTE_ID") + @ApiParam(value = "上升流程配置ID") + private Long riteRouteId; + + @Column(name = "RP_WHERE") + @ApiParam(value = "通知时间") + private String rpWhere; + + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") + @Column(name = "RP_CODE") + @ApiParam(value = "通知方式代码") + private String rpCode; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "通知对象") + private String rpObjectCode; + + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description") + @Column(name = "RP_LEVEL") + @ApiParam(value = "通知级别") + private String rpLevel; + +} 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 new file mode 100644 index 0000000..fd7db4f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.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 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 = "ANDON_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("流程组件参数") +public class AndonRouteModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -282175947799144290L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; +} 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 new file mode 100644 index 0000000..bf2755c --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -0,0 +1,99 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ROUTE_STATUS") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态") +public class AndonRouteStatus extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2091426896667989586L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Long actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入状态调用") + private Long inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开状态调用") + private Long outAmgId; + + @Column(name = "STATUS_TYPE") + @ApiParam("状态类型") + private Integer statusType; + + @Column(name = "INTERFACE_NO") + @ApiParam("界面编号") + private String interfaceNo; + + @Transient + @ApiParam("安灯流程ID") + private Long alarmRouteId; + + @Transient + @ApiParam("当前状态点的触发组件集默认未执行") + private boolean actionAmgIdFalg = false; + + @Transient + @ApiParam("进入触发方法时默认不需要校验外部触发") + private boolean checkTriggerTypeFalg = false; + + @Transient + @ApiParam("每个组件执行完成根据业务设置下个触发事件，如果需要外部告知下个触发事件则设置null，一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent") + private String nextTriggerEvent; + +} 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 new file mode 100644 index 0000000..ceaea06 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态异常记录") +public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4046192879130584866L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @Column(name = "ERROR_DESC") + @ApiParam(value = "异常描述") + public String errorDesc; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + public String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元") + public String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + public String alarmCode; + + @Column(name = "SOURCE_TYPE") + @ApiParam(value = "安灯来源类型") + private String sourceType; + + @Column(name = "CACHE_KEY") + @ApiParam(value = "缓存KEY") + private String cacheKey; + + @Column(name = "HANDLE_STATUS") + @ApiParam(value = "处理状态") + private Integer handleStatus; + +} 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 ae42d1b..3316350 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 @@ -16,6 +16,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -32,7 +33,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="MES_AREA") @Api("生产区域") -public class MesArea extends BaseBean { +public class MesArea extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6011431901401687892L; + @Column(name="AREA_CODE") @ApiParam("区域代码") private String areaCode; 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 59d6249..2761fab 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 @@ -17,6 +17,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :生产设备 @@ -32,7 +33,10 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="MES_EQUIPMENT") @Api("生产设备") -public class MesEquipment extends BaseBean { +public class MesEquipment extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4827453020382814751L; + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; 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 533c56a..9098f6b 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="MES_SHIFT") @Api("班次信息") -public class MesShift extends BaseBean { +public class MesShift extends BaseBean implements Serializable { + + private static final long serialVersionUID = -459263592129978101L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") 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 0533141..8bb58e7 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 @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,7 +32,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL") @Api("工作单元") -public class MesWorkCell extends BaseBean { +public class MesWorkCell extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5981041286446162921L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; 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 eb81426..8cf20a2 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 @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,7 +32,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CENTER") @Api("工作中心") -public class MesWorkCenter extends BaseBean { +public class MesWorkCenter extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1988041859547182829L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java new file mode 100644 index 0000000..f88be43 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/2/12 18:18 + * @desc + */ +@Data +@ApiModel("作业组件model") +public class ActionModuleModel { + + @ApiModelProperty("组件代码") + private String amCode; + + @ApiModelProperty("调用类") + private String callClass; + + @ApiModelProperty("是否完成") + private Boolean isComplete; + + @ApiModelProperty("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java new file mode 100644 index 0000000..a616354 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam; +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class AndonActionModuleGroupModel implements Serializable { + + private static final long serialVersionUID = 2483914575357867288L; + + @ApiParam("组件代码") + private String amCode; + + @ApiParam("执行顺序") + private Integer seq; + + @ApiParam("流程组件参数集合") + private List routeModuleParamList; + + @ApiParam("安灯流程组件参数集合") + private List alarmRouteModuleParamList; +} 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 6c8ff91..6c046d9 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 @@ -13,7 +13,9 @@ import java.io.Serializable; * @Modify: **/ @Data -public class AndonBoardModel { +public class AndonBoardModel implements Serializable { + + private static final long serialVersionUID = 4995310176494124290L; @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java new file mode 100644 index 0000000..db1fd3c --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 作业流程Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("作业流程Model") +public class AndonBussinessProcessModel implements Serializable { + + private static final long serialVersionUID = 801986911134685985L; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("GOJS位置") + private String position; + + @ApiParam("流程明细Model集合") + private List processDetailModelList; + + @ApiParam("安灯流程ID") + private Long alarmRouteId; + +} 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 79813f6..06230c4 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 @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -16,7 +17,9 @@ import java.util.List; * @Modify: **/ @Data -public class AndonMenuInterfaceModel{ +public class AndonMenuInterfaceModel implements Serializable { + + private static final long serialVersionUID = 6854130571481363067L; @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java new file mode 100644 index 0000000..929eb24 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.andon.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; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class AndonProcessDetailModel implements Serializable { + + private static final long serialVersionUID = 5240991498276455147L; + + @ApiParam("状态代码") + private String statusCode; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("触发类型") + private Integer triggerType; + + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @ApiParam("组件集MAP") + private Map> actionModuleGroupMap; + + @ApiParam("下个状态点MAP") + private Map nextStatusMap; + + @ApiParam("触发调用") + private Long actionAmgId; + + @ApiParam("进入状态调用") + private Long inAmgId; + + @ApiParam("离开状态调用") + private Long outAmgId; + + @ApiParam("界面编号") + private String interfaceNo; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java new file mode 100644 index 0000000..efc27bb --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 上升配置明细model + * @Reference: + * @Author: wangjie + * @CreateDate:2019-11-12-10:21 + * @Modify: + **/ +@Data +public class AndonRiteRouteDetailModel implements Serializable { + + private static final long serialVersionUID = 1993963582174708808L; + + @ApiParam(value = "安灯类型") + private String alarmCode; + + @ApiParam(value = "安灯状态") + private String andonStatus; + + @ApiParam(value = "工作中心") + private String workCenterCode; + + @ApiParam(value = "备注") + private String memo; + + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; + + @ApiParam(value = "上升流程配置ID") + private Long riteRouteId; + + @ApiParam(value = "通知时间") + private String rpWhere; + + @ApiParam(value = "通知方式代码") + private String rpCode; + + @ApiParam(value = "通知对象") + private String rpObjectCode; + + @ApiParam(value = "通知级别") + private String rpLevel; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java new file mode 100644 index 0000000..a1849c2 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@ApiModel("状态点model") +public class AndonRouteStatusModel implements Serializable { + + private static final long serialVersionUID = -6258870691272170423L; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("状态代码") + private String statusCode; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("下一状态") + private String nextStatus; + + @ApiParam("触发类型") + private Integer triggerType; + + @ApiParam("触发事件") + private String triggerEvent; + + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @ApiParam("触发调用") + private Long actionAmgId; + + @ApiParam("进入状态调用") + private Long inAmgId; + + @ApiParam("离开状态调用") + private Long outAmgId; + + @ApiParam("状态类型") + private Integer statusType; + + @ApiParam("安灯类型代码") + private String alarmCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("流程类型") + private Integer routeType; + + @ApiParam("界面编号") + private String interfaceNo; + + @ApiParam("安灯流程ID") + private Long alarmRouteId; + + public AndonRouteStatusModel() { + } + + public AndonRouteStatusModel(String routeCode, String statusCode, String statusName, String nextStatus, Integer triggerType, + String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId, Integer statusType, + String interfaceNo, String alarmCode, String workCenterCode, Integer routeType, Long alarmRouteId) { + this.routeCode = routeCode; + this.statusCode = statusCode; + this.statusName = statusName; + this.nextStatus = nextStatus; + this.triggerType = triggerType; + this.triggerEvent = triggerEvent; + this.triggerWhere = triggerWhere; + this.actionAmgId = actionAmgId; + this.inAmgId = inAmgId; + this.outAmgId = outAmgId; + this.statusType = statusType; + this.interfaceNo = interfaceNo; + this.alarmCode = alarmCode; + this.workCenterCode = workCenterCode; + this.routeType = routeType; + this.alarmRouteId = alarmRouteId; + } +} 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 5585338..e35260e 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 @@ -9,6 +9,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.MappedSuperclass; +import java.io.Serializable; /** * @Description: @@ -19,7 +20,9 @@ import javax.persistence.MappedSuperclass; **/ @Data @MappedSuperclass -public class BaseManageQueue extends BaseBean { +public class BaseManageQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5223610541891941843L; @Column(name = "ANDON_ORDER_NO") @ApiParam(value = "安灯队列编号") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java index 42af00f..217927d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java @@ -12,13 +12,16 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import java.io.Serializable; import java.util.List; /** * 工位分组配置model */ @Data -public class CellGroupStatusModel{ +public class CellGroupStatusModel implements Serializable { + + private static final long serialVersionUID = -6614881484056090725L; @ApiParam("工作中心代码") private String workCenterCode; 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 new file mode 100644 index 0000000..47588b4 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus; +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 wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@ApiModel("通用数据传输对象") +public class CommonMsgModel implements Serializable { + + private static final long serialVersionUID = -1772176070851992335L; + + @ApiModelProperty("工厂") + private String organizeCode; + + @ApiModelProperty("用户信息") + private String userInfo; + + @ApiModelProperty("消息类型") + private String msgType; + + @ApiModelProperty("消息数据") + private Map msgData; + + @ApiModelProperty("流程状态集合") + private List routeStatusList; + + @ApiModelProperty("当前流程状态") + private AndonRouteStatus curRouteStatus; + + @ApiModelProperty("触发事件") + private String triggerEvent; + + @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") + private boolean errorInnerAction = false; + + @ApiModelProperty("默认异常入库") + private boolean errorInsertFlag = true; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java index 5df7d8d..d7be692 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Entity; +import java.io.Serializable; /** * @Description: @@ -23,7 +24,9 @@ import javax.persistence.Entity; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("组织模型") -public class ProdOrgModel extends BaseBean { +public class ProdOrgModel extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2210888838877951435L; @ApiParam("区域名称") private String areaName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java index 53e0faf..6f78bda 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java @@ -4,9 +4,12 @@ import cn.estsh.i3plus.pojo.andon.bean.MesArea; import io.swagger.annotations.ApiParam; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; -public class SysOrganizeModel{ +public class SysOrganizeModel implements Serializable { + + private static final long serialVersionUID = -8218859255737680832L; @Transient @ApiParam(value ="父节点") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java new file mode 100644 index 0000000..c14a33b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleGroup; +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 IAndonActionModuleGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java new file mode 100644 index 0000000..386ff91 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam; +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 IAndonActionModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java new file mode 100644 index 0000000..7b30626 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; +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 IAndonActionModuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java new file mode 100644 index 0000000..9da9511 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute; +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 IAndonActionRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java new file mode 100644 index 0000000..c45812f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActor; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : actor + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:13 + * @Modify: + **/ +@Repository +public interface IAndonActorRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java new file mode 100644 index 0000000..2e788c4 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : actor rule + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:13 + * @Modify: + **/ +@Repository +public interface IAndonActorRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java new file mode 100644 index 0000000..6d1f805 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam; +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 IAndonAlarmRouteModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java new file mode 100644 index 0000000..2ebac18 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute; +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 IAndonAlarmRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java new file mode 100644 index 0000000..89ffba6 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-30 11:05 + * @Modify: + **/ +@Repository +public interface IAndonAlarmTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java new file mode 100644 index 0000000..60f6452 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAreaAlarmType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-30 11:05 + * @Modify: + **/ +@Repository +public interface IAndonAreaAlarmTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java new file mode 100644 index 0000000..c591caa --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-11-12-14:24 + * @Modify: + **/ +@Repository +public interface IAndonMessageTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java new file mode 100644 index 0000000..9787cb3 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRiteRouteDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java new file mode 100644 index 0000000..a7bfed3 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRiteRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java new file mode 100644 index 0000000..a84d6ea --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam; +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 IAndonRouteModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java new file mode 100644 index 0000000..f65809a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatusErrorRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRouteStatusErrorRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java new file mode 100644 index 0000000..00fdc18 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRouteStatusRepository 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 74e3e2b..05520d5 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 @@ -3,14 +3,9 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.bean.ListPager; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; /** * @Description : 安灯对象查询封装 @@ -62,7 +57,8 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean); - if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){ + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getIsSucceed(), "isSucceed", packBean); + if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){ DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true); } return packBean; @@ -209,7 +205,7 @@ public class AndonHqlPack { public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + if (!StringUtils.isEmpty(bean.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } @@ -373,7 +369,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean); DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean); - if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){ + if(!StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeEnd())){ DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true); } @@ -418,7 +414,7 @@ public class AndonHqlPack { DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途 DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); - if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){ + if(!StringUtils.isEmpty(andonManageQueue.getCallTimeStart()) || !StringUtils.isEmpty(andonManageQueue.getCallTimeEnd())){ DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); } getStringBuilderPack(andonManageQueue, result); @@ -557,10 +553,13 @@ public class AndonHqlPack { */ public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); - if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){ + if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ + if (!StringUtils.isEmpty(mesEquipment.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); } packBean.setOrderByStr(mesEquipment.orderBy()); @@ -575,13 +574,13 @@ public class AndonHqlPack { */ public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); - if (StringUtils.isNotEmpty(shift.getShiftCode())){ + if (!StringUtils.isEmpty(shift.getShiftCode())){ DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); } - if (StringUtils.isNotEmpty(shift.getShiftName())){ + if (!StringUtils.isEmpty(shift.getShiftName())){ DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); } - if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){ + if (!StringUtils.isEmpty(shift.getWorkCenterCode())){ DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); } @@ -793,7 +792,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result); + if (mesArea != null) { + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -810,7 +811,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result); + if (mesWorkCenter != null) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -827,7 +830,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result); + if (mesWorkCell != null) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -844,7 +849,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result); + if (mesEquipment != null) { + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -862,7 +869,9 @@ public class AndonHqlPack { DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result); } - DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result); + if (mesShift != null) { + DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(), "shiftCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -876,4 +885,219 @@ public class AndonHqlPack { DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true); return result; } + + /** + * actor信息 + * @param actor + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActor(AndonActor actor, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actor, organizeCode); + if (!StringUtils.isEmpty(actor.getActorCode())) { + DdlPreparedPack.getStringLikerPack(actor.getActorCode(), "actorCode", packBean); + } + if (!StringUtils.isEmpty(actor.getActorName())) { + DdlPreparedPack.getStringLikerPack(actor.getActorName(), "actorName", packBean); + } + if (!StringUtils.isEmpty(actor.getActorClass())) { + DdlPreparedPack.getStringLikerPack(actor.getActorClass(), "actorClass", packBean); + } + return packBean; + } + + /** + * 消息类型 + * @param messageType + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonMessageType(AndonMessageType messageType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(messageType, organizeCode); + if (!StringUtils.isEmpty(messageType.getMtCode())) { + DdlPreparedPack.getStringLikerPack(messageType.getMtCode(), "mtCode", packBean); + } + if (!StringUtils.isEmpty(messageType.getMtName())) { + DdlPreparedPack.getStringLikerPack(messageType.getMtName(), "mtName", packBean); + } + return packBean; + } + + /** + * actor消息类型配置 + * @param actorRule + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActorRule(AndonActorRule actorRule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actorRule, organizeCode); + if (!StringUtils.isEmpty(actorRule.getActorCode())) { + DdlPreparedPack.getStringLikerPack(actorRule.getActorCode(), "actorCode", packBean); + } + if (!StringUtils.isEmpty(actorRule.getMtCode())) { + DdlPreparedPack.getStringLikerPack(actorRule.getMtCode(), "mtCode", packBean); + } + return packBean; + } + + /** + * 安灯类型 + * @param alarmType + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonAlarmType(AndonAlarmType alarmType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(alarmType, organizeCode); + if (!StringUtils.isEmpty(alarmType.getAlarmCode())) { + DdlPreparedPack.getStringLikerPack(alarmType.getAlarmCode(), "alarmCode", packBean); + } + if (!StringUtils.isEmpty(alarmType.getAlarmName())) { + DdlPreparedPack.getStringLikerPack(alarmType.getAlarmName(), "alarmName", packBean); + } + return packBean; + } + + /** + * 组件 + * @param actionModule + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActionModule(AndonActionModule actionModule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actionModule, organizeCode); + if (!StringUtils.isEmpty(actionModule.getAmCode())) { + DdlPreparedPack.getStringLikerPack(actionModule.getAmCode(), "amCode", packBean); + } + if (!StringUtils.isEmpty(actionModule.getAmName())) { + DdlPreparedPack.getStringLikerPack(actionModule.getAmName(), "amName", packBean); + } + if (!StringUtils.isEmpty(actionModule.getCallClass())) { + DdlPreparedPack.getStringLikerPack(actionModule.getCallClass(), "callClass", packBean); + } + if (!StringUtils.isEmpty(actionModule.getAmType())) { + DdlPreparedPack.getNumEqualPack(actionModule.getAmType(), "amType", packBean); + } + return packBean; + } + + /** + * 组件参数 + * @param actionModuleParam + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActionModuleParam(AndonActionModuleParam actionModuleParam, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actionModuleParam, organizeCode); + if (!StringUtils.isEmpty(actionModuleParam.getAmCode())) { + DdlPreparedPack.getStringLikerPack(actionModuleParam.getAmCode(), "amCode", packBean); + } + if (!StringUtils.isEmpty(actionModuleParam.getParamCode())) { + DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamCode(), "paramCode", packBean); + } + if (!StringUtils.isEmpty(actionModuleParam.getParamName())) { + DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamName(), "paramName", packBean); + } + if (!StringUtils.isEmpty(actionModuleParam.getParamType())) { + DdlPreparedPack.getNumEqualPack(actionModuleParam.getParamType(), "paramType", packBean); + } + return packBean; + } + + /** + * 上升流程配置 + * @param riteRoute + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonRiteRoute(AndonRiteRoute riteRoute, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(riteRoute, organizeCode); + if (!StringUtils.isEmpty(riteRoute.getAlarmCode())) { + DdlPreparedPack.getStringLikerPack(riteRoute.getAlarmCode(), "alarmCode", packBean); + } + if (!StringUtils.isEmpty(riteRoute.getAndonStatus())) { + DdlPreparedPack.getStringEqualPack(riteRoute.getAndonStatus(), "andonStatus", packBean); + } + if (!StringUtils.isEmpty(riteRoute.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(riteRoute.getWorkCenterNameRdd())) { + DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterNameRdd(), "workCenterNameRdd", packBean); + } + return packBean; + } + + /** + * 上升配置明细 + * @param riteRouteDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonRiteRouteDetail(AndonRiteRouteDetail riteRouteDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(riteRouteDetail, organizeCode); + if (!StringUtils.isEmpty(riteRouteDetail.getRiteRouteId())) { + DdlPreparedPack.getNumEqualPack(riteRouteDetail.getRiteRouteId(), "riteRouteId", packBean); + } + if (!StringUtils.isEmpty(riteRouteDetail.getRpCode())) { + DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpCode(), "rpCode", packBean); + } + if (!StringUtils.isEmpty(riteRouteDetail.getRpLevel())) { + DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpLevel(), "rpLevel", packBean); + } + if (!StringUtils.isEmpty(riteRouteDetail.getRpObjectCode())) { + DdlPreparedPack.getStringLikerPack(riteRouteDetail.getRpObjectCode(), "rpObjectCode", packBean); + } + return packBean; + } + + /** + * 作业流程 + * @param actionRoute + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlAndonActionRoute(AndonActionRoute actionRoute, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode); + DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean); + DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean); + return packBean; + } + + /** + * 安灯作业流程配置 + * @param alarmRoute + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlAndonAlarmRoute(AndonAlarmRoute alarmRoute, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(alarmRoute, organizeCode); + DdlPreparedPack.getStringLikerPack(alarmRoute.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(alarmRoute.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getNumEqualPack(alarmRoute.getRouteType(), "routeType", packBean); + return packBean; + } + + /** + * 流程状态异常记录 + * @param routeStatusErrorRecord + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonRouteStatusErrorRecord(AndonRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getSourceType(), "sourceType", packBean); + DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); + return packBean; + } + + public static DdlPackBean getAndonAreaAlarmType(AndonAreaAlarmType areaAlarmType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(areaAlarmType, organizeCode); + DdlPreparedPack.getStringLikerPack(areaAlarmType.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 527cbea..1d24b39 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_ASSIST_RESOURCE_SET_TIME") @Api("副资源设置时间") public class AssistResourceSetTime extends BaseAPS { + private static final long serialVersionUID = 901172392855536686L; @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 7c2d0ac..e87a86a 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 @@ -34,6 +34,7 @@ import java.util.List; @ExcludeImportExport @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class BaseOrder extends BaseAPS { + private static final long serialVersionUID = -2571085172798608026L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index a0f6d02..0142e58 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -24,6 +24,7 @@ import javax.persistence.MappedSuperclass; @Api("规则参数基类") @ExcludeImportExport public class BaseRule extends BaseAPS { + private static final long serialVersionUID = -1818853814377611968L; @Column(name="CODE") @ApiParam(value ="规则编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java index 23159bc..5dc8c0c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java @@ -22,6 +22,7 @@ import javax.persistence.Table; @Table(name = "APS_CANCEL_PLAN_RULE") @Api("取消计划规则") public class CancelPlanRule extends BaseRule { + private static final long serialVersionUID = 2674055522875545446L; @Column(name="WORK_FILTERS") @ApiParam(value ="工作筛选") private String workFilters; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index aa07354..0d537d2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_DATA_LINK") @Api("数据集成数据连接信息") public class DataLink extends BaseAPS { + private static final long serialVersionUID = 8324774871058505466L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index acdf7e4..c6dc31a 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("班次") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class DayShift extends BaseAPS { + private static final long serialVersionUID = 7964370027924366093L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index 156673e..ea42942 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_DYNAMIC_SET_TIME") @Api("动态设置时间") public class DynamicSetTime extends BaseAPS { + private static final long serialVersionUID = -1696499471488104793L; @Column(name="RES_CODE") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index 31196db..e859fe8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("数据导出明细") public class ExportDetail extends BaseAPS { + private static final long serialVersionUID = -8898414164032180539L; @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 8183437..bf6ca40 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_EXPORT_PROJECT") @Api("数据导出明细集合") public class ExportProject extends BaseAPS { + private static final long serialVersionUID = -7281303629295174330L; @Column(name="NAME") @ApiParam(value ="标识名") private String name; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java index 5ffa2de..cff475c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -23,6 +23,7 @@ import javax.persistence.Table; @Table(name = "APS_EXPRESSION_RECORD") @Api("表达式记录") public class ExpressionRecord extends BaseAPS { + private static final long serialVersionUID = 4038954046132896632L; @Column(name="BEAN_NAME") @ApiParam(value ="表名") private String beanName; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 194075b..49cf675 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -16,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 java.lang.reflect.Method; import java.sql.JDBCType; @@ -35,6 +36,7 @@ import java.sql.JDBCType; @Api("字段信息") @ExcludeImportExport public class FieldInfo extends BaseAPS { + private static final long serialVersionUID = -6195036426929675850L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -121,11 +123,15 @@ public class FieldInfo extends BaseAPS { private Boolean notEmpty; @JsonIgnore + @Transient private transient Class clazz; @JsonIgnore + @Transient private transient Class typeClass; @JsonIgnore + @Transient private transient Method getMethod; @JsonIgnore + @Transient private transient Method setMethod; } 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 00ba1ea..9a6c5e3 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 @@ -24,6 +24,7 @@ import javax.persistence.Table; @Table(name = "APS_FIELD_SET_RULE") @Api("属性赋值规则") public class FieldSetRule extends BaseRule { + private static final long serialVersionUID = 6880145972942618559L; @Column(name="BEAN") @ApiParam(value ="实体名") private ApsEnumUtil.FIELD_SET_BEAN bean; 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 new file mode 100644 index 0000000..07513fd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :刷新计划规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-07-11 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_FLUSH_PLAN_RULE") +@Api("刷新计划规则") +public class FlushPlanRule extends BaseRule { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java index 0d5f15e..57deab2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java @@ -31,6 +31,7 @@ import javax.validation.constraints.Min; @Api("炉容量") public class FurnaceCapacity extends BaseAPS { + private static final long serialVersionUID = -5657804042629460659L; @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index 9d8340d..ed046aa 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 @@ -32,6 +32,7 @@ import java.util.List; @Api("炉资源计划") public class FurnacePlan extends BaseAPS { + private static final long serialVersionUID = 6816465736285211114L; @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="已占用的能力") private Double capacity; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java index 40835b2..d31c13f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("组炉设置") public class FurnaceSetting extends BaseAPS { + private static final long serialVersionUID = -4566911526487268870L; @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 4199073..58997dc 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 @@ -24,6 +24,7 @@ import javax.persistence.Table; @Table(name = "APS_HEURISTIC_RULE") @Api("排程运算规则") public class HeuristicRule extends BaseRule { + private static final long serialVersionUID = -4856714428377308150L; @Column(name="WORK_FILTER") @ApiParam(value ="工作筛选") private String workFilter; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 0eaaeaa..ecb13e1 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("数据导入明细") public class ImportDetail extends BaseAPS { + private static final long serialVersionUID = 1264030397500660450L; @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 6cc2b67..35aaf50 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -28,6 +28,7 @@ import java.util.List; @Table(name = "APS_IMPORT_PROJECT") @Api("数据导入明细集合") public class ImportProject extends BaseAPS { + private static final long serialVersionUID = -1899074765155621438L; @Column(name="NAME") @ApiParam(value ="标识名") private String name; 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 741324f..8fab6d1 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 @@ -26,6 +26,7 @@ import javax.persistence.Table; @Table(name = "APS_INVENTORY") @Api("库存") public class Inventory extends BaseOrder { + private static final long serialVersionUID = 2378846162007550439L; @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; 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 95baac0..a8a491e 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 @@ -24,6 +24,7 @@ import javax.persistence.Table; @Table(name = "APS_MAT_CALC_RULE") @Api("物料运算规则") public class MatCalcRule extends BaseRule { + private static final long serialVersionUID = 2102986260688118982L; @Column(name="MATERIAL_FILTER") @ApiParam(value ="物料筛选") private String materialFilter; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 7c7c313..0b1ec28 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 @@ -34,6 +34,7 @@ import java.util.List; @Api("物料") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Material extends BaseAPS { + private static final long serialVersionUID = -7928225487946173108L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -64,10 +65,10 @@ public class Material extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String purchaseLeadTime; - @Column(name="MANUF_LEAD_TIME") - @ApiParam(value ="制造提前期") + @Column(name="PRODUCT_LEAD_TIME") + @ApiParam(value ="生产提前期") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private String manufLeadTime; + private String productLeadTime; @Column(name="SHIPMENT_LEAD_TIME") @ApiParam(value ="配送提前期") @@ -78,9 +79,9 @@ public class Material extends BaseAPS { @ApiParam(value ="单位采购量") private Integer unitPurchase; - @Column(name="UNIT_MANUF") - @ApiParam(value ="单位制造量") - private Integer unitManuf; + @Column(name="UNIT_PRODUCT") + @ApiParam(value ="单位生产量") + private Integer unitProduct; @Column(name="UNIT_SHIPMENT") @ApiParam(value ="单位配送量") @@ -98,17 +99,17 @@ public class Material extends BaseAPS { private Boolean autoFixPegging; @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") - @ApiParam(value ="最大制造批量") + @ApiParam(value ="最大生产批量") private Double maxProductBatch; @Column(name="MIN_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") - @ApiParam(value ="最小制造批量") + @ApiParam(value ="最小生产批量") @FieldAnnotation(defaultValue = "0.0") private Double minProductBatch; @Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") - @ApiParam(value ="制造批量单位") - private Double UnitProductBatch; + @ApiParam(value ="生产批量单位") + private Double unitProductBatch; @Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大采购批量") @@ -142,6 +143,14 @@ public class Material extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String orderBatchPeriod; + @Column(name="LABEL_NAME") + @ApiParam(value ="标签名称") + private String labelName; + + @Column(name="LABEL_COLOR") + @ApiParam(value ="标签颜色") + private String labelColor; + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); 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 new file mode 100644 index 0000000..dcb7f0b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java @@ -0,0 +1,52 @@ +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.EMaterialDeliveryPromise; +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 javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description :物料交期承诺 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_MATERIAL_DELIVERY_PROMISE") +@Api("物料") +public class MaterialDeliveryPromise extends BaseBean { + @Column(name="QTY") + @ApiParam(value ="到货数量") + private Double count; + + @Column(name="DATE_TIME") + @ApiParam(value ="到货日期") + private Date dateTime; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material", notEmpty = true) + private Long materialId; + + public Material getMaterial() { + return BeanRelation.get(this, EMaterialDeliveryPromise.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EMaterialDeliveryPromise.Material, material); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index e362742..779b527 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 @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_MATERIAL_SET_TIME") @Api("物料设置时间") public class MaterialSetTime extends BaseAPS { + private static final long serialVersionUID = -7996431489447641539L; @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 11cedff..2d389fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_OPER_INPUT") @Api("工序输入") public class OperInput extends BaseAPS { + private static final long serialVersionUID = 6653235155693766804L; @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 476d45b..e17e69d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -28,6 +28,7 @@ import java.util.List; @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") public class OperOutput extends BaseAPS { + private static final long serialVersionUID = 3185682762290147209L; @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index b6923c0..e054949 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") public class OperResource extends BaseAPS { + private static final long serialVersionUID = -8683889582369342606L; @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 274574b..36eceaa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_OPERATION") @Api("工序") public class Operation extends BaseAPS { + private static final long serialVersionUID = 4394179144091116858L; @Column(name="NUMBER") @ApiParam(value ="工序号") @FieldAnnotation(notEmpty = true) @@ -70,6 +71,10 @@ public class Operation extends BaseAPS { @ApiParam(value ="分割批量") private Double batch; + @Column(name="REMAINDER", columnDefinition = "decimal(18,8)") + @ApiParam(value ="分割余数") + private Double remainder; + @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") @FieldAnnotation(defaultValue = "ES") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java index 0c6a9a5..b5dad6b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java @@ -24,6 +24,7 @@ import java.util.Date; @Api("订单树") @ExcludeImportExport public class OrderTree extends BaseAPS { + private static final long serialVersionUID = -7505923374791695738L; @ApiParam(value ="物料编码") private String material; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index 0281199..2c394a3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -26,6 +26,7 @@ import java.util.Date; @Table(name = "APS_OVERTIME_CALENDAR") @Api("加班日历") public class OvertimeCalendar extends BaseAPS { + private static final long serialVersionUID = -501715721073189464L; @Column(name="RES_CODES") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 9756426..6fbd9d1 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 @@ -32,6 +32,7 @@ import java.util.List; @Api("父工作") @ExcludeImportExport public class ParentWork extends BaseAPS { + private static final long serialVersionUID = 8792781216193806606L; @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") private Double count; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 860e0a3..8855d00 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("工作反馈") public class PlanFeedback extends BaseAPS { + private static final long serialVersionUID = 2520555825093741381L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(property = false) 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 37548d8..dee531b 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 @@ -30,6 +30,7 @@ import java.util.List; @Table(name = "APS_PRODUCT_ORDER") @Api("生产订单") public class ProductOrder extends BaseOrder { + private static final long serialVersionUID = 6900226668783662736L; @Column(name="EST") @ApiParam(value ="最早开始时间") private Date est; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 06ac508..a109c6a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -33,6 +33,7 @@ import java.util.List; @Api("工艺路线") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ProductRouting extends BaseAPS { + private static final long serialVersionUID = 4905294866468216722L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index b6687d9..bee905c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Table(name = "APS_PURCHASE_ORDER") @Api("采购订单") public class PurchaseOrder extends BaseOrder { + private static final long serialVersionUID = 4699381603433121631L; @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; 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 96de9d2..d37f81a 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 @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_RES_CALENDAR") @Api("日历") public class ResCalendar extends BaseAPS { + private static final long serialVersionUID = 8338930205816433211L; @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 515cd7b..8f2d668 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 @@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -33,6 +34,7 @@ import java.util.List; @Api("资源") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Resource extends BaseAPS { + private static final long serialVersionUID = 3304084329600816457L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -125,6 +127,11 @@ public class Resource extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String lockTime; + @ApiParam(value ="是否存在任务冲突") + @FieldAnnotation(property = false) + @Transient + private boolean hasConflict; + @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 df02228..31fb91b 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @ExcludeImportExport public class RuleDetail extends BaseAPS { + private static final long serialVersionUID = -6433950357039396107L; @Column(name="TYPE") @ApiParam(value ="规则类型") private ApsEnumUtil.RULE_TYPE type; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 85b3191..28e424e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -29,6 +29,7 @@ import java.util.List; @Api("规则组合") @ExcludeImportExport public class RuleGroup extends BaseAPS { + private static final long serialVersionUID = 4741897751041891075L; @Column(name="CODE") @ApiParam(value ="编码") private String code; 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 d973fb4..bd8679a 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 @@ -28,6 +28,7 @@ import java.util.Date; @Table(name = "APS_SALES_ORDER") @Api("销售订单") public class SalesOrder extends BaseOrder { + private static final long serialVersionUID = -511784925441907538L; @Column(name="LOW_EST") @ApiParam(value ="底阶最早开始时间") private Date lowEst; @@ -50,6 +51,11 @@ public class SalesOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; + @Column(name="ALLOW_DELAY_TIME") + @ApiParam(value ="允许延期时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String allowDelayTime; + @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 fbe37f0..6d0f976 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 @@ -26,6 +26,7 @@ import javax.persistence.Table; @ExcludeImportExport public class SerialNumber extends BaseAPS { + private static final long serialVersionUID = 312483211086701109L; @Column(name="NUMBER") @ApiParam(value ="流水号") private Integer number; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 6b83309..bc0ec95 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("运输时间") public class ShippingTime extends BaseAPS { + private static final long serialVersionUID = -8698904420363808737L; @Column(name="PREV_RES_CODE") @ApiParam(value ="前资源编码") @FieldAnnotation(relation = "PrevRes") 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 b24c7aa..9fab094 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 @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("标准工序") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class StandOperation extends BaseAPS { + private static final long serialVersionUID = -6869403951765771775L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -56,6 +57,10 @@ public class StandOperation extends BaseAPS { @ApiParam(value ="分割批量") private Double batch; + @Column(name="REMAINDER", columnDefinition = "decimal(18,8)") + @ApiParam(value ="分割余数") + private Double remainder; + @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") 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 2a24fcb..669df55 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 @@ -26,6 +26,7 @@ import java.util.Date; @Table(name = "APS_SYS_PARAM") @Api("系统参数") public class SysParam extends BaseAPS { + private static final long serialVersionUID = 3115620726438869596L; @Column(name="BASE_TIME") @ApiParam(value ="基准时间") private Date baseTime; 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 472b69c..619bbf8 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 @@ -34,6 +34,7 @@ import java.util.List; @Api("工作") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Work extends BaseAPS { + private static final long serialVersionUID = 6471740978550523187L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true, modify = false) @@ -83,7 +84,7 @@ public class Work extends BaseAPS { private Long specifyResourceId; @Column(name="SPECIFY_PRODUCE_TIME") - @ApiParam(value ="指定制造时间") + @ApiParam(value ="指定生产时间") private String specifyProduceTime; @Column(name="SPECIFY_PREV_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 94e1a71..4390af5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_WORK_INPUT") @Api("工作输入") public class WorkInput extends BaseAPS { + private static final long serialVersionUID = 2654389476284740183L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index ef453ce..7f04aba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -31,6 +31,7 @@ import java.util.List; @Api("工作输出") public class WorkOutput extends BaseAPS { + private static final long serialVersionUID = 6031001499619328313L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "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 455ae2c..53c1be7 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 @@ -35,6 +35,7 @@ import java.util.List; @Api("工作计划") public class WorkPlan extends BaseAPS { + private static final long serialVersionUID = 5489548115780676195L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 1bfbecf..607a948 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("工作关联") public class WorkRelation extends BaseAPS { + private static final long serialVersionUID = -5824884364328962956L; @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(relation = "Material", modify = false) 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 795117a..727c9a2 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("工作资源") public class WorkResource extends BaseAPS { + private static final long serialVersionUID = 4791940404968841144L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") 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 26e9d6c..9c98bdb 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 @@ -25,6 +25,7 @@ import java.util.HashMap; @MappedSuperclass @ExcludeImportExport public abstract class BaseAPS extends BaseBean { + private static final long serialVersionUID = -8638842158403944318L; @JsonIgnore @Lob @FieldAnnotation(property = false) @@ -43,9 +44,4 @@ public abstract class BaseAPS extends BaseBean { public void setCustomField(String code, Object value) { customFields.put(code, value); } - - @Override - public boolean equals(Object obj) { - return this == obj; - } } 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 0cd8116..a440ae8 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 @@ -388,7 +388,9 @@ public class BeanRelation { List relaBeans = list(bean, holders[index]); for (BaseBean relaBean : relaBeans) { - recursionImpl(relaBean, fun, holders, index + 1); + if (relaBean.getId() != bean.getId()) { + recursionImpl(relaBean, fun, holders, index + 1); + } } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index 2fa0ef7..a5caf9e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -28,6 +28,11 @@ public class DateDuration { private int time = 0; private double rate = 0.0; private boolean bValid = false; + private int unit = 0; + + public DateDuration(int value) { + this.time = value; + } public DateDuration(String value) { setValue(value); @@ -77,7 +82,7 @@ public class DateDuration { * @return */ public long getTimeInMillis() { - return this.time * 1000; + return this.time * 1000l; } @Override @@ -143,6 +148,9 @@ public class DateDuration { if (amount < PRECISION) return getTime(); + if (this.unit > 0) { + amount = Math.ceil(amount / this.unit); + } double result = (amount * this.rate) + this.time; return (int)Math.ceil(result); } @@ -153,7 +161,7 @@ public class DateDuration { * @return */ public long getTimeInMillis(double amount) { - return this.getTime(amount) * 1000; + return this.getTime(amount) * 1000l; } private void parse() { @@ -180,10 +188,11 @@ public class DateDuration { for (EV_STRING evs : lst) { if (evs.type == EV_STRING_TYPE.EVS_GOOD) { AbstractMap.SimpleEntry extraTime = transTimeEach(evs.value); - if (extraTime.getKey() || !oFlg) { + if (extraTime.getKey() || oFlg) { this.time += extraTime.getValue(); } else { - this.time += extraTime.getValue() * 1; + //this.time += extraTime.getValue() * 1; + this.unit = extraTime.getValue(); } } else { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java index 35cc4ba..027f459 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -12,7 +12,7 @@ import java.text.SimpleDateFormat; import java.util.Date; public class CustomDateDeserializer extends JsonDeserializer { - public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @Override public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java index 8b8780d..6bfd17f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java @@ -9,7 +9,7 @@ import java.text.SimpleDateFormat; import java.util.Date; public class CustomDateSerializer extends JsonSerializer { - public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @Override public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java new file mode 100644 index 0000000..abc6ec5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EMaterialDeliveryPromise { + Material, +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java new file mode 100644 index 0000000..2331242 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +/** + * 表格右键菜单 + */ +@Data +public class ContextMenu { + + private String text; + + private String uri; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java new file mode 100644 index 0000000..540a328 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 延期订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class DelaySalesOrder { + + @ApiParam(value ="订单ID") + private Long orderId; + + @ApiParam(value ="订单编码") + private String orderCode; + + @ApiParam(value ="订单名称") + private String orderName; + + @ApiParam(value ="物料编码") + private String materialCode; + + @ApiParam(value ="物料名称") + private String materialName; + + @ApiParam(value ="订单数量") + private Double count; + + @ApiParam(value ="最晚结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date let; + + @ApiParam(value ="计划开始时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planStart; + + @ApiParam(value ="计划结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planEnd; + + @ApiParam(value ="总跨度时间") + private String overTime; + + @ApiParam(value ="总生产时间") + private String productTime; + + @ApiParam(value ="延期时间") + private String delayTime; + + @ApiParam(value ="允许的最大延期时间") + private String allowDelayTime; + + // 0正常显示，1显示黄色，2显示红色 + @ApiParam(value ="背景显示颜色") + private Integer backgroundColor; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java new file mode 100644 index 0000000..5ddc2dd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 大跨度订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class LargeSpanOrder { + @ApiParam(value ="订单ID") + private Long orderId; + + @ApiParam(value ="订单编码") + private String orderCode; + + @ApiParam(value ="订单名称") + private String orderName; + + @ApiParam(value ="物料编码") + private String materialCode; + + @ApiParam(value ="物料名称") + private String materialName; + + @ApiParam(value ="订单数量") + private Double count; + + @ApiParam(value ="最晚结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date let; + + @ApiParam(value ="计划开始时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planStart; + + @ApiParam(value ="计划结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planEnd; + + @ApiParam(value ="总跨度时间") + private String overTime; + + @ApiParam(value ="总生产时间") + private String productTime; + + @ApiParam(value ="跨度时间") + private String spanTime; + + // 0正常显示，1显示黄色，2显示红色 + @ApiParam(value ="背景显示颜色") + private Integer backgroundColor; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java new file mode 100644 index 0000000..c7a0500 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 物料交期分析表 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class MaterialDeliveryAnalyze { + @ApiParam(value ="订单ID") + private Long orderId; + + @ApiParam(value ="订单编码") + private String orderCode; + + @ApiParam(value ="订单名称") + private String orderName; + + @ApiParam(value ="物料编码") + private String materialCode; + + @ApiParam(value ="物料名称") + private String materialName; + + @ApiParam(value ="标签名称") + private String labelName; + + @ApiParam(value ="标签颜色") + private String labelColor; + + @ApiParam(value ="需求数量") + private Double requireCount; + + @ApiParam(value ="需求日期") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date requireDate; + + @ApiParam(value ="最早到货日期") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date arrivalDate; + + // 0正常显示，1显示红色 + @ApiParam(value ="背景显示颜色") + private Integer backgroundColor; + + private Double count; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java new file mode 100644 index 0000000..4080aa9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 过早生产 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class PrematureProduct { + @ApiParam(value ="订单ID") + private Long orderId; + + @ApiParam(value ="订单编码") + private String orderCode; + + @ApiParam(value ="订单名称") + private String orderName; + + @ApiParam(value ="物料编码") + private String materialCode; + + @ApiParam(value ="物料名称") + private String materialName; + + @ApiParam(value ="订单编码") + private Double count; + + @ApiParam(value ="最晚结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date let; + + @ApiParam(value ="计划开始时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planStart; + + @ApiParam(value ="计划结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planEnd; + + @ApiParam(value ="提前完成时间") + private String times; + + // 0正常显示，1显示红色 + @ApiParam(value ="背景显示颜色") + private Integer backgroundColor; + +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java new file mode 100644 index 0000000..7692b3d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 排程结果分析及建议 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class ScheduleAnalyze { + + @ApiParam(value ="工作编码") + private String workCode; + + @ApiParam(value ="数量") + private Double count; + + @ApiParam(value ="计划开始时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planStart; + + @ApiParam(value ="计划结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planEnd; + + @ApiParam(value ="问题描述") + private String describe; + + @ApiParam(value ="解决方案") + private String solution; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java new file mode 100644 index 0000000..112618a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Data +public class ShiftReportModel { + private List dates = new ArrayList<>(); + private List headers = new ArrayList<>(); + private List labels = new ArrayList<>(); + + private List>> datas = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java new file mode 100644 index 0000000..703a137 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.Date; + +/** + * @Description :时间段信息，包含指示该时间段是上班还是下班 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +public class TimeBlock implements Comparable { + private Date begin; + private Date end; + private boolean onDuty = true; + private String shift; + + @Override + public int compareTo(TimeBlock o) { + if (this.getBegin().equals(o.getBegin())) { + if (this.getEnd().equals(o.getEnd())) { + return 0; + } + return this.getEnd().before(o.getEnd()) ? -1 : 1 ; + } + return this.getBegin().before(o.getBegin()) ? -1 : 1; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FlushPlanRuleRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FlushPlanRuleRepository.java new file mode 100644 index 0000000..1a3ee55 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FlushPlanRuleRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.FlushPlanRule; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface FlushPlanRuleRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java new file mode 100644 index 0000000..afe26b8 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.MaterialDeliveryPromise; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MaterialDeliveryPromiseRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml new file mode 100644 index 0000000..310c255 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..1e17935 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 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 9dfac91..2811481 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.base.annotation; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import java.lang.annotation.*; @@ -12,7 +12,7 @@ import java.lang.annotation.*; @Target({ElementType.FIELD, ElementType.TYPE}) public @interface DynamicField { // Web前端字段数据类型 - WmsEnumUtil.FIELD_TYPE webFieldType(); + CommonEnumUtil.FIELD_TYPE webFieldType(); // 条件表达式:>,<,>=等 String conditionExpre() default "="; // 条件连接符:and/or @@ -35,14 +35,16 @@ public @interface DynamicField { int isShow() default 1; // 是否跳过本字段扫描 0-不跳过，1-跳过 int isSkip() default 0; - // 下拉枚举名称 - String entityName() default ""; // 下拉列表显示列名称,多个列名需要根据逗号分隔 String listColumnName() default ""; // 下拉搜索列名称,多个列名需要根据逗号分隔 String searchColumnName() default ""; // 回显列名 String explicitColumnName() default ""; - // 下拉框规则 - WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM; + // 是否多选:1-多选，默认2-单选 + int isMultiple() default 2; + // 数据来源 + String dataSrc() default ""; + // 取值方式 + CommonEnumUtil.DYNAMIC_FIELD_GET_WAY getValWay() default CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.ENUM; } 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 a2420d6..a609d5f 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 @@ -15,6 +15,7 @@ import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; +import java.util.LinkedHashMap; /** * @Description : @@ -31,6 +32,8 @@ import java.io.Serializable; //@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public abstract class BaseBean implements Serializable { + private static final long serialVersionUID = 1L; + //此处使用hibernate的主键策略方式 //手动设置,使用iplus-platform-common中的idtool生成 //将Long类型系列化成String避免精度丢失 @@ -41,7 +44,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) public Long id; //get单独处理 @@ -65,7 +68,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") // @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @@ -81,55 +84,51 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") - @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") + @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; @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String createDatetime; @Column(name="MODIFY_USER") @ApiParam(value = "修改人") - @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") + @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 = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @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) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) 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) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) 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) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) 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) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeEnd; @Transient @@ -143,17 +142,42 @@ public abstract class BaseBean implements Serializable { //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid; + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted; + } + + @Transient + @ApiParam(value = "多列排序") + @AnnoOutputColumn(hidden = true) + public LinkedHashMap sortParamMap; + //排序方式 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"; + StringBuffer result = new StringBuffer(" order by "); + + if (sortParamMap != null && sortParamMap.size() != 0) { + for (String key : sortParamMap.keySet()) { + packOrderByHql(result,orderByParam,ascOrDesc); } + } else if (orderByParam != null && orderByParam.trim().length() > 0) { + packOrderByHql(result,orderByParam,ascOrDesc); + }else{ + return ""; } - return result; + return result.subSequence(0, result.length() - 1).toString(); } + + private void packOrderByHql(StringBuffer stringBuffer, String orderByParam, Integer ascOrDesc) { + stringBuffer.append(" ").append(orderByParam); + if (ascOrDesc == null || ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + stringBuffer.append(" asc"); + } else { + stringBuffer.append(" desc,"); + } + } + } 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 2dc425c..83c5994 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 @@ -3,7 +3,6 @@ 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 lombok.Data; import java.util.List; import java.util.Map; @@ -124,6 +123,23 @@ public class BaseResultBean { return this; } + public static BaseResultBean success(String msg){ + BaseResultBean rs = new BaseResultBean(true); + rs.setMsg(msg); + return rs; + } + + public static BaseResultBean success(){ + BaseResultBean rs = new BaseResultBean(true); + return rs; + } + + public static BaseResultBean fail(String msg){ + BaseResultBean rs = new BaseResultBean(false,msg); + rs.setErrorMsg(msg); + return rs; + } + public static BaseResultBean buildBaseResultBean(boolean success, String msg){ BaseResultBean rs = new BaseResultBean(); rs.success = success; @@ -138,6 +154,33 @@ public class BaseResultBean { return rs; } + public BaseResultBean() { + } + + public BaseResultBean(boolean isSuccess) { + success = isSuccess; + if(success){ + //国际化 + code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + }else{ + code = ResourceEnumUtil.MESSAGE.FAIL.getCode(); + } + } + + public BaseResultBean(boolean success, List resultList) { + this.success = success; + this.resultList = resultList; + } + + public BaseResultBean(boolean success, Obj resultObject) { + this.success = success; + if(resultObject instanceof String){ + this.msg = resultObject.toString(); + }else{ + this.resultObject = resultObject; + } + } + @Override public String toString() { return "BaseResultBean{" + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index ded0d8d..fdd275f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -62,7 +62,23 @@ public class DdlPackBean { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); - DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + + return result; + } + + /** + * 查询指定组织、指定是否有效的数据 + * @param organizeCode + * @param isValid + * @return + */ + public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(isValid, "isValid", result); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); return result; } @@ -141,6 +157,24 @@ public class DdlPackBean { } /** + * 添加查询条件-处理多个属性 + * @param hql + * @param hqlMap + */ + public void addColumnQuery(String hql,HashMap hqlMap){ + if(hqlPreparedMap == null){ + hqlPreparedMap = new HashMap<>(); + } + if(hqlMap != null && !hqlMap.isEmpty()) { + hqlPreparedMap.putAll(hqlMap); + } + + whereAppend.append(hql); + } + + + + /** * 需要查询属性的数量 * @return */ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java new file mode 100644 index 0000000..afb605a --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 文件基础信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-06-01 20:33 + * @Modify: + **/ +@Data +@ApiModel("文件基础信息") +public class ImppFile { + + /******* 文件基础信息 ******/ + + @ApiModelProperty("文件名称") + private String name; //文件名 + + @ApiModelProperty("文件内容") + private byte[] content; //内容 + + @ApiModelProperty("文件后缀名称") + private String ext; //文件类型 + + public void setExt(String ext) { + if(ext.indexOf(".") != 0){ + ext ="."+ext; + } + this.ext = ext; + } + + @ApiModelProperty("文件md5") + private String md5; + + @ApiModelProperty("文件创建时间") + private String createDateTime; + + @ApiModelProperty("文件作者") + private String author; //作者 + + /******* 文件系统唯一信息 ******/ + + @ApiModelProperty("文件系统-组名称") + private String dfsGroupName; + + @ApiModelProperty("文件系统-名称") + private String dfsFileName; + + @ApiModelProperty("文件系统-唯一键") + private String dfsFileKey; + + /******* 构造方法 ******/ + + public ImppFile() { + } + + public ImppFile(String name, byte[] content, String ext) { + this.name = name; + this.content = content; + this.setExt(ext); + } +} 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 b961226..a8731c8 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 @@ -31,6 +31,27 @@ public class Pager { @ApiParam("翻页操作") private String pageMethod; + /* 默认最小数量分页 */ + private static final Pager min; + /* 默认最大数量分页 */ + private static final Pager max; + /* 默认数量分页 */ + private static final Pager defaultPager; + + static { + min = new Pager(); + min.setCurrentPage(1); + min.setPageSize(10); + + max = new Pager(); + max.setCurrentPage(1); + max.setPageSize(65535); + + defaultPager = new Pager(); + defaultPager.setCurrentPage(1); + defaultPager.setPageSize(100); + } + public Pager() { } @@ -138,13 +159,6 @@ public class Pager { } public int getEndRow() { - if(pageSize > 0){ - if(currentPage > 1){ - return currentPage * pageSize; - }else { - return pageSize; - } - } return endRow; } @@ -231,6 +245,30 @@ public class Pager { return currentPage > 1; } + /** + * 获取默认最小分页数量 + * @return + */ + public static Pager defaultMinPager(){ + return min; + } + + /** + * 默认最大分页数量 + * @return + */ + public static Pager defaultMaxPager(){ + return max; + } + + /** + * 默认分页数量 + * @return + */ + public static Pager defaultPager(){ + return defaultPager; + } + @Override public String toString() { return "Pager{" + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index b1738c3..a5c3a42 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -1,22 +1,33 @@ package cn.estsh.i3plus.pojo.base.common; import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import com.alibaba.fastjson.JSON; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.core.util.QuickWriter; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.io.naming.NameCoder; import com.thoughtworks.xstream.io.naming.NoNameCoder; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.XppDomDriver; +import lombok.Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import java.io.Serializable; import java.io.Writer; import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toJavaBean; +import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toXml; /** * @Description : Xml 工厂 - * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm + * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm * @Reference : * @Author : wei.peng * @CreateDate : 19-7-23 下午5:58 @@ -120,9 +131,9 @@ public class XStreamFactory { } - /** * Javabean 转XML + * * @param * @return xml字符串 */ @@ -132,8 +143,8 @@ public class XStreamFactory { for (int i = 1; i < RETRY_NUM; i++) { try { return headLine + xStream.toXML(t); - }catch (Exception e){ - LOGGER.error("Bean To Xml Error Message:{} Number:{}",e.getMessage(),i); + } catch (Exception e) { + LOGGER.error("Bean To Xml Error Message:{} Number:{}", e.getMessage(), i); } } return null; @@ -141,6 +152,7 @@ public class XStreamFactory { /** * Javabean 转XML + * * @param * @return xml字符串 */ @@ -159,101 +171,108 @@ public class XStreamFactory { public static T toJavaBean(String xmlStr) { return (T) xStream.fromXML(xmlStr); } -// -// public static void main(String[] args) { -// User u = new User(0, "zhangsan0", "zhangsanpwd0"); -// User u1 = new User(1, "zhangsan1", "zhangsanpwd"); -// User u2 = new User(2, "zhangsan2", "zhangsanpwd"); -// User u3 = new User(3, "zhangsan3", "zhangsanpwd"); -// -// Role r1 = new Role(1, "Admin", "Admin1"); -// Role r2 = new Role(2, "Admin", "Admin2"); -// Role r3 = new Role(3, "Admin", "Admin3"); -// -// DataAdapter ad = new DataAdapter(10086L,UUID.randomUUID().toString(),"sssfwef",u1); -// u1.setRole(r1); -// -// u2.getRoleList().add(r1); -// u2.getRoleList().add(r2); -// u2.getRoleList().add(r3); -// -// u3.setRole(r1); -// u3.getRoleList().add(r2); -// u3.getRoleList().add(r3); -// -// System.out.println(toXml(u) + "\n\n "); -// System.out.println(toXml(u1) + "\n\n "); -// System.out.println(toXml(u2) + "\n\n "); -// System.out.println(toXml(u3) + "\n\n "); -// System.out.println(toXml(ad) + "\n\n "); -// -// System.out.println(JSON.toJSONString(toJavaBean(toXml(ad)))); -// -// } } + // -//@Data -//@XStreamAlias("DataAdapter") -////对应carInfos元素 -//class DataAdapter implements Serializable { -// -// @XStreamAsAttribute -// private Long scId; -// private String key; -// @XStreamCDATA -// private String resultData; -// -// private Object auth; -// -// public DataAdapter(Long scId, String key, String resultData, Object auth) { -// this.scId = scId; -// this.key = key; -// this.resultData = resultData; -// this.auth = auth; -// } -//} -// -//@Data -//@XStreamAlias("user") -////对应carInfos元素 -//class User implements Serializable { -// private static final long serialVersionUID = -7554548655397869156L; -// -// @XStreamAsAttribute -// private Integer id; -// private String loginName; -// private String loginPwd; -// -// private Role role; -// private List roleList = new ArrayList(); -// private List roleArray; -// -// public User() { -// } -// -// public User(Integer id, String loginName, String loginPwd) { -// this.id = id; -// this.loginName = loginName; -// this.loginPwd = loginPwd; -// } -//} -// -//@Data -//@XStreamAlias("role") -////对应carInfos元素 -//class Role implements Serializable { -// private static final long serialVersionUID = -3134157833696958743L; -// @XStreamAsAttribute -// private Integer id; -// private String roleName; -// private String roleCode; -// -// public Role() { -// } -// -// public Role(Integer id, String roleName, String roleCode) { -// this.id = id; -// this.roleName = roleName; -// this.roleCode = roleCode; -// } -//} \ No newline at end of file +class Test { + public static void main(String[] args) { + User u = new User(0, "zhangsan0", "zhangsanpwd0"); + User u1 = new User(1, "zhangsan1", "zhangsanpwd"); + User u2 = new User(2, "zhangsan2", "zhangsanpwd"); + User u3 = new User(3, "zhangsan3", "zhangsanpwd"); + + Role r1 = new Role(1, "Admin", "Admin1"); + Role r2 = new Role(2, "Admin", "Admin2"); + Role r3 = new Role(3, "Admin", "Admin3"); + + DataAdapter ad = new DataAdapter(10086L, UUID.randomUUID().toString(), "sssfwef", u1); + u1.setRole(r1); + + u2.getRoleList().add(r1); + u2.getRoleList().add(r2); + u2.getRoleList().add(r3); + + u3.setRole(r1); + u3.getRoleList().add(r2); + u3.getRoleList().add(r3); + + System.out.println(toXml(u) + "\n\n "); + System.out.println(toXml(u1) + "\n\n "); + System.out.println(toXml(u2) + "\n\n "); + System.out.println(toXml(u3) + "\n\n "); + System.out.println(toXml(ad) + "\n\n "); + + System.out.println(JSON.toJSONString(toJavaBean(toXml(ad)))); + + } + + + @Data + @XStreamAlias("DataAdapter") + static +//对应carInfos元素 + class DataAdapter implements Serializable { + + @XStreamAsAttribute + private Long scId; + private String key; + @XStreamCDATA + private String resultData; + + private Object auth; + + public DataAdapter(Long scId, String key, String resultData, Object auth) { + this.scId = scId; + this.key = key; + this.resultData = resultData; + this.auth = auth; + } + } + + @Data + @XStreamAlias("user") + static +//对应carInfos元素 + class User implements Serializable { + private static final long serialVersionUID = -7554548655397869156L; + + @XStreamAsAttribute + private Integer id; + private String loginName; + private String loginPwd; + + private Role role; + private List roleList = new ArrayList(); + private List roleArray; + + public User() { + } + + public User(Integer id, String loginName, String loginPwd) { + this.id = id; + this.loginName = loginName; + this.loginPwd = loginPwd; + } + } + + @Data + @XStreamAlias("role") + static +//对应carInfos元素 + class Role implements Serializable { + private static final long serialVersionUID = -3134157833696958743L; + @XStreamAsAttribute + private Integer id; + private String roleName; + private String roleCode; + + public Role() { + } + + public Role(Integer id, String roleName, String roleCode) { + this.id = id; + this.roleName = roleName; + this.roleCode = roleCode; + } + } +} \ No newline at end of file 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 a18d99a..8775387 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 @@ -13,6 +13,230 @@ import org.apache.commons.lang3.StringUtils; public class AndonEnumUtil { /** + * 状态机异常处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS { + TRUE(10, "已处理"), + FALSE(20, "未处理"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(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 ROUTE_STATUS_ACTION_TYPE { + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); + + private String value; + private String code; + private String description; + + ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) { + for (ROUTE_STATUS_ACTION_TYPE actionType : values()) { + if (actionType.getValue().equals(value)) { + return actionType; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + + /** + * 状态点界面编号 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_ROUTE_STATUS_INTERFACE_NO { + 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", "自处理呼叫弹框界面"), + FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"), + ALARM_SIGN("ALARM_SIGN", "响应弹框界面"), + ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"), + ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面"); + + private String value; + private String description; + + ANDON_ROUTE_STATUS_INTERFACE_NO(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 ACTION_MODULE_PARAM_TYPE { + + QUALIFIED(10, "number", "数字"), + DEFECTED(20, "text", "字符串"), + SCRAPED(30, "select", "可选值"), + BUTTON(40, "button", "按钮"); + + private int value; + private String code; + private String description; + + ACTION_MODULE_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; + } + } + + /** + * 组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_MODULE_AM_TYPE { + COMMON_MODULE(10, "通用组件"); + + private int value; + private String description; + + ACTION_MODULE_AM_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 ROUTE_STATUS_TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + ROUTE_STATUS_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 ROUTE_STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + FINISH(30, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + ROUTE_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; + } + } + + /** * 安灯主界面产线或者站点运行状态 * 正常 = 10，故障 = 20 */ @@ -737,21 +961,23 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_TAG { - CALL(1,"10","呼叫"), - SIGN(2,"20","响应"), - RESOLVE(3,"30","解决"), - CANCEL(4,"40", "撤销"), - COMMIT(5,"50","解决待审"), - PASS(6,"60","审批完成"), - REJECT(7,"70","驳回"), - CONFIRMED_CANCEL(8,"80","撤销已确认"); + CALL(1, "1","10","呼叫"), + SIGN(2, "2","20","响应"), + RESOLVE(3, "3","30","解决"), + CANCEL(4, "4","40", "撤销"), + COMMIT(5, "5","50","解决待审"), + PASS(6, "6","60","审批完成"), + REJECT(7, "7","70","驳回"), + CONFIRMED_CANCEL(8, "8","80","撤销已确认"); private int value; + private String valueStr; private String code; private String description; - ANDON_ACTION_TAG(int value, String code, String description) { + ANDON_ACTION_TAG(int value, String valueStr, String code, String description) { this.value = value; + this.valueStr = valueStr; this.code = code; this.description = description; } @@ -760,12 +986,32 @@ public class AndonEnumUtil { return value; } + public String getValueStr(){ return valueStr; } + public String getCode(){ return code; } public String getDescription() { return description; } + public static ANDON_ACTION_TAG getByValue(int value) { + for (ANDON_ACTION_TAG actionTag : values()) { + if (actionTag.getValue() == value) { + return actionTag; + } + } + return null; + } + + public static ANDON_ACTION_TAG getByValueStr(String valueStr) { + for (ANDON_ACTION_TAG actionTag : values()) { + if (actionTag.getValueStr().equals(valueStr)) { + return actionTag; + } + } + return null; + } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -924,6 +1170,15 @@ public class AndonEnumUtil { return description; } + public static ALARM_SOURCE_TYPE getByValue(String value) { + for (ALARM_SOURCE_TYPE sourceType : values()) { + if (sourceType.getValue().equals(value)) { + return sourceType; + } + } + return null; + } + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -945,7 +1200,6 @@ public class AndonEnumUtil { } } - /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 * 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 5338751..99a8d8f 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 @@ -195,7 +195,7 @@ public class ApsEnumUtil { public enum MATERIAL_ASSIGN_LIMIT { INVENTORY(1, "库存制约"), PURCHASE(2, "采购制约"), - PRODUCT(4, "制造制约"); + PRODUCT(4, "生产制约"); private int value; private String description; @@ -283,7 +283,8 @@ public class ApsEnumUtil { CANCEL_PLAN("CANCEL_PLAN", "取消计划"), MAT_CALC("MAT_CALC", "物料运算"), HEURISTIC("HEURISTIC", "排程运算"), - FIELD_SET("FIELD_SET", "字段赋值"); + FIELD_SET("FIELD_SET", "字段赋值"), + FLUSH_PLAN("FLUSH_PLAN", "刷新计划"); private String value; private String description; @@ -420,7 +421,9 @@ public class ApsEnumUtil { NEARLY_WORK("NEARLY_WORK", "前后工作"), POST_RESOURCE("POST_RESOURCE", "后资源制约"), SAME_ASS_RESOURCE("SAME_ASS_RESOURCE", "相同副资源"), - RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级"); + RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级"), + RESOURCE_USEAGE("RESOURCE_USEAGE", "资源使用率"), + CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); private String value; private String description; @@ -706,7 +709,8 @@ public class ApsEnumUtil { NONE("NONE", "不分割"), RATIO("RATIO", "按比例分割"), COUNT("COUNT", "按数量分割"), - BATCH("BATCH", "按批量分割"); + BATCH("BATCH", "按批量分割"), + REMAINDER("REMAINDER", "按余数分割"); private String value; private String description; @@ -1110,4 +1114,33 @@ public class ApsEnumUtil { return description; } } + + /** + * 订单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_STATUS { + NOPLAN("NOPLAN", "未计划"), + PLANDONE("PLANDONE", "计划完毕"), + INDICATIONDONE("INDICATIONDONE", "指示完毕"), + CONFIRM("CONFIRM", "确认"), + STARTPRODUCT("STARTPRODUCT", "开始生产"), + FINISH("FINISH", "完成"); + + private String value; + private String description; + + ORDER_STATUS(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 7a4d706..14ef7d8 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 @@ -985,6 +985,171 @@ public class BlockFormEnumUtil { } + + /** + * 元素组织隔离 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_ORGANIZE_ISOLATION_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"); + + private int value; + private String code; + private String description; + + private ELEMENT_ORGANIZE_ISOLATION_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 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 ELEMENT_ORGANIZE_ISOLATION_STATUS 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) + public enum PROPERTY_EDIT_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"), + READONLY(3, "READONLY", "只读"); + + private int value; + private String code; + private String description; + + private PROPERTY_EDIT_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 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 PROPERTY_EDIT_STATUS 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; + } + } + /** * 属性字段排序规则 */ @@ -1158,7 +1323,7 @@ public class BlockFormEnumUtil { private Double getPropertyVirtualDoubleAdd(Object ... objs){ if(objs != null && objs.length > 0){ - Double result = new Double(0); + Double result = Double.valueOf(0); for (Object o : objs) { try { if(o != null){ @@ -1175,7 +1340,7 @@ public class BlockFormEnumUtil { private Double getPropertyVirtualDoubleLess(Object ... objs){ if(objs != null && objs.length > 0){ - Double result = new Double(0); + Double result = Double.valueOf(0); for (Object o : objs) { try { if(o != null){ @@ -1192,7 +1357,7 @@ public class BlockFormEnumUtil { private Double getPropertyVirtualDoubleMake(Object ... objs){ if(objs != null && objs.length > 0){ - Double result = new Double(0); + Double result = Double.valueOf(0); for (Object o : objs) { try { if(o != null){ @@ -1209,7 +1374,7 @@ public class BlockFormEnumUtil { private Double getPropertyVirtualDoubleDivision(Object ... objs){ if(objs != null && objs.length > 0){ - Double result = new Double(0); + Double result = Double.valueOf(0); for (Object o : objs) { try { if(o != null){ @@ -1235,7 +1400,8 @@ public class BlockFormEnumUtil { SQL(10, "SQL", "SQL脚本"), CLASS_METHOD(20, "ClassMethod", "类方法"), SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"), - SCRIPT(40, "Script", "脚本"); + SCRIPT(40, "Script", "脚本"), + URL(50, "URL", "网址"); private int value; private String code; @@ -1668,7 +1834,8 @@ public class BlockFormEnumUtil { DIALOG(10, "DIALOG", "弹出窗口"), NEW_WINDOW(20, "NEW_WINDOW", "新开窗口"), SQL(30, "SQL", "执行SQL"), - CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"); + CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"), + URL(50, "URL", "网址"); private int value; private String name; @@ -1928,8 +2095,8 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ELEMENT_TREE_DIRECTION { - horizontal(1, "horizontal", "横向"), - vertical(2, "vertical", "竖向"); + HORIZONTAL(1, "horizontal", "横向"), + VERTICAL(2, "vertical", "竖向"); private int value; private String code; 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 629d207..97c8733 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 @@ -689,8 +689,9 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FTP_ENCODE { - CONN_SUCCESS(10, "UTF-8", "UTF-8"), - CONN_FAILURE(20, "GBK", "GBK"); + UTF8(10, "UTF-8", "UTF-8"), + GBK(20, "GBK", "GBK"), + ISO88591(30, "ISO-8859-1", "ISO-8859-1"); private int value; private String encode; @@ -867,4 +868,197 @@ public class BlockSoftSwitchEnumUtil { return null; } } + + /** + * 长数据关联数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REF_DATA_TYPE { + SUIT_MESSAGE(10, "适配信息"), + REQUEST_ORGIN_PARAM(20, "请求原始参数"), + ORIGINAL_MESSAGE(30, "原始报文"), + CONVERTED_MESSAGE(40, "转换报文"), + SUIT_SEND_MESSAGE(50, "适配发送报文"); + + private int value; + private String description; + + private REF_DATA_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 REF_DATA_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; + } + + } + + /** + * 脚本类型 + */ + @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) { + String tmp = null; + 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) { + String tmp = null; + 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) { + 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/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 7973e88..1dba3c4 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,57 +20,70 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFT_TYPE { - IMPP(1, 0, 0, "impp-platform", "IMPP平台"), - CORE(2, 8100, 4, "i3core", "i3业务平台"), - WMS(3, 8200, 10, "i3wms", "仓库管理软件"), - MES(4, 8300, 11, "i3mes", "生产管理软件"), - QMS(5, 0, 0, "i3qms", "质量管理软件"), - MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"), - SWEB(7, 8800, 19, "i3sweb", "供应商服务"), - - PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"), - PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"), - - FORM(20, 8900, 16, "block-form", "智能表单"), - REPORT(21, 8910, 17, "block-report", "智能报表"), - WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"), - JOBFLOW(23, 0, 0, "block-jobflow", "智能作业流"), - SOFTSWITCH(24, 8920, 18, "block-softswitch", "软件适配器"), - HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"), - LAC(26, 8600, 13, "lac", "连接适配器"), - ANDON(27, 8500, 14, "andon", "安灯"), - APS(28, 8400, 15, "i3aps", "高级计划与排产"), - CENTER(99, 8000, 1, "icloud-server", "注册中心"), - SURFACE(98, 0, 0, "i3surface", "对外服务"), - CLOUD(97, 0, 0, "i3cloud", "微服务"), - GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"), - CONSOLE(95, 8010, 2, "impp-console", "服务监控台"); + /** WMS 服务 */ + WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"), + SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"), + QMS(5, 0, 0, 0, "i3qms", "质量管理软件"), - /** - * 产品ID - */ + /** Mes 服务 */ + MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"), + MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"), + + /** PTL 服务 */ + PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"), + PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"), + + /** Block 服务 */ + FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"), + REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"), + WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"), + JOBFLOW(23, 0, 0, 0, "block-jobflow", "智能作业流"), + SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"), + HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"), + + /** 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", "注册中心"), + + /** 平台服务 */ + CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"), + MDM(29, 8150, 22, 0, "i3mdm", "数据中心MDM"), + + /** 调试服务 */ + DEV(9999, 0000, 0, 120000000L, "Development", "系统调试"); + + + /** 产品ID */ private int value; - /** - * 应用默认端口 - */ - private int prot; - /** - * 应用默认雪花DataBaseId(0-31)共32 个存储区 - */ + /** 应用默认端口 */ + private int port; + /** 应用默认雪花DataBaseId(0-31)共32 个存储区 */ private int snowflakeId; - /** - * 产品代码 - */ + /** 产品代码 */ private String code; - /** - * 产品描述 - */ + /** 顶级菜单代码 */ + private long menuRootId; + /** 产品描述 */ private String description; - SOFT_TYPE(int value, int prot, int snowflakeId, String code, String description) { + SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) { this.value = value; - this.prot = prot; + this.port = port; this.snowflakeId = snowflakeId; + this.menuRootId = menuRootCode; this.code = code; this.description = description; } @@ -86,14 +100,18 @@ public class CommonEnumUtil { return description; } - public int getProt() { - return prot; + public int getPort() { + return port; } public int getSnowflakeId() { return snowflakeId; } + public long getMenuRootId() { + return menuRootId; + } + public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -134,7 +152,6 @@ public class CommonEnumUtil { } public static SOFT_TYPE valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; @@ -143,6 +160,15 @@ public class CommonEnumUtil { return null; } + public static SOFT_TYPE valueOfMenuRootId(long id) { + for (int i = 0; i < values().length; i++) { + if (values()[i].menuRootId == id) { + return values()[i]; + } + } + return null; + } + public static SOFT_TYPE codeOfDescription(String code) { for (int i = 0; i < values().length; i++) { if (values()[i].code.equals(code)) { @@ -847,7 +873,8 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CLOUD_APP_STATUS { UP(1,"UP" ,"在线"), - DOWN(2, "DOWN","断线"); + DOWN(2, "DOWN","断线"), + RESTRICTED(3,"RESTRICTED" ,"受限"); private int value; private String code; @@ -919,7 +946,9 @@ public class CommonEnumUtil { public enum LOG_LOGIN_PLATFORM { PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"), PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"), - Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"); + Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"), + MES_PCN(40, "MES-PCN", "MES-PCN"), + PTL_PCN(50, "PTL-PCN", "PTL-PCN"); private int value; private String name; @@ -978,7 +1007,7 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_LOGIN_STATUS { LOGIN_SUCCESS(1, "登录成功", "登录成功"), - WRONG_PASSWORD(3, "密码错误", "Linux 密码错误"), + WRONG_PASSWORD(3, "密码错误", "用户密码错误"), WRONG_USERNAME_OR_PASSWORD(2, "用户名或密码错误", "用户名或密码错误"), USER_LOGIN_LOCKING(4, "账号已锁定", "账号已锁定"), USER_INFO_NULL(5, "用户信息不存在", "用户信息不存在"), @@ -1230,7 +1259,7 @@ public class CommonEnumUtil { * 日志记录方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LOG_DETAIL_SHOW_TYPE { + public enum LOG_DETAIL_SHOW_TYPE { DEBUG(1, "DEBUG"), OVER_TIME(2, "记录超时服务"), ALL_METHOD(3, "所有服务"), @@ -1545,7 +1574,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"); /** * 属性类型值 @@ -1883,6 +1912,19 @@ public class CommonEnumUtil { 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){ @@ -1913,6 +1955,22 @@ public class CommonEnumUtil { 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,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(); + } } /** @@ -1961,4 +2019,591 @@ public class CommonEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DAO_OPERATE_TYPE { + INSERT(1, "新增"), + DELETE(2, "删除"), + UPDATE(3, "修改"), + SELECT(4, "查询"); + + private int value; + private String description; + + private DAO_OPERATE_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 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; + } + } + + /** + * actuator env + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTUATOR_ENV_PATH { + PID(1,"/PID" ,"PID"), + JAVA_VERSION(2, "/java.version","jdk版本"); + + private int value; + private String path; + private String description; + + private ACTUATOR_ENV_PATH(int value, String path, String description) { + this.value = value; + this.path = path; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getPath() { + return path; + } + + public String getDescription() { + return description; + } + + public static String valueOfPath(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].path; + } + } + return tmp; + } + + public static int pathOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].path.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 String pathOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].path.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * actuator env + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTUATOR_METRICS_INFO { + UPTIME(1, "/process.uptime", "上线时间"), + PROCESS_CPU_USAGE(1, "/process.cpu.usage", "进程CPU使用率"), + CPU_COUNT(1, "/system.cpu.count", "CPU数量"), + SYSTEM_CPU_USAGE(1, "/system.cpu.usage", "系统CPU使用率"), + GC_PAUSE(1, "/jvm.gc.pause", "GC暂停"), + THREADS_LIVE(1, "/jvm.threads.live", "实时线程"), + THREADS_PEAK(1, "/jvm.threads.peak", "线程峰值"), + THREADS_DAEMON(1, "/jvm.threads.daemon", "守护线程"), + + MEMORY_HEAP_MAX(1, "/jvm.memory.max", "area:heap", "堆内存最大空间"), + MEMORY_HEAP_USE(1, "/jvm.memory.used", "area:heap", "堆内存使用量"), + MEMORY_HEAP_SIZE(1, "/jvm.memory.committed", "area:heap", "堆内存大小"), + + MEMORY_NON_HEAP_MAX(1, "/jvm.memory.max", "area:nonheap", "非堆内存最大空间"), + MEMORY_NON_HEAP_USE(1, "/jvm.memory.used", "area:nonheap", "非堆内存"), + MEMORY_NON_HEAP_METASPACE(1, "/jvm.memory.used", "area:nonheap,id:Metaspace", "非堆原空间"), + MEMORY_NON_HEAP_SIZE(1, "/jvm.memory.committed", "area:nonheap", "非堆大小"); + + private int value; + private String path; + private String tag; + private String description; + + private ACTUATOR_METRICS_INFO(int value, String path, String description) { + this.value = value; + this.path = path; + this.description = description; + } + + private ACTUATOR_METRICS_INFO(int value, String path, String tag, String description) { + this.value = value; + this.path = path; + this.tag = tag; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getPath() { + return path; + } + public String getTag() { + return tag; + } + + public String getDescription() { + return description; + } + + public static String valueOfPath(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].path; + } + } + return tmp; + } + + public static int pathOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].path.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 String pathOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].path.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_SOURCE_STATUS { + CONN_SUCCESS(10, "验证成功", "验证成功"), + CONN_FAILURE(20, "验证失败", "验证失败"); +// TIME_OUT(30, "连接超时", "连接超时"), +// AUTH_ERROR(40, "账号密码错误", "账号密码错误"); + + private int value; + private String code; + private String description; + + private DATA_SOURCE_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 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 DATA_SOURCE_STATUS 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; + } + } + + + /** + * PC自定义搜索-字段类型 + * 10-文本，20-数字，30-下拉框，40，时间，50-开窗 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FIELD_TYPE { + TEXT(10, "text"), NUMBER(20, "number"), + SELECT(30, "select"), DATETIME(40, "datetime"), + LIST(50, "list"); + + private int value; + private String description; + + FIELD_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 int descriptionOfValue(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 FIELD_TYPE codeOf(Integer value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + } + + /** + * PC自定义搜索-取值方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_FIELD_GET_WAY { + ENUM(10, "SINGLE_OBJ", "枚举"), + OBJ(20, "MULTIPLE_OBJ", "对象"), + URL(30, "SINGLE_OBJ", "接口"); + + private int value; + private String code; + private String description; + + DYNAMIC_FIELD_GET_WAY(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 DYNAMIC_FIELD_GET_WAY 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; + } + + 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 STOCK_SN_QC_STATUS { + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), + ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); + + private int value; + private String code; + private String description; + + STOCK_SN_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 Integer descriptionOfValue(String desc) { + Integer tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static CommonEnumUtil.STOCK_SN_QC_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) + public enum STOCK_SN_STATUS { + CREATE(10, "创建"), + QUALITY_CONTROL(20, "质检中"), + PRE_INSTOCK(30, "待入库"), + INSTOCKED(40, "入库"), + PICKED(50, "配料"), + OUT_STOCK(60, "出库"), + SCRAP(70, "报废"), + COMMING(80, "在途"); + + private int value; + private String description; + + STOCK_SN_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 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 DYNAMIC_DATA_SOURCE_TYPE { + 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; + } + } + } 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 f8581ff..76f1b9b 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 @@ -16,12 +16,11 @@ public class ImppEnumUtil { * 1.集团，2.公司，3.工厂 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORGANIZE_YTPE{ + public enum ORGANIZE_YTPE { - TYPE_GROUP(1,"集团","集团"), - TYPE_COMPANY(2,"公司","公司"), - TYPE_FACTORY(3,"工厂","工厂"), - ; + TYPE_GROUP(1, "集团", "集团"), + TYPE_COMPANY(2, "公司", "公司"), + TYPE_FACTORY(3, "工厂", "工厂"); private int value; private String name; @@ -86,8 +85,8 @@ public class ImppEnumUtil { * 3.权限CODE */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TASK_METHOD_TYPE{ - CLASS_METHOD(1,"类方法","Java Class 方法"); + public enum TASK_METHOD_TYPE { + CLASS_METHOD(1, "类方法", "Java Class 方法"); // TYPE_COMPANY(2,"链接","Http URL"), // TYPE_FACTORY(3,"权限CODE","权限CODE"); @@ -148,7 +147,7 @@ public class ImppEnumUtil { } /** - * 日志级别 + * 日志级别 * 1.DEBUG：调试程序信息， * 2.INFO：程序运行信息， * 3.WARN：具有潜在危害的信息， @@ -156,13 +155,13 @@ public class ImppEnumUtil { * 5.FATAL：非常严重的错误，可能导致程序中止 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LOG_LEVEL{ + public enum LOG_LEVEL { - DEBUG(1,"DEBUG","调试"), - INFO(2,"INFO","信息"), - WARN(3,"WARN","注意"), - ERROR(4,"ERROR","错误"), - FATAL(5,"FATAL","严重"); + DEBUG(1, "DEBUG", "调试"), + INFO(2, "INFO", "信息"), + WARN(3, "WARN", "注意"), + ERROR(4, "ERROR", "错误"), + FATAL(5, "FATAL", "严重"); private int value; private String name; @@ -219,6 +218,17 @@ public class ImppEnumUtil { return tmp; } + + public static LOG_LEVEL valueOf(int val) { + LOG_LEVEL tmp = ERROR; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -238,13 +248,13 @@ public class ImppEnumUtil { * 4.SELECT：查询 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OPERATE_TYPE{ + public enum OPERATE_TYPE { - INSERT(1,"post","新增"), //POST - DELETE(2,"put","修改"), //PUT - UPDATE(3,"delete","删除"), //DELETE - SELECT(4,"get","查询"), //GET - BUSI(5,"busi","处理"); + INSERT(1, "post", "新增"), //POST + DELETE(2, "put", "修改"), //PUT + UPDATE(3, "delete", "删除"), //DELETE + SELECT(4, "get", "查询"), //GET + BUSI(5, "busi", "处理"); private int value; private String name; @@ -317,9 +327,9 @@ public class ImppEnumUtil { * 1.PC：个人计算机 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OPERATE_TERMINAL{ + public enum OPERATE_TERMINAL { - PC(1,"电脑端"),PDA(2,"PDA"),MOBILE(3,"手机"); + PC(1, "电脑端"), PDA(2, "PDA"), MOBILE(3, "手机"); private int value; private String description; @@ -360,8 +370,8 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_STATUS { - READ(1,"已读","fa cell-fa fa-file-text"), - UNREAD(2,"未读","fa cell-fa fa-file-o"); + READ(1, "已读", "fa cell-fa fa-file-text"), + UNREAD(2, "未读", "fa cell-fa fa-file-o"); private int value; private String name; @@ -420,6 +430,48 @@ public class ImppEnumUtil { } /** + * 用户消息发送状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_SEND_STATUS { + + SENDING(1, "发送中"), + SEND_SUCCESS(2, "发送成功"), + SEND_FAIL(3, "发送失败"); + + private int value; + private String description; + + MESSAGE_SEND_STATUS() { + } + + MESSAGE_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; + } + + } + + /** * 用户消息类型 * 1.NOTICE：通知 * 2.STATION_LETTER：站内信 @@ -428,10 +480,10 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_TYPE { - MAIL(1,"邮件","邮件"), - LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"), - SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); private int value; private String name; @@ -498,13 +550,13 @@ public class ImppEnumUtil { * 5.MIDDLE_TABLE：中间表 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TOOL_CONN_TYPE{ + public enum TOOL_CONN_TYPE { - SERIAL_PORT(1,"串口","串口"), - NETWORK_PORT(2,"网口","网口"), - OPC(3,"OPC","OPC"), - USB(4,"USB","USB"), - MIDDLE_TABLE(5,"中间表","中间表"); + SERIAL_PORT(1, "串口", "串口"), + NETWORK_PORT(2, "网口", "网口"), + OPC(3, "OPC", "OPC"), + USB(4, "USB", "USB"), + MIDDLE_TABLE(5, "中间表", "中间表"); private int value; private String name; private String description; @@ -568,11 +620,11 @@ public class ImppEnumUtil { * 3.BINARY_PACKET：二进制数据包 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TOOL_DATA_TYPE{ + public enum TOOL_DATA_TYPE { - STRING(1,"字符串","字符串"), - TABLE(2,"数据表","数据表"), - BINARY_PACKET(3,"二进制数据包","二进制数据包"); + STRING(1, "字符串", "字符串"), + TABLE(2, "数据表", "数据表"), + BINARY_PACKET(3, "二进制数据包", "二进制数据包"); private int value; private String name; @@ -635,9 +687,9 @@ public class ImppEnumUtil { * 1.SYSTEM：系统参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SYS_CONFIG_TYPE{ + public enum SYS_CONFIG_TYPE { - SYSTEM(1,"系统参数","系统参数"); + SYSTEM(1, "系统参数", "系统参数"); private int value; private String name; @@ -702,8 +754,8 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_TYPE_CONTENT { - HTML(1,"HTML","text/html;charset=UTF-8"), - TEXT(2,"TEXT","text/plain;charset=UTF-8"); + HTML(1, "HTML", "text/html;charset=UTF-8"), + TEXT(2, "TEXT", "text/plain;charset=UTF-8"); private int value; private String name; @@ -770,9 +822,9 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DYN_TABLE_CELL_TYPE { - STRING(1,"String","字符串类型"), - NUMBER(2,"Number","数字类型"), - DATE(3,"Date","时间类型"); + STRING(1, "String", "字符串类型"), + NUMBER(2, "Number", "数字类型"), + DATE(3, "Date", "时间类型"); private int value; private String name; @@ -829,6 +881,7 @@ public class ImppEnumUtil { return tmp; } } + /** * 系统值类型 * 1. String @@ -838,12 +891,13 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_VALUE_TYPE { - STRING(1,"text","文本"), - NUMBER(2,"number","数字"), - DATE(3,"date","时间"), - SWITCH(4,"switch","布尔"), - SELECT(5,"select","选择"), - FILE(6,"select","选择"); + STRING(1, "text", "文本"), + NUMBER(2, "number", "数字"), + DATE(3, "date", "时间"), + SWITCH(4, "switch", "布尔"), + SELECT(5, "select", "选择"), + FILE(6, "select", "选择"), + ARRAY(7, "array", "数组"); private int value; private String name; @@ -910,7 +964,7 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_CACHE_TYPE { - REDIS(1,"Redis","Redis 缓存方式"); + REDIS(1, "Redis", "Redis 缓存方式"); private int value; private String name; @@ -1054,6 +1108,7 @@ public class ImppEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_RECEIVER_TYPE { INTERNAL(1, "内部人员"), @@ -1095,10 +1150,10 @@ public class ImppEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FILE_ATTACH_SOURCE { - MAIL(1,"邮件","邮件"), - LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"), - SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); private int value; private String name; @@ -1233,4 +1288,92 @@ public class ImppEnumUtil { return null; } } + + /** + * 密码策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_TEXT { + PASSWORD_VERIFY(1, "保存策略"), + PASSWORD_LOGIN(2, "登录策略"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private CHECK_TEXT(int value, String description) { + this.value = value; + 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 CHECK_TEXT valueOfEnum(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 USER_CUSTOMIZE_CONFIG_TYPE { + WEB_TABLE_SHOW_COL(10, "前端表格显示列"); + + private int value; + private 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; + } + } } 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 new file mode 100644 index 0000000..84e7427 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java @@ -0,0 +1,165 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : Model Pojo 枚举 + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-11-21 15:50 + * @Modify: + **/ +public class MdmEnumUtil { + + /** + * 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MDM_OPERATE_TYPE { + INSERT(1, "新增"), + UPDATE(2, "修改"); + + private int value; + private String description; + + private MDM_OPERATE_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_OPERATE_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; + } + } + + /** + * hql实体类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HQL_ENTITY_TYPE { + MASTER(1, "master", "主数据"), + BUSI(2, "busi", "业务数据"); + + private int value; + private String alias; + private String description; + + private HQL_ENTITY_TYPE(int value, String alias, String description) { + this.value = value; + this.alias = alias; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getAlias() { + return alias; + } + + 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 String valueOfAlias(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].alias; + } + } + return tmp; + } + + public static MdmEnumUtil.HQL_ENTITY_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; + } + } + + /** + * mdm + */ + public enum MDM_SYNC_TYPE{ + INSERT(1, "新增"), + UPDATE(2, "修改"), + DELETE(3, "删除"); + + private int value; + private String description; + + private MDM_SYNC_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_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 8e46651..7f802e0 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 @@ -12,6 +12,95 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + @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 WORK_MODULE_TYPE { + MONITOR_MODULE(10, "监听组件"), + REVEAL_MODULE(20, "展示组件"), + BUTTON_MODULE(30, "按钮组件"), + TIMING_MODULE(40, "定时组件"); + + private int value; + private String description; + + WORK_MODULE_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; + } + } + /** * 排序方式 */ @@ -152,7 +241,7 @@ public class MesEnumUtil { } /** - * 排序校验模式 + * 排序校验模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CHECK_PROD_SEQ_FLAG { @@ -219,13 +308,14 @@ public class MesEnumUtil { } /** - * 排序校验模式 + * 排序校验模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TOOLING_ACTION_RECORD_TYPE { REPLACE(10, "REPLACE", "更换"), WAREHOUSE(20, "WAREHOUSE", "入库"), - Use(30, "Use", "领用"); + Use(30, "Use", "领用"), + ERROR(40, "ERROR", "异常操作"); private int value; private String code; @@ -283,6 +373,7 @@ public class MesEnumUtil { return valueOf(val); } } + /** * JIS发运是否按主队列顺序扫描 */ @@ -395,6 +486,9 @@ public class MesEnumUtil { NEVER(-1, "不过期"), ONE_HOUR(3600, "一小时"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), + TEN_MIN(300, "十分钟"), ONE_MIN(60, "一分钟"); private int value; @@ -608,7 +702,12 @@ public class MesEnumUtil { REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), - WC_CHECK("WC_CHECK", "开线检查项"); + WC_CHECK("WC_CHECK", "开线检查项"), + BOARD("BOARD", "看板类型"), + 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包装条码赋值样品类型值"); private String value; private String description; @@ -626,7 +725,7 @@ public class MesEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -835,7 +934,7 @@ public class MesEnumUtil { return null; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -892,6 +991,51 @@ public class MesEnumUtil { } } + /** + * Mes 对象结构是否展示 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OBJECT_CFG_IS_SHOW { + + SHOW(1, "是"), + NO_SHOW(2, "否"); + + private int value; + private String description; + + OBJECT_CFG_IS_SHOW(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; + } + } /** * Mes 客户订单来源 @@ -918,7 +1062,7 @@ public class MesEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -1045,6 +1189,16 @@ public class MesEnumUtil { return tmp; } + 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 description) { Integer tmp = null; for (int i = 0; i < values().length; i++) { @@ -1760,56 +1914,67 @@ public class MesEnumUtil { * mes导入模块 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_INSERT_EXCEL { - - MES_PLAN_ORDER(10, "生产计划"), - MES_EQUIPMENT(20, "设备台账"), - MES_EQU_TASK_STANDARD(30, "设备作业要求"), - MES_CUST_ORDER(40, "客户订单"), - MES_PCN_SYNC_CFG(50, "PCN同步配置"), - MES_PART(60, "物料表"), - MES_PRODUCE_CATEGORY(70, "产品类型"), - MES_PACK_SPEC(80, "包装规格"), - MES_PROD_PACK(90, "产品包装关系"), - MES_PRODUCT_ENCODE_CFG(100, "产品编码配置"), - MES_BOM(110, "物料清单"), - MES_PROD_CFG_TYPE(120, "产品配置类型"), - MES_CUSTOMER(130, "客户表"), - MES_CUSTOMER_PART(140, "客户零件关系表"), - MES_WORK_CENTER(150, "生产线"), - MES_WORK_CELL(160, "工位"), - MES_WC_EQUIPMENT(170, "工位设备关系表"), - MES_SHIFT(180, "班次"), - MES_SHIFT_GROUP(190, "班组"), - MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"), - MES_STATION_BOM(210, "工位BOM表"), - MES_DATA_OBJECT(220, "数据对象"), - MES_OBJECT_CFG(230, "对象结构"), - MES_WC_CHECK(240, "开线检查"), - MES_QC_CHECK_STANDARD(250, "质量检测标准"), - MES_FAULT_CAUSE(260, "设备故障原因"), - MES_FAULT_METHOD(270, "设备故障处理措施"), - MES_FAULT_PHENOMENON(280, "设备故障现象"), - MES_DEFECT(290, "缺陷"), - MES_DEFECT_CAUSE(300, "缺陷原因"), - MES_SCRAP(310, "报废原因"), - MES_REPAIR(320, "质量数据处理措施"), - MES_EQU_TASK_PLAN(330, "设备作业周期计划"), - MES_PART_OJBECT(340, "物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), - MES_DATASOURCE(360, "DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"), - MES_PLC(390, "PLC地址清单"), - MES_PROCESS(400, "工序信息"), - MES_KPSN_RULE(410, "关键件条码校验规则"), - MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"); + public enum MES_EXCEL { + + MES_PLAN_ORDER(10, "planOrderExcelService", "生产计划"), + MES_EQUIPMENT(20, "equipmentExcelService", "设备台账，支持编辑"), + MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelService", "设备作业要求，支持编辑"), + MES_CUST_ORDER(40, "custOrderExcelService", "客户订单"), + MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelService", "PCN同步配置"), + MES_PART(60, "partExcelService", "物料表，支持编辑"), + MES_PRODUCE_CATEGORY(70, "produceCategoryExcelService", "产品类型"), + MES_PACK_SPEC(80, "packSpecExcelService", "包装规格，支持编辑"), + MES_PROD_PACK(90, "prodPackExcelService", "产品包装关系"), + MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelService", "产品编码配置"), + MES_BOM(110, "bomExcelService", "物料清单，支持编辑"), + MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelService", "产品配置类型"), + MES_CUSTOMER(130, "customerExcelService", "客户表，支持编辑"), + MES_CUSTOMER_PART(140, "customerPartExcelService", "客户零件关系表，支持编辑"), + MES_WORK_CENTER(150, "workCenterExcelService", "生产线，支持编辑"), + MES_WORK_CELL(160, "workCellExcelService", "工位，支持编辑"), + MES_WC_EQUIPMENT(170, "wcEquipmentExcelService", "工位设备关系表"), + MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"), + MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"), + MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"), + MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"), + MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"), + MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"), + MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"), + MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelService", "质量检测标准，支持编辑"), + MES_FAULT_CAUSE(260, "faultCauseExcelService", "设备故障原因，支持编辑"), + MES_FAULT_METHOD(270, "faultMethodExcelService", "设备故障处理措施，支持编辑"), + MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelService", "设备故障现象，支持编辑"), + MES_DEFECT(290, "defectExcelService", "缺陷，支持编辑"), + MES_DEFECT_CAUSE(300, "defectCauseExcelService", "缺陷原因，支持编辑"), + MES_SCRAP(310, "scrapExcelService", "报废原因，支持编辑"), + MES_REPAIR(320, "repairExcelService", "质量数据处理措施，支持编辑"), + MES_EQU_TASK_PLAN(330, "equTaskPlanExcelService", "设备作业周期计划，支持编辑"), + MES_PART_OJBECT(340, "partObjectExcelService", "物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelService", "工序工作单元"), + MES_DATASOURCE(360, "datasourceExcelService", "DB地址清单"), + MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelService", "设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelService", "设备通知对象"), + MES_PLC(390, "plcExcelService", "PLC地址清单，支持编辑"), + MES_PROCESS(400, "processExcelService", "工序信息"), + MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"), + MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), + MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), + MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"), + MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"), + NEW_SCATTER_BOM(460, "scatterBomCfgExcelService", "新散件BOM导入"), + ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"), + SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"), + MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), + MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"), + BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"); private int value; + private String service; private String description; - MES_INSERT_EXCEL(int value, String description) { + MES_EXCEL(int value, String service, String description) { this.value = value; + this.service = service; this.description = description; } @@ -1817,20 +1982,23 @@ public class MesEnumUtil { return value; } + public String getService() { + return service; + } + public String getDescription() { return description; } - public static MES_INSERT_EXCEL getByValue(int value) { - for (MES_INSERT_EXCEL mesInsertExcel : values()) { - if (mesInsertExcel.getValue() == value) { - return mesInsertExcel; + public static MES_EXCEL getByValue(int value) { + for (MES_EXCEL excel : values()) { + if (excel.getValue() == value) { + return excel; } } return null; } - public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -1841,6 +2009,16 @@ public class MesEnumUtil { return tmp; } + public static String valueOfService(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].service; + } + } + return tmp; + } + } /** @@ -2452,16 +2630,19 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - - FIRST_CHECK(10, "首检"), - ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"); + INCOMING_CHECK(5, "INCOMING_CHECK", "来料检验"), + FIRST_CHECK(10, "FIRST_CHECK", "首检"), + ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), + END_CHECK(30, "END_CHECK", "末检"), + RC_CHECK(40, "RC_CHECK", "发货检验"); private int value; + private String code; private String description; - MES_QC_CHECK_TYPE(int value, String description) { + MES_QC_CHECK_TYPE(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -2469,6 +2650,10 @@ public class MesEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -2996,7 +3181,9 @@ public class MesEnumUtil { public enum METHOD_TYPE { EXEC(10, "执行方法"), - COMPLETE(20, "完成方法"); + COMPLETE(20, "完成方法"), + HNC_ISSUED(30,"队列自动下达"), + LABEL_PROPERTIES(40,"标签属性查询方法"); private int value; private String description; @@ -3122,7 +3309,12 @@ public class MesEnumUtil { BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), STOCK_ORDER(60, "库存工单"), - REPAIR(70,"返修插单"); + REPAIR(70, "返修插单"), + EMERGENCY_ORDER(80, "紧急插单"), + FICTIVE(90, "虚拟工单"), + SPARE_PART_PRODUCTION(100, "备件生产"), + REPRODUCTION_RMS(110, "重新生产-报功"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); private int value; private String description; @@ -3149,6 +3341,16 @@ public class MesEnumUtil { } 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; + } } /** @@ -3221,7 +3423,7 @@ public class MesEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -3260,7 +3462,7 @@ public class MesEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -3358,6 +3560,7 @@ public class MesEnumUtil { PACKAGE_SCAN(35, "打包扫描"), INSTOCKED(40, "入库"), SHIPING(50, "发运"), + REDO(60, "重做"), CLOSE(90, "关闭"), ; @@ -3508,7 +3711,8 @@ public class MesEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), SCRAPED(30, "报废"), - DISMANTLED(40, "已拆解"); + DISMANTLED(40, "已拆解"), + PRE_CHECK(50, "待检测"); private int value; private String description; @@ -3705,7 +3909,8 @@ public class MesEnumUtil { QUALIFIED(10, "number", "数字"), DEFECTED(20, "text", "字符串"), SCRAPED(30, "select", "可选值"), - BUTTON(40, "button", "按钮"); + BUTTON(40, "button", "按钮"), + WINDOW(50, "window", "开窗"); private int value; private String code; @@ -4071,15 +4276,6 @@ public class MesEnumUtil { return tmp; } - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } /** @@ -4385,7 +4581,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_QUEUE_TYPE { PRODUCT_QUEUE(10, "生产队列"), - PRELOAD_QUEUE(20, "预装队列"); + PRELOAD_QUEUE(20, "预装队列"), + FIRST_STATION_QUEUE(30, "首工位队列"); private int value; private String description; @@ -4702,15 +4899,1856 @@ public class MesEnumUtil { } return tmp; } + } - public static String valueOfDescription2(int val) { + /** + * 脚本语言类型 + * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + */ + public enum LANGUAGE_TYPE { + GROOVY(1, "Groovy", 10), + PYTHON(2, "jython", 20), // "jython" string can not change + JS(3, "JavaScript", 30); + // 下面这2种语言没人会写，暂不支持 + //SCALA(40,"scala"), + //JRUBY(50,"jruby"); + + private int index; + private String description; + private int value; + + LANGUAGE_TYPE(int index, String description, int value) { + this.index = index; + this.description = description; + this.value = value; + } + + public String getDescription() { + return description; + } + + public int getIndex() { + return this.index; + } + + public int getValue() { + return value; + } + + // 根据枚举编号获取语言代码 + public static String getCodeByIndex(Integer index) { + for (MesEnumUtil.LANGUAGE_TYPE languageType : MesEnumUtil.LANGUAGE_TYPE.values()) { + if (languageType.getValue() == index.intValue()) { + return languageType.getDescription(); + } + } + + return null; + } + } + + + /** + * 产品特性 + */ + @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.equals("已审批") ? "审批" : values()[i].description; + 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; } } + + /** + * 配置类型 + */ + /** + * mes工步类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROD_CFG_TYPE { + + NORMAL("10", "正常"), + SCATTERED("20", "散件"); + + private String value; + private String description; + + PROD_CFG_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 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 PART_FORMULA_TYPE { + DEVICE_SEMAPHORE(10, "设备信号"); + + private int value; + private String description; + + PART_FORMULA_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_FORMULA_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; + } + } + + /** + * 作业校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_MODEL { + NO_CHECK(10, "不校验"), + CHECK(20, "校验设备就绪信号"); + + private int value; + private String description; + + CHECK_MODEL(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; + } + } + + /** + * PLC类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_TYPE { + STANDARD(10, "标准"), + EQU_OPERATION_SIGNLE(20, "设备作业信号"); + + private int value; + private String description; + + PLC_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 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", " 工位状态监听看板"); + + 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; + } + } + + /** + * 看板类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_OBJECT_TYPE { + ORGANIZE_CODE("organizeCode", "工厂代码"), + AREA_CODE("areaCode", "区域代码"), + WORK_CENTER_CODE("workCenterCode", "产线代码"); + + private String value; + private String description; + + BOARD_OBJECT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static BOARD_OBJECT_TYPE getByCode(String code) { + for (BOARD_OBJECT_TYPE boardObjectType : values()) { + if (boardObjectType.getValue().equals(code)) { + return boardObjectType; + } + } + return null; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * mes 员工技能等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SKILL_LEVEL { + + TRAINING("10", "培训中"), + QUALIFIED("20", "合格"), + GOOD("30", "良好"), + CAN_GUIDE_OTHERS("40", "可指导他人"); + + private String value; + private String description; + + SKILL_LEVEL(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; + } + } + + /** + * 界面类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WINDOW_TYPE { + BUTTON_CFG(10, "按钮组件"), + BOARD_BASE_WINDOW(20, "看板基础页面"); + + private int value; + private String description; + + WINDOW_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 OPERATE_TYPE { + OEE(10, "OEE"), + MTBF(20, "MTBF平均故障间隔"), + MTTR(30, "MTTR平均修理时间"); + + private int value; + private String description; + + OPERATE_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 ATTRIBUTE_TYPE { + STANDARD_ATTRIBUTE(10, "标准属性"), + CUSTOM_ATTRIBUTE(20, "自定义属性"); + + private int value; + private String description; + + ATTRIBUTE_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 VALUE_TYPE { + MANUAL_ASSIGNMENT("10", "手工赋值"), + SPEL_EXPRESSION("20", "spel表达式"), + FUNCTION_ASSIGNMENT("30", "函数赋值"), + JOB_ASSIGNMENT("40", "job赋值"); + + private String value; + private String description; + + VALUE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static VALUE_TYPE getByValue(String value) { + for (VALUE_TYPE valueType : values()) { + if (valueType.getValue().equals(value)) { + return valueType; + } + } + 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 OBJECT_CODE { + ORGANIZE_OEE("10", "工厂OEE"), + WORK_CENTER_OEE("20", "产线OEE"), + WORK_CELL_CEE("30", "工位OEE"), + EQU_OEE("40", "设备OEE"); + + private String value; + private String description; + + OBJECT_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static OBJECT_CODE getByValue(String value) { + for (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; + } + } + + /** + * 脚本类型（组件、表单、报表、JOB、其他） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRIPT_TYPE { + ASSEMBLY(10, "组件"), + FORM(20, "表单"), + REPORT_FORM(30, "报表"), + JOB(40, "JOB"), + OTHER(50, "其他"); + + private int value; + private String description; + + SCRIPT_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; + } + } + + /** + * 语言类型（Groovy、Python、JavaScript、Scala、Ruby） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRIPT_LANGUAGE { + GROOVY(10, "Groovy"), + PYTHON(20, "Python"), + JAVA_SCRIPT(30, "JavaScript"), + SCALA(40, "Scala"), + RUBY(50, "Ruby"); + + private int value; + private String description; + + 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; + } + } + + + /** + * 运算对象代码 + */ + @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(天)"); + + 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; + } + } + + /** + * oee 运算状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OEE_STATUS { + STAY_OPERATE(10, "待运算"), + ALREADY_OPERATE(20, "已运算"); + + private int value; + private String description; + + OEE_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 QC_STATUS { + CREATE(10, "创建"), + RECEIPT(20, "执行中"), + SUBMISSION(30, "提交"), + COMPLETE(40, "完成"); + + private int value; + private String description; + + QC_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 IN_READ_FLAG { + NOTREAD(0, "未读取"), + READ(1, "已读取"); + + private int value; + private String description; + + IN_READ_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; + } + } + + /** + * MES_检验单 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_STATUS { + + CREATE(10, "创建"), + IN_EXEC(20, "执行中"), + COMPLETE(30, "完成"); + + private int value; + private String description; + + MES_QC_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; + } + } + + /** + * MES_检验单 检测整体结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_CHECK_RESULT { + + PASS(10, "通过"), + NO_PASS(20, "不通过"), + COMPROMISE_PASS(30, "让步通过"); + + private int value; + private String description; + + MES_QC_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; + } + + 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; + } + } + + + /** + * MES_PLC 数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_DATA_TYPE { + STRING("10", "String", "字符串"), + BOOLEAN("20","Boolean", "布尔"), + WORD("30", "Word", "整形-Word"), + DWORD("40","Dword", "整形-DWord"), + LONG("50", "Long", "长整形-Long"), + SHORT("60", "Short", "UShort"), + DOUBLE("70", "Double", "双精度-Double"), + FLOAT("80", "Float", "单精度-Float"), + LLONG("90", "LLong", "LLONG"), + QWORD("100", "QWord", "QWORD"), + BCD("110", "BCD", "BCD"), + LBCD("120", "LBCD", "LBCD"), + BYTE("130", "Byte", "Byte"), + CHAR("140", "Char", "Char"), + Date("150", "DateTime", "日期"); + + private String value; + private String code; + private String description; + + PLC_DATA_TYPE(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 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 codeOfValue(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * MES_产品颜色 类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_COLOR_TYPE { + + PRODUCT_COLOR(10, "产品颜色"), + MATERIAL_COLOR(20, "物料颜色"); + + private int value; + private String description; + + MES_COLOR_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; + } + } + + /** + * 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) + public enum DATA_FORMAT { + STRING_FORMAT(1, "String", "字符串格式"), + INTEGER_FORMAT(2, "Integer", "整数格式"), + DOUBLE_FORMAT(3, "Double", "高精度浮点格式"), + DATE_FORMAT(4, "Date", "日期格式"), + FLOAT_FORMAT(5, "Float", "浮点格式"), + BOOL_FORMAT(6, "Boolean", "布尔格式"), + LONG_FORMAT(7, "LONG", "长整数格式"); + + private int value; + private String code; + private String description; + + DATA_FORMAT(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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 数据导入类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_IMPORT_TYPE { + SINGLE_TABLE(10, "SINGLE_TABLE", "单表"), + MULTI_TABLE(20, "MULTI_TABLE", "多表"); + + private int value; + private String code; + private String description; + + TEMPLATE_IMPORT_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 数据更新类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_UPDATE_TYPE { + FULL_COVERAGE(10, "FULL_COVERAGE", "全覆盖"), + DIFF_UPDATE(20, "DIFF_UPDATE", "差异更新"), + REPEATE_NO_IMPORT(30, "REPEATE_NO_IMPORT", "重复不导入"); + + private int value; + private String code; + private String description; + + TEMPLATE_UPDATE_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 校枪状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CALIBRATION_STATUS { + UNEXECUTED(10, "UNEXECUTED", "待执行"), + EXECUTE(20, "EXECUTE", "执行中"), + CANCEL(30, "CANCEL", "取消"), + FINISH(40, "FINISH", "完成"); + + private int value; + private String code; + private String description; + + CALIBRATION_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; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + + /** + * 扭矩枪类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GUN_TYPE { + DL(10, "DL", "小枪"), + PF(20, "PF", "大枪"); + + private int value; + private String code; + private String description; + + GUN_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 盲检类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOPIC_TYPE { + COLOUR(10, "颜色"), + GRADE(20, "等级"), + TO_CONFIGURE(30, "配置"); + + private int value; + private String description; + + TOPIC_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 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 OPTION_TYPE { + OPTION(10, "选配件"), + BOM_DISASSEMBLY(20, "BOM拆解"); + + private int value; + private String description; + + 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 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) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 扭矩采集 黄枪规则(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) + public enum STOP_MACHINE_TYPE { + TIMER_TIME_OUT(10, "计时器超时停机"), + DELAY_HELP(20, "延时帮助停机"), + URGENT_STOP(30, "急停停机"); + + private int value; + private String description; + + STOP_MACHINE_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 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 OPTION_CODE { + EXISTENCE("+", "存在"), + NON_EXISTENCE("-", "不存在"), + BRACKET_OPERATION("()", "括号运算"), + AND("&", " 与"), + OR("|", "或"); + + private String value; + private String description; + + OPTION_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; + } + } + + /** + * 条码生成模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GENERATE_TYPE { + RELEASE_GENERATION(10, "下达生成"), + STATION_GENERATION(20, "工位生成"); + + private Integer value; + private String description; + + GENERATE_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.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 客户JIT预装队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_PLAN_STATUS { + CREATE(10, "创建"), + RELEASED(20, "已释放"), + ERROR(999, "异常"); + + private Integer value; + private String description; + + QUEUE_JIT_PLAN_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.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 客户JIT队列下达配置 缓存类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIT_ISSUE_CFG_TYPE { + ORDER_CACHE(10, "订单池"), + LOCK_CACHE(20, "锁定池"); + + private Integer value; + private String description; + + JIT_ISSUE_CFG_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; + } + } + + /** + * JIT队列订单池 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIT_ORDER_CACHE_STATUS { + CREATE(10, "创建"), + COMPLETE(20, "完成"), + CANCEL(30, "取消"); + + private Integer value; + private String description; + + JIT_ORDER_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 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; + } + } + + /** + * 队列 料架摆放位置 + */ + @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; + } + } + + /** + * QAD 解析对象 + */ + @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","物料信息"); + + private String code; + private String method; + private String objectCode; + private String description; + + QAD_DATA_OBJECT(String code, String method, String objectCode, String description) { + this.code = code; + this.method = method; + this.objectCode = objectCode; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getMethod() { + return method; + } + + public String getObjectCode() { + return objectCode; + } + + 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 QAD_DATA_OBJECT getByObjectCode(String objectCode) { + for (QAD_DATA_OBJECT qadDataObject : values()) { + if (qadDataObject.getObjectCode().equals(objectCode)) { + return qadDataObject; + } + } + return null; + } + + public static QAD_DATA_OBJECT getByCode(String code) { + for (QAD_DATA_OBJECT qadDataObject : values()) { + if (qadDataObject.getCode().equals(code)) { + return qadDataObject; + } + } + return null; + } + } } 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 16034b1..38a7634 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,6 +13,45 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 作业程序组件类型 + */ + @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回调工位参数"); + + private int value; + private String description; + + WORK_MODULE_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) @@ -333,8 +372,12 @@ public class MesPcnEnumUtil { REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), - WC_CHECK("WC_CHECK", "开线检查项"); - + WC_CHECK("WC_CHECK", "开线检查项"), + BOARD("BOARD", "看板类型"), + 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包装条码赋值样品类型值"); private String value; private String description; @@ -351,7 +394,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -572,6 +615,16 @@ public class MesPcnEnumUtil { return tmp; } + 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 MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { if (mesMatchType.getValue() == value) { @@ -666,7 +719,8 @@ public class MesPcnEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), SCRAPED(30, "报废"), - DISMANTLED(40, "已拆解"); + DISMANTLED(40, "已拆解"), + PRE_CHECK(5, "待检测"); private int value; private String description; @@ -889,10 +943,11 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - + INCOMING_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"); + END_CHECK(30, "末检"), + RC_CHECK(40, "发货检验"); private int value; private String description; @@ -1734,7 +1789,8 @@ public class MesPcnEnumUtil { PAUSE(40, "暂停"), CANCEL(50, "取消"), CLOSE(60, "关闭"), - COMPLETE(70, "完成"); + COMPLETE(70, "完成"), + FICTIVE(80, "虚拟工单"); private int value; private String description; @@ -1772,8 +1828,15 @@ public class MesPcnEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"); -// JIT_ORDER(50, "JIT工单"); + BH_ORDER(40, "B&H工单"), + JIT_ORDER(50, "JIT工单"), + STOCK_ORDER(60, "库存工单"), + REPAIR(70, "返修插单"), + EMERGENCY_ORDER(80, "紧急插单"), + FICTIVE(90, "虚拟工单"), + SPARE_PART_PRODUCTION(100, "备件生产"), + REPRODUCTION_RMS(110, "重新生产-报功"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); private int value; private String description; @@ -1872,7 +1935,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -1911,7 +1974,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -1968,7 +2031,9 @@ public class MesPcnEnumUtil { public enum QUEUE_ORDER_DETAIL_STATUS { NORMAL(10, "正常"), - CLOSE(20, "关闭"); + CLOSE(20, "关闭"), + FINISH(30, "完成"), + OFF_LINE_REWORK(40, "线下返修"); private int value; private String description; @@ -2023,7 +2088,7 @@ public class MesPcnEnumUtil { } /** - * MesPartCategory实体对应的categoryType值 条码表条码质量状态 + * MesPartCategory实体对应的categoryType值 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PART_CATEGORY_TYPE { @@ -2169,7 +2234,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(String val) { + public static String valueOfDescription(Integer val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -2302,7 +2367,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -2313,18 +2378,17 @@ public class MesPcnEnumUtil { } } - @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCE_SN_STATUS { - CREATE(10, "创建"), PROCESS(20, "加工"), OFFLINE(30, "下线"), PACKAGE_SCAN(35, "打包扫描"), INSTOCKED(40, "入库"), - SHIPING(50, "发运"), - CLOSE(90, "关闭"), - ; + SHIPPING(50, "发运"), + REDO(60, "重做"), + FORCE(70, "强过"), + CLOSE(90, "关闭"); private int value; private String description; @@ -2351,6 +2415,16 @@ public class MesPcnEnumUtil { } return tmp; } + + 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; + } } @@ -2424,7 +2498,7 @@ public class MesPcnEnumUtil { public enum PACKAGE_PRINT_STATUS { UNPRINTED(10, "未打印"), - PRINTED(20, "打印"); + PRINTED(20, "已打印"); private int value; private String description; @@ -2460,6 +2534,7 @@ public class MesPcnEnumUtil { public enum STATION_BUSI_TYPE { MESSAGE("message", "返回信息"), STEP_LIST("stepList", "工步列表"), + STATE_LIST("stateList", "状态列表"), STEP_CONTENT("stepContent", "工步内容"), MODULE_CONTENT("moduleContent", "组件内容"), CUSTOM_COMPONENT("customComponent", "定制内容"), @@ -2467,7 +2542,11 @@ public class MesPcnEnumUtil { 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_START("timeModuleStart", "定时组件开始"), + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); private String value; private String description; @@ -2504,11 +2583,16 @@ public class MesPcnEnumUtil { TABLE("table", "表格"), TEXT("text", "正常文本"), EXP_TEXT("exp_text", "异常文本"), - FILE("file", "定制内容文件"), + FILE("file", "打印模板文件"), IMAGE("image", "图片"), BUTTON("button", "按钮"), TABLES("tables", "多个表格"), - FORM("form", "文本按钮"); + CUSTOM("custom", "定制页面"), + CUSTOM_DIALOG("custom_dialog", "定制弹窗"), + FORM("form", "文本按钮"), + SPEC_TEXT("spec_text", "工步弹框文本"), + IMAGE_LIST("image_list", "图片列表"), + SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"); private String value; private String description; @@ -2839,7 +2923,9 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_CELL_MONITOR_TYPE { MONITOR(10, "监听组件"), - SHOW(20, "展示组件"); + SHOW(20, "展示组件"), + BUTTON(30, "按钮组件"), + PROCESS_MONITOR(40, "工序监听组件"); private int value; private String description; @@ -3206,7 +3292,8 @@ public class MesPcnEnumUtil { public enum TABLE_COLOR { GREEN("green", "绿色"), - YELLOW("Yellow", "黄色"); + RED("red", "红色"), + YELLOW("yellow", "黄色"); private String code; private String description; @@ -3241,7 +3328,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SHIPPING_ACTUAL_STATUS { CREATE(10, "创建"), - CANCEL(20, "已发运"); + SHIPPED(20, "已发运"); private int value; private String description; @@ -3270,6 +3357,41 @@ public class MesPcnEnumUtil { } } + /** + * 散件IT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SP_SHIPPING_STATUS { + CREATE(10, "创建"), + SHIPPED(20, "已发运"); + + private int value; + private String description; + + SP_SHIPPING_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 FSM_EVENT { TRIGGER(10, "trigger", "触发"), @@ -3302,7 +3424,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FSM_STATE_TYPE { BEGIN(10, "begin", "开始状态点"), - END(20, "end", "结束状态点"); + BACK(20, "back", "回退状态点"), + END(40, "end", "结束状态点"); private int value; private String code; @@ -3351,14 +3474,16 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATION_REQUEST_BEAN_CMD { - JUMP_STATUS(10, "跳过状态点"), - FORCE_DO_SPEC_STATUS(20, "强制执行制定的状态点"); + JUMP_STATE(10, "JUMP_STATE", "跳过状态点"), + FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点"); private int value; + private String code; private String description; - STATION_REQUEST_BEAN_CMD(int value, String description) { + STATION_REQUEST_BEAN_CMD(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -3366,6 +3491,10 @@ public class MesPcnEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -3416,4 +3545,1023 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 换膜状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DIE_CHANGE_STATUS { + + INITIALIZATION(0, "初始化"), + START(1, "开始换模"), + COMPLETE(2, "完成换模"); + + private int value; + private String description; + + DIE_CHANGE_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 LOAD_FSM_ROUTE_TYPE { + + BY_PART("0", "通过物料号加载"), + BY_AUTO("1", "自动加载"); + + private String value; + private String description; + + LOAD_FSM_ROUTE_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 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 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; + } + } + + /** + * 质检单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + CREATE(10, "创建"), + RECEIPT(20, "执行中"), + SUBMISSION(30, "提交"), + COMPLETE(40, "完成"); + + private int value; + private String description; + + QC_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 CHECK_REULST { + + PASS(10, "通过"), + NON_PASS(20, "不通过"), + CONCESSION_PRODUCTION(30, "让步生产"); + + private int value; + private String description; + + CHECK_REULST(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; + 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 VERIFY_MODE { + PART_NO_BY_BOM("10", "按物料号匹配By-Bom"), + WORK_CENTER_CODE_BY_BOM("20", "按产线匹配By-Bom"), + WORK_CENTER_CODE_BY_SCATTER("30", "按产线匹配By-Scatter"); + + private String value; + private String description; + + VERIFY_MODE(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; + } + } + + /** + * 界面类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WINDOW_TYPE { + BUTTON_CFG(10, "按钮组件"), + BOARD_BASE_WINDOW(20, "看板基础页面"), + STEP_WINDOW(30, "工步界面"); + + private int value; + private String description; + + WINDOW_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 CALIBRATION_STATUS { + UNEXECUTED(10, "UNEXECUTED", "待执行"), + EXECUTE(20, "EXECUTE", "执行中"), + CANCEL(30, "CANCEL", "取消"), + FINISH(40, "FINISH", "完成"); + + private int value; + private String code; + private String description; + + CALIBRATION_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; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 扭矩枪类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GUN_TYPE { + DL(10, "DL", "小枪"), + PF(20, "PF", "大枪"); + + private int value; + private String code; + private String description; + + GUN_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 排序校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_PROD_SEQ_FLAG { + PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), + CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), + OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + + private int value; + private String code; + private String description; + + CHECK_PROD_SEQ_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 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 PRODUCE_ERROR_RECORD { + JUMP_PROCESS(10, "跳过工序"), + JUMP_STEP(20, "跳过工步"), + JUMP_STATE(30, "跳过状态点"), + ABNORMAL_DEDUCTION(40, "扣减异常"); + + private int value; + private String description; + + PRODUCE_ERROR_RECORD(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 TOPIC_TYPE { + COLOUR(10, "零件颜色"), + GRADE(20, "等级"), + TO_CONFIGURE(30, "配置"); + + private int value; + private String description; + + TOPIC_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 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 STOP_MACHINE_TYPE { + TIMER_TIME_OUT(10, "计时器超时停机"), + DELAY_HELP(20, "延时帮助停机"), + URGENT_STOP(30, "急停停机"); + + private int value; + private String description; + + STOP_MACHINE_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 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; + } + } + + /** + * plc状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PLC_STATUS { + + UN_CONNECT(0, "断开"), + CONNECT(1, "连接"); + + private int value; + private String description; + + MES_PLC_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) { + 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 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) + public enum KEY_BIND_MODE { + + PRODUCE_BOM_BIND(10, "产品BOM绑定"), + SCATTER_BOM_BIND(20, "散件BOM绑定"); + + private int value; + private String description; + + KEY_BIND_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 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 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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * MES_产品颜色 类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_COLOR_TYPE { + + PRODUCT_COLOR(10, "产品颜色"), + MATERIAL_COLOR(20, "物料颜色"); + + private int value; + private String description; + + MES_COLOR_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 OPTION_TYPE { + OPTION(10, "选配件"), + BOM_DISASSEMBLY(20, "BOM拆解"); + + private int value; + private String description; + + 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 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) { + 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 VALUE_RANGE { + + SCAN(10, "扫描"), + READ_CACHE(20, "读取缓存"); + + private int value; + private String description; + + VALUE_RANGE(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 AGV_BUTTON_TRIGGER { + + DELAY(10, "延时启动"), + EMERGENCY_STOP(20, "紧急停止"); + + private int value; + private String description; + + AGV_BUTTON_TRIGGER(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } + + /** + * 工作中心 工位监控模式 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 PLC_DATA_DIRECT { + + PLC_WRITE(10, "plc->mes"), + MES_WRITE(20, "mes->plc"), + SHARE(30, "共用"); + + private int value; + private String description; + + PLC_DATA_DIRECT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } + } 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 8956db4..6fbf7bc 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 @@ -11,6 +11,238 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class PtlEnumUtil { /** + * 方法类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_METHOD_TYPE { + INTERFACE(10, "界面方法"), + MONITOR(20, "监听方法"); + + private int value; + private String description; + + PTL_METHOD_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 ROUTE_STATUS_TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + ROUTE_STATUS_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 ROUNT_STATUS_TRIGGER_EVENT { + SUCCESS("SUCCESS", "是"), + FAILURE("FAILURE", "否"); + + private String value; + private String description; + + ROUNT_STATUS_TRIGGER_EVENT(String value, String description) { + this.value = value; + this.description = description; + } + + public static ROUNT_STATUS_TRIGGER_EVENT getByValue(String value) { + for (ROUNT_STATUS_TRIGGER_EVENT triggerEvent : values()) { + if (triggerEvent.getValue().equals(value)) { + return triggerEvent; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 组件状态类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + FINISH(30, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + ROUTE_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; + } + } + + /** + * 作业流程类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_ROUTE_TYPE { + GEN_TASK(10, "GEN_TASK", "生成任务"), + OFF_TAG(20, "OFF_TAG", "灭灯"); + + private int value; + private String code; + private String description; + + ACTION_ROUTE_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; + } + } + + /** + * 状态机执行方法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ACTION_TYPE { + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); + + private String value; + private String code; + private String description; + + ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) { + for (ROUTE_STATUS_ACTION_TYPE actionType : values()) { + if (actionType.getValue().equals(value)) { + return actionType; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** + * 组件参数类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_MODULE_PARAM_TYPE { + + QUALIFIED(10, "number", "数字"), + DEFECTED(20, "text", "字符串"), + SCRAPED(30, "select", "可选值"), + BUTTON(40, "button", "按钮"); + + private int value; + private String code; + private String description; + + ACTION_MODULE_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; + } + } + + /** * 标签类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -393,9 +625,9 @@ public class PtlEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PTL_TASK_STATUS { CREATE(10, "创建"), - EXECUTION(20, "执行中"), - COMPLETE(30, "完成"), - CANCEL(40, "取消"); + COMPLETE(20, "完成"), + CLOSE(30, "关闭"), + EXECUTION(40, "执行中"); private int value; private String 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 4a4bb65..9c85618 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 @@ -12,6 +12,31 @@ import org.springframework.util.StringUtils; public class PtlPcnEnumUtil { /** + * 状态机异常处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS { + TRUE(10, "已处理"), + FALSE(20, "未处理"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(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) @@ -547,23 +572,26 @@ public class PtlPcnEnumUtil { } + /** + * 状态机执行方法 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RouteEvent { - TRIGGER(10, "trigger", "触发"), - ENTRY(20, "entry", "进入状态"), - EXIT(30, "exit", "离开状态"); + public enum ROUTE_STATUS_ACTION_TYPE { + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); - private int value; + private String value; private String code; private String description; - RouteEvent(int value, String code, String description) { + ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -576,8 +604,11 @@ public class PtlPcnEnumUtil { } } + /** + * 流程状态 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RouteState { + public enum ROUTE_STATE { START(10, "START", "开启流程"), TERMINATE(20, "TERMINATE", "终止流程"), FINISH(30, "FINISH", "结束流程"); @@ -586,7 +617,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - RouteState(int value, String code, String description) { + ROUTE_STATE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -605,6 +636,9 @@ public class PtlPcnEnumUtil { } } + /** + * 标签类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TAG_TYPE { BIN_TAG(10, "库位标签"), @@ -639,15 +673,18 @@ public class PtlPcnEnumUtil { } } + /** + * 流程状态-触发类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TriggerType { + public enum ROUTE_STATUS_TRIGGER_TYPE { INNER_TRIGGER(10, "内部触发"), OUTER_TRIGGER(20, "外部触发"); private int value; private String description; - TriggerType(int value, String description) { + ROUTE_STATUS_TRIGGER_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -661,8 +698,11 @@ public class PtlPcnEnumUtil { } } + /** + * 作业流程类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RouteType { + public enum ACTION_ROUTE_TYPE { GEN_TASK(10, "GEN_TASK", "生成任务"), OFF_TAG(20, "OFF_TAG", "灭灯"); @@ -670,45 +710,9 @@ public class PtlPcnEnumUtil { private String code; private String description; - RouteType(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 MONITOR_PROCESS_MESSAGE_TYPE { - CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - EXCEPTION_DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), - LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), - CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), - INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"), - REFRESH_CONTROL_CMD(70, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"); - - private int value; - private String code; - private String callClass; - private String description; - - MONITOR_PROCESS_MESSAGE_TYPE(int value, String code, String callClass, String description) { + ACTION_ROUTE_TYPE(int value, String code, String description) { this.value = value; this.code = code; - this.callClass = callClass; this.description = description; } @@ -720,129 +724,16 @@ public class PtlPcnEnumUtil { return code; } - public String getCallClass() { - return callClass; - } - public String getDescription() { return description; } - - public static MONITOR_PROCESS_MESSAGE_TYPE getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } - } - - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum INTERFACE_SIGNAL_MESSAGE_TYPE { - CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), - SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), - INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); -// UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), -// LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), -// LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); - - private int value; - private String code; - private String callClass; - private String description; - - INTERFACE_SIGNAL_MESSAGE_TYPE(int value, String code, String callClass, String description) { - this.value = value; - this.code = code; - this.callClass = callClass; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCallClass() { - return callClass; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } } /** - * 生成任务actor message type + * websocket业务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum GEN_TASK_MESSAGE_TYPE { - GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); - - private int value; - private String code; - private String callClass; - private String description; - - GEN_TASK_MESSAGE_TYPE(int value, String code, String callClass, String description) { - this.value = value; - this.code = code; - this.callClass = callClass; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCallClass() { - return callClass; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } - } - - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsBusiType { + public enum WS_BUSI_TYPE { MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理"); @@ -850,7 +741,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - WsBusiType(int value, String code, String description) { + WS_BUSI_TYPE(int value, String code, String description) { this.value = value; this.description = description; this.code = code; @@ -869,8 +760,11 @@ public class PtlPcnEnumUtil { } } + /** + * websocket消息类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsDataType { + public enum WS_DATA_TYPE { TEXT(10, "TEXT", "正常信息"), EXP_TEXT(20, "EXP_TEXT", "异常信息"), TABLE(30, "TABLE", "表格"); @@ -879,7 +773,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - WsDataType(int value, String code, String description) { + WS_DATA_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -898,17 +792,20 @@ public class PtlPcnEnumUtil { } } + /** + * 组件状态类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum STATUS_TYPE { + public enum ROUTE_STATUS_TYPE { START(10, "START", "开始状态"), - FINISH(20, "FINISH", "完成状态"), - TERMINATE(30, "TERMINATE", "中断状态"); + EXECUTING(20, "EXECUTING", "执行中状态"), + FINISH(30, "FINISH", "完成状态"); private int value; private String code; private String description; - STATUS_TYPE(int value, String code, String description) { + ROUTE_STATUS_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -933,7 +830,8 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_DETAIL_STATUS { CREATE(10, "CREATE", "创建"), - COMPLETE(20, "COMPLETE", "完成"); + COMPLETE(20, "COMPLETE", "完成"), + CLOSE(30, "CLOSE", "关闭"); private int value; private String code; @@ -963,8 +861,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_STATUS { - CREATE(10, "CREATE", "新建"), - RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); + CREATE(10, "CREATE", "创建"), + COMPLETE(20, "COMPLETE", "完成"), + CLOSE(30, "CLOSE", "关闭"); private int value; private String code; @@ -1018,10 +917,10 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PTL_MAIN_TASK_STATUS { - CREATE(10, "CREATE", "新建"), - RECEIPT(20, "RECEIPT", "执行中"), - RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), - CANCELLED(40, "CANCELLED", "已取消"); + CREATE(10, "CREATE", "创建"), + COMPLETE(20, "COMPLETE", "完成"), + CLOSE(30, "CLOSE", "关闭"), + EXECUTION(40, "EXECUTION", "执行中"); private int value; private String code; @@ -1384,7 +1283,7 @@ public class PtlPcnEnumUtil { } /** - * mes-pcn定时任务同步结果状态 + * ptl-pcn定时任务同步结果状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PTL_PCN_TASK_SYNC_STATUS { @@ -1516,7 +1415,8 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_TASK_STATUS { CREATE(10, "CREATE", "创建"), - RECEIPT_FINISH(30, "COMPLETED", "完成"); + COMPLETE(20, "COMPLETE", "完成"), + CLOSE(30, "CLOSE", "关闭"); private int value; private String code; @@ -1686,4 +1586,40 @@ public class PtlPcnEnumUtil { return tmp; } } + + /** + * 同步标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_FLAG { + + UNSYNC(1, "未同步"), + SYNCED(2, "已同步"); + + private int value; + private String description; + + SYNC_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; + } + } } 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 9c0ef71..fd9784a 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 @@ -531,4 +531,213 @@ public class SwebEnumUtil { return tmp; } } + + /** + * 移库单业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_BUSI_TYPE { + PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"), + CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"), + OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"), + ALLOCATION(40, "ALLOCATION", "调拨"), + SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"), + SCATTERED_IN(60, "SCATTERED_IN", "零星入库"), + NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"), + SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR + CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"), + PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"), + INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"), + SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"), + RECEIVING_IN(130, "RECEIVING_IN", "收货入库"), + OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"), + NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"), + SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"), + NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"), + NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"), + LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"), + ASN(200, "ASN", "ASN"), + PO(210, "PO", "PO"), + QC(220, "QC", "QC"), + AMPR(230, "AMPR", "AMPR"), + FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"), + VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"), + VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"), + VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"), + VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"), + VDA_QC(290, "VDA_QC", "VDA质检"), + VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), + VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"), + KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"), + KT_SCRAP(330, "KT_SCRAP", "KT报废"), + KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"), + KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"), + KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"), + KT_RETURN(370, "KT_RETURN", "KT退货"), + KT_REWORK(380, "KT_REWORK", "KT返工"), + KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"), + KT_SORTING(400, "KT_SORTING", "KT分选"), + VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"), + VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"), + KT_DEFINITE(430, "KT_DEFINITE", "KT合格"), + VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"), + KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), + KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), + FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), + KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), + PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), + UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), + TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), + EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), + LOADING_ORDER(530, "LOADING_ORDER", "装车单"), + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"); + private int value; + private String code; + private String description; + + OUT_MOVEMENT_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 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); + } + } + + /** + * 单据条码状态（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) + public enum ORDER_STOCK_TYPE { + SOURCE(10, "实物条码"), + TARGET(20, "虚拟条码"), + CUST_SN(30, "客户条码"); + + private int value; + private String description; + + ORDER_STOCK_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 String valueOfDescription(int val) { + return valueOf(val); + } + } } 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 cc9d5ed..e41c77c 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 @@ -139,6 +139,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -193,7 +194,8 @@ public class WmsEnumUtil { SUB(20, "SUB", "委外采购"), TAR(30, "TAR", "多角贸易采购"), TAP(40, "TAP", "多角代采购"), - AMP(50, "AMP", "AMP收货"); + AMP(50, "AMP", "AMP收货"), + INNER(60, "INNER", "内部收货"); private int value; private String code; @@ -240,7 +242,7 @@ public class WmsEnumUtil { /** - * 单据主表状态(ASN,PO,MOVE,QC) + * 单据主表状态(ASN,PO,MOVE,QC,SO) */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { @@ -299,11 +301,69 @@ public class WmsEnumUtil { } /** + * 收货状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REC_STATUS_KANBAN { + TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"), + RECEIVING(20, "RECEIVING", "收货中"), + DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"), + COMPLETED(40, "COMPLETED", "已完成"); + + private int value; + private String code; + private String description; + + REC_STATUS_KANBAN(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); + } + } + + /** * 订单明细状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { CREATE(10, "CREATE", "创建"), + PROCESSING(50, "PROCESSING", "发运中"), RECEIPTED(20, "FINISHED", "已完成"), CANCEL(30, "CANCLE", "行取消"), PRINTED(40, "PRINTED", "已打印"); @@ -512,7 +572,9 @@ public class WmsEnumUtil { NC_LOCATE(60, "N", "NC库"), SPILLAGE_LOCATE(70, "Y", "溢料库"), TRANSIT_LOCATE(80, "T", "在途库"), - UTENSIL_LOCATE(90, "U", "器具库"); + UTENSIL_LOCATE(90, "U", "器具库"), + OPERATION_PALTFORM(100, "W", "工作台"), + CUST_LOCATE(110, "CUST", "客户库位"); private int value; private String code; @@ -536,6 +598,14 @@ public class WmsEnumUtil { return code; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -694,18 +764,18 @@ public class WmsEnumUtil { VDA_QC(290, "VDA_QC", "VDA质检"), VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"), - KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"), - KT_SCRAP(330, "KT_SCRAP", "KT报废"), - KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"), - KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"), - KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"), - KT_RETURN(370, "KT_RETURN", "KT退货"), - KT_REWORK(380, "KT_REWORK", "KT返工"), - KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"), - KT_SORTING(400, "KT_SORTING", "KT分选"), + RECEPTION(320, "RECEPTION", "让步接收"), + SCRAP(330, "SCRAP", "报废"), + QUARANTINE(340, "QUARANTINE", "隔离"), + BACK_QUARANTINE(350, "BACK_QUARANTINE", "反隔离"), + DEFINITE_FAIL(360, "DEFINITE_FAIL", "不合格"), + RETURN(370, "RETURN", "退货"), + REWORK(380, "REWORK", "返工"), + MISCALCULATION(390, "MISCALCULATION", "误判"), + SORTING(400, "SORTING", "分选"), VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"), VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"), - KT_DEFINITE(430, "KT_DEFINITE", "KT合格"), + DEFINITE(430, "DEFINITE", "合格"), VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), @@ -714,8 +784,22 @@ public class WmsEnumUtil { PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), - EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"); - + EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), + LOADING_ORDER(530, "LOADING_ORDER", "装车单"), + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"), + FORK_INSTORE(550, "FORK_INSTORE", "叉车入库"), + CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"), + CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"), + AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"), + FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"), + INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运"), + ASSEMBLY_DISASSEMBLY_STORAGE(610, "ASSEMBLY_DISASSEMBLY_STORAGE\n", "总成拆解入库"), + INTERNAL_WORK_ORDER_MATERIAL_STORAGE(620, "INTERNAL_WORK_ORDER_MATERIAL_STORAGE", "内部工单物料入库"), + PART_NUMBER_CONVERSION_MATERIAL_STORAGE(630, "PART_NUMBER_CONVERSION_MATERIAL_STORAGE", "零件号转化物料入库"), + 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", "物料报废"); private int value; private String code; private String description; @@ -758,6 +842,19 @@ public class WmsEnumUtil { return tmp; } + public static OUT_MOVEMENT_BUSI_TYPE 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++) { @@ -871,7 +968,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -910,7 +1007,8 @@ public class WmsEnumUtil { VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PICK_RC("KT_PICK_RC", "坤泰拣货"), UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"), - TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"); + TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"), + INTELLIGENT("INTELLIGENT", "智能化"); private String value; private String description; @@ -1083,6 +1181,10 @@ public class WmsEnumUtil { 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++) { @@ -1248,6 +1350,9 @@ public class WmsEnumUtil { return tmp; } + public static int descriptionOfValue(String desc) { + return descOf(desc); + } public static String valueOfDescription(int val) { return valueOf(val); } @@ -1283,8 +1388,8 @@ public class WmsEnumUtil { public enum CS_STRATEGY_TYPE { PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); - + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"); private int value; private String description; @@ -1328,7 +1433,9 @@ public class WmsEnumUtil { AJUST_INVENTORY(50, "库存调整盘点"), PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"), + CHECK(150, "点检"); private int value; private String description; @@ -1609,6 +1716,42 @@ public class WmsEnumUtil { * 质检业务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + INSPECTION_FREE(10, "免检"), + PENDING_QUALITY_INSPECTION(20, "待质检"), + QUALITY_INSPECTION_COMPLETED(30, "质检完成"); + + private int value; + private String description; + + QC_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; + } + } + + /** + * 质检业务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_STATUS { CREATE(10, "新建"), FINISH(20, "处理中"), @@ -2242,7 +2385,8 @@ public class WmsEnumUtil { MATERIAL(40, "MATERIAL", "物料对象"), TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"), - BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"); + BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"), + BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"); private String code; private String description; @@ -2505,7 +2649,8 @@ public class WmsEnumUtil { BOX(10, "BOX", "BOX（盒）"), CARTON(20, "CARTON", "CARTON（箱）"), PALLET(30, "PALLET", "PALLET（栈板）"), - CONTAINER(40, "PALLET", "PALLET（集装箱）"); + CONTAINER(40, "PALLET", "PALLET（集装箱）"), + FEEDER(50, "FEEDER", "料架"); private String code; private String description; @@ -2528,6 +2673,16 @@ 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; + } } /** @@ -2812,7 +2967,7 @@ public class WmsEnumUtil { // 根据枚举编号获取语言代码 public static String getCodeByIndex(Integer index) { for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) { - if (languageType.getValue() == index.intValue()) { + if (languageType.getValue() == index) { return languageType.getDescription(); } } @@ -2987,6 +3142,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -3174,6 +3330,7 @@ public class WmsEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -3187,7 +3344,10 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } - public static int descriptionOfValue(String desc) {return descOf(desc);} + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } } @@ -3274,7 +3434,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3316,6 +3476,17 @@ public class WmsEnumUtil { } return tmp; } + + + public static String descriptionOfValue(String desc) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -3325,6 +3496,7 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), + TGMES("TGMES", "泰国MES"), AMP("AMP", "AMP系统"), DR("DR", "直送拉动"); @@ -3343,10 +3515,20 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + 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].value; + } + } + return tmp; + } } public static Map getEnumByName(String enumName) throws Exception { - Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 + Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 Class clazz; Enum[] enumConstants; @@ -3444,7 +3626,7 @@ public class WmsEnumUtil { public static String getDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == code) { + if (values()[i].value.equals(code)) { tmp = values()[i].description; } } @@ -3565,7 +3747,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); + SOURCE(10, "实物条码"), + TARGET(20, "虚拟条码"), + CUST_SN(30, "客户条码"); private int value; private String description; @@ -3690,7 +3874,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3730,7 +3914,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3864,7 +4048,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -4095,7 +4279,8 @@ public class WmsEnumUtil { MENU_OPT(30, "MENU_OPT", "手工操作"), AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"), CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"), - UPDATE_TASK(60, "UPDATE_TASK", "复用任务"); + UPDATE_TASK(60, "UPDATE_TASK", "复用任务"), + AUTO_INSTORE_DOCMOVE(70, "AUTO_INSTORE", "自动入库移库单"); private int value; private String code; private String description; @@ -4197,7 +4382,8 @@ public class WmsEnumUtil { } } - /**分类 + /** + * 分类 * 物流规则 处理单位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4361,7 +4547,7 @@ public class WmsEnumUtil { /** - * 日志推送至MQ的处理类型 + * 规格层级 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SPEC_LEVEL { @@ -4789,6 +4975,17 @@ public class WmsEnumUtil { } return tmp; } + + public static int descriptionOfValue(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; + } + } /** @@ -4933,51 +5130,6 @@ public class WmsEnumUtil { } /** - * WEB页面字段类型 - * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FIELD_TYPE { - TEXT(10, "text"), NUMBER(20, "number"), - SELECT(30, "select"), DATETIME(40, "datetime"), - LIST(50, "list"); - - private int value; - private String description; - - FIELD_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 FIELD_TYPE codeOf(Integer value) { - for (int i = 0; i < values().length; i++) { - if (values()[i].value==value) { - return values()[i]; - } - } - return null; - } - } - - /** * 推送类型单位 * 默认为 10 */ @@ -5051,6 +5203,7 @@ public class WmsEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -5064,7 +5217,10 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } - public static int descriptionOfValue(String desc) {return descOf(desc);} + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } } /** @@ -5237,7 +5393,7 @@ public class WmsEnumUtil { } /** - * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 + * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -5299,125 +5455,62 @@ public class WmsEnumUtil { } /** - * 动态查询-下拉框规则 - * 默认为 10 + * 波次合并规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DYNAMIC_FIELD_SELECT_RULE { - SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"), - MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"), - SINGLE_URL(30, "SINGLE_URL", "单选接口"), - MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口"); + public enum WAVE_MERGE_RULE { + IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10, + 0, "isSameCustomer", "同客户"), + IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10, + 0, "isSameWareHouse", "同仓库"), + IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10, + 0, "isSamePriority", "同优先级"), + IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10, + 0, "isSameSrcZone", "同来源存储区"), + IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10, + 0, "isSameDestZone", "同目标存储区"), + IS_SAME_PART("同物料", "isSamePart", "2", 10, + 0, "isSamePart", "同物料"), + IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10, + 0, "isSamePartGroup", "同物料组"), + IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10, + 0, "isSameDeliveryTime", "同发货时间"), + IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10, + 0, "isSameBusiType", "同业务类型"), + IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10, + 0, "isSameOrderStatus", "同单据状态"), + IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10, + 0, "isCrossArea", "允许跨区"), + IS_COLLECTION("物料整箱归集", "isCollection", "2", 10, + 0, "isCollection", "物料整箱归集"); + + private String fieldChName; + + private String fieldEnName; + + private int mergeOperatorType; + + private String fieldValue; private int value; + private String code; + private String description; - DYNAMIC_FIELD_SELECT_RULE(int value, String code, String description) { + WAVE_MERGE_RULE(String fieldChName, String fieldEnName, String fieldValue, int mergeOperatorType, int value, + String code, String description) { + this.fieldChName = fieldChName; + this.fieldEnName = fieldEnName; + this.fieldValue = fieldValue; + this.mergeOperatorType = mergeOperatorType; this.value = value; - this.code = code; this.description = description; + this.code = code; } - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getCode() { - return code; - } - - public static DYNAMIC_FIELD_SELECT_RULE 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; - } - - 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 WAVE_MERGE_RULE { - IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10, - 0, "isSameCustomer", "同客户"), - IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10, - 0, "isSameWareHouse", "同仓库"), - IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10, - 0, "isSamePriority", "同优先级"), - IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10, - 0, "isSameSrcZone", "同来源存储区"), - IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10, - 0, "isSameDestZone", "同目标存储区"), - IS_SAME_PART("同物料", "isSamePart", "2", 10, - 0, "isSamePart", "同物料"), - IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10, - 0, "isSamePartGroup", "同物料组"), - IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10, - 0, "isSameDeliveryTime", "同发货时间"), - IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10, - 0, "isSameBusiType", "同业务类型"), - IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10, - 0, "isSameOrderStatus", "同单据状态"), - IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10, - 0, "isCrossArea", "允许跨区"), - IS_COLLECTION("物料整箱归集", "isCollection", "2", 10, - 0, "isCollection", "物料整箱归集"); - - private String fieldChName; - - private String fieldEnName; - - private int mergeOperatorType; - - private String fieldValue; - - private int value; - - private String code; - - private String description; - - WAVE_MERGE_RULE(String fieldChName, String fieldEnName, String fieldValue, int mergeOperatorType, int value, - String code, String description) { - this.fieldChName = fieldChName; - this.fieldEnName = fieldEnName; - this.fieldValue = fieldValue; - this.mergeOperatorType = mergeOperatorType; - this.value = value; - this.description = description; - this.code = code; - } - - public String getFieldChName() { - return fieldChName; + public String getFieldChName() { + return fieldChName; } public String getFieldEnName() { @@ -5446,7 +5539,7 @@ public class WmsEnumUtil { } /** - * 波次合并规则 + * 波次合并规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { @@ -5561,7 +5654,7 @@ public class WmsEnumUtil { } /** - * 插件类型 10-合并规则，20-合并范围 + * 插件类型 10-合并规则，20-合并范围 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_TYPE { @@ -5804,7 +5897,7 @@ public class WmsEnumUtil { return null; } - public static String valueOfDescription ( int val){ + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -5820,7 +5913,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QAD_DOC_TYPE { - TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + TYPE_S(10, "s", "s"), TYPE_D(20, "d", "d"); private int value; private String code; @@ -5830,7 +5923,7 @@ public class WmsEnumUtil { return code; } - QAD_DOC_TYPE(int value,String code, String description) { + QAD_DOC_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -5896,6 +5989,2862 @@ public class WmsEnumUtil { } return null; } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 道口类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DOCK_TYPE { + WAIT_SEND(10, "收货道口"), + HAS_SENDED(20, "发运道口"); + + private int value; + private String description; + + DOCK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static DOCK_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 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_STEEL_TYPE { + NONE(10, "非钢卷料"), + NORMAL(20, "普通钢卷料"), + FINE(30, "精钢卷料"); + + private int value; + private String description; + + PART_STEEL_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_STEEL_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 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_SUPPLY_TYPE { + JIT(10, "JIT"), + NOT_JIT(20, "非JIT"); + + private int value; + private String description; + + PART_SUPPLY_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_SUPPLY_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 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_RECEIVING_METHOD { + STAND(10, "标准收货"), + PREPARE(20, "预收货"); + + private int value; + private String description; + + PART_RECEIVING_METHOD(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_RECEIVING_METHOD 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 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WEEK_TYPE { + 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, int code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public int getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static WEEK_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; + } + + 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; + } + } + + /** + * 移库单移动类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SO_ORDER_TYPE { + SALES(10, "SALES", "销售"); + + private int value; + private String code; + private String description; + + SO_ORDER_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 数据格式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_FORMAT { + STRING_FORMAT(1, "String", "字符串格式"), + INTEGER_FORMAT(2, "Integer", "整数格式"), + DOUBLE_FORMAT(3, "Double", "高精度浮点格式"), + DATE_FORMAT(4, "Date", "日期格式"), + FLOAT_FORMAT(5, "Float", "浮点格式"), + BOOL_FORMAT(6, "Boolean", "布尔格式"), + LONG_FORMAT(7, "LONG", "长整数格式"); + + private int value; + private String code; + private String description; + + DATA_FORMAT(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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 数据导入类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_IMPORT_TYPE { + SINGLE_TABLE(10, "SINGLE_TABLE", "单表"), + MULTI_TABLE(20, "MULTI_TABLE", "多表"); + + private int value; + private String code; + private String description; + + TEMPLATE_IMPORT_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 数据更新类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_UPDATE_TYPE { + FULL_COVERAGE(10, "FULL_COVERAGE", "全覆盖"), + DIFF_UPDATE(20, "DIFF_UPDATE", "差异更新"), + REPEATE_NO_IMPORT(30, "REPEATE_NO_IMPORT", "重复不导入"); + + private int value; + private String code; + private String description; + + TEMPLATE_UPDATE_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + + /** + * 采购计划历史状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PURCHASE_PLAN_HISTORY_STATUS { + CREATE(10, "CREATE", "采购订单创建"), + PUBLISH(20, "PUBLISH", "采购订单发布"), + VERDOR_CONFIRM(30, "VERDOR_CONFIRM", "供应商确认订单"), + VERDOR_PRINT(40, "VERDOR_PRINT", "供应商打印"), + VERDOR_SNED(50, "VERDOR_SNED", "供应商发货"), + RECEIPT_FINISH(60, "RECEIPT_FINISH", "收货完成"), + FAIL(70, "FAIL", "质检完成"); + + private int value; + private String code; + private String description; + + PURCHASE_PLAN_HISTORY_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); + } + } + + /** + * BatchHold 检测大类 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_CHECK_TYPE { + FUNCTION(10, "FUNCTION", "功能检测"), + SIZE(20, "SIZE", "尺寸检测"), + DEPTH(30, "DEPTH", "熔深检测"); + + private int value; + private String code; + private String description; + + BH_CHECK_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); + } + } + + /** + * BatchHold 值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_VALUE_TYPE { + NUMBER(10, "NUMBER", "数字"), + TEXT(20, "TEXT", "文本"); + + private int value; + private String code; + private String description; + + BH_VALUE_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); + } + } + + /** + * BatchHold 值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FG_INSTOCK_SN_TYPE { + NORMAL(10, "NORMAL", "正常"), + FIRST_PIECE(20, "FIRST_PIECE", "首件"), + MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"), + TAIL_PIECE(40, "TAIL_PIECE", "末件"); + + private int value; + private String code; + private String description; + + FG_INSTOCK_SN_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 REWORK_STATUS { + INIT(10, "INIT", "初始化"), + BE_HANDLE(20, "BE_HANDLE", "待处理"), + HANDLING(30, "HANDLING", "处理中"), + FINISH(40, "FINISH", "已处理"), + NONE(50, "NONE", "不处理"); + + private int value; + private String code; + private String description; + + REWORK_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; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + + /** + * 返修、挑选状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOM_TYPE { + INIT(10, "PART", "物料"), + BE_HANDLE(20, "OUT", "委外"), + FINISH(30, "UTENSIL", "器具"); + + private int value; + private String code; + private String description; + + BOM_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 运输方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRANSPORT_TYPE { + LONG_HAUL(10, "长途运输"), + SHORT_DISTANCE(20, "短途运输"); + + private int value; + private String description; + + TRANSPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static TRANSPORT_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; + } + + 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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 物流供应商类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOGISTICS_PROVIDER_TYPE { + VENDOR(10, "承运商"); + + private int value; + private String description; + + LOGISTICS_PROVIDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static LOGISTICS_PROVIDER_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; + } + } + + /** + * BatchHold 物料检测标准值 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_PART_CHECK_STD { + NUMBER(1, "NORMAL", "合格"), + TEXT(2, "ABNORMAL", "不合格"); + + private int value; + private String code; + private String description; + + BH_PART_CHECK_STD(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); + } + } + + + /** + * BH检测结果类型 RepairOrPick + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_TEST_RESULT_TYPE { + PICK(10, "NORMAL", "挑选"), REPAIR(20, "ABNORMAL", "返修"); + private int value; + private String code; + private String description; + + BH_TEST_RESULT_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) { + 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 BH_TEST_RESULT_TYPE 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 HEALTH_INDICATOR_LEVEL { + HEALTH(10, "HEALTH", "健康"), + SUB_HEALTH(20, "SUB_HEALTH", "亚健康"), + NO_HEALTH(30, "NO_HEALTH", "不健康"); + private int value; + private String code; + private String description; + + HEALTH_INDICATOR_LEVEL(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; + } + } + + + /** + * 软适配数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SOFT_DATA_FORM { + XML(10, "XML", "XML"), JSON(20, "JSON", "JSON"); + private int value; + private String code; + private String description; + + SOFT_DATA_FORM(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 SOFT_DATA_FORM 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 APPROVAL_STATUS { + APPROVE_PROCESSING(10, "APPROVE_PROCESSING", "审批中"), + APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "审批通过"), + APPROVE_REFUSE(30, "APPROVE_REFUSE", "已驳回"); + + private int value; + private String code; + private String description; + + APPROVAL_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 APPROVAL_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) + public enum NORMAL_ABNORMAL { + NORMAL(10, "NORMAL", "正常"), + ABNORMAL(20, "ABNORMAL", "非正常"); + + private int value; + private String code; + private String description; + + NORMAL_ABNORMAL(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 NORMAL_ABNORMAL 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 BACTH_TRANS_TYPE { + REPORT(10, "REPORT", "报工"), + UNTYING(20, "UNTYING", "解绑"), + CHECK(30, "CHECK", "检测"), + PICK(40, "REPAIR", "挑选"), + REPAIR(50, "REPAIR", "返修"), + BIND(60, "BIND", "绑定"), + OUTSTOCK(70, "OUTSTOCK", "出库"); + private int value; + private String code; + private String description; + + BACTH_TRANS_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) { + 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 BACTH_TRANS_TYPE 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; + } + } + + /** + * 业务表：BH类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_TYPE { + HOLD_LOCATE(10, "hold库位"), + QUALITY_CONTROL(20, "质检中"), + PRE_INSTOCK(30, "待入库"); + + private int value; + private String description; + + BH_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; + } + } + + /** + * BH库位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_LOCATE_TYPE { + HOLD(10, "HOLD", "HOLD库位"), + WAIT_CHECK(20, "WAIT_CHECK", "待检测库位"), + WAIT_OUT(30, "WAIT_OUT", "待出库库位"); + + private int value; + private String code; + private String description; + + BH_LOCATE_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) { + 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 BH_LOCATE_TYPE 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; + } + } + + + /** + * BH处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_WORK_STATUS { + WAIT_CHECK(10, "WAIT_CHECK", "待检验"), + SUBMIT_CHECK(20, "SUBMIT_CHECK", "已送检"), + IN_CHECK(30, "IN_CHECK", "检验中"), + WAIT_CONFIRM(40, "WAIT_CONFIRM", "待确认"), + WAIT_REPARI(50, "WAIT_OUT", "待返修"), + WAIT_PICK(60, "WAIT_OUT", "待挑选"), + IN_REPARI(70, "WAIT_OUT", "返修中"), + IN_PICK(80, "WAIT_OUT", "挑选中"), + WAIT_OUT(90, "WAIT_OUT", "待出库"), + OUT(100, "WAIT_OUT", "已出库"); + + private int value; + private String code; + private String description; + + BH_WORK_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 BH_WORK_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) + public enum LOCATE_PROPORTION { + ZERO(10, "ZERO", "0%"), + GENERAL(20, "GENERAL", "0%-30%"), + MEDIUM(30, "MEDIUM", "30%-60%"), + WELL(40, "WELL", "60%-100%"); + + private int value; + private String code; + private String description; + + LOCATE_PROPORTION(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 LOCATE_PROPORTION 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; + } + } + + /** + * BH同步标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_SUMMARY_IS_SYNC { + INIT(10, "INIT", "初始化"), + WAIT_SYNC(20, "WAIT_SYNC", "待同步"), + FINISH_SYNC(30, "FINISH_SYNC", "已同步"); + + private int value; + private String code; + private String description; + + BH_SUMMARY_IS_SYNC(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 BH_SUMMARY_IS_SYNC 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 SCAN_CATEGORY { + ASN(10, "wmsDocMovementMasterRepository", "ASN"), + PO(20, "wmsDocMovementMasterRepository", "PO"), + SO(30, "wmsDocMovementMasterRepository", "SO"), + MOVE(40, "wmsDocMovementMasterRepository", "移库单"), + IN_STOCK(50, "wmsDocMovementMasterRepository", "入库单"), + SHIPPING(60, "wmsDocMovementMasterRepository", "发运单"), + QC(70, "wmsQCMasterRepository", "质检单"), + CS(80, "wmsCSOrderMasterRepository", "盘点单"), + SN(90, "wmsStockSnRepository", "条码"), + PO_SN(100, "wmsPoSnRepository,wmsASNMasterDetailsRepository", "收货条码"); + + private int value; + private String code; + private String description; + + SCAN_CATEGORY(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 SCAN_CATEGORY getByDesc(String desc) { + SCAN_CATEGORY tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static SCAN_CATEGORY 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 TRACTICS_GRADE { + ONE_TRACTICS_GRADE(10, "ONE_TRACTICS_GRADE", "1级策略"), + TWO_TRACTICS_GRADE(20, "TWO_TRACTICS_GRADE", "2级策略"), + THREE_TRACTICS_GRADE(30, "THREE_TRACTICS_GRADE", "3级策略"); + + private int value; + private String code; + private String description; + + TRACTICS_GRADE(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 TRACTICS_GRADE 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 TRACTICS_GROUP { + INSTOCK(10, "INSTOCK", "上架"), + PICKING(20, "PICKING", "拣货"); + + private int value; + private String code; + private String description; + + TRACTICS_GROUP(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 TRACTICS_GROUP 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; + } + } + + /** + * 上架:策略项:1级策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INSTOCK_TRACTICS_ITEM_ONE { + COI_RECOMMEND(10, "COI_RECOMMEND", "COI推荐"), + ADJACENT_RECOMMEND(20, "ADJACENT_RECOMMEND", "高频推荐(相邻)"), + AREA_RECOMMEND(30, "AREA_RECOMMEND", "区域随机推荐"), + INERTIA_RECOMMEND(40, "INERTIA_RECOMMEND", "惯性推荐"), + ARTIFICIAL_RECOMMEND(50, "ARTIFICIAL_RECOMMEND", "人工指定"); + + private int value; + private String code; + private String description; + + INSTOCK_TRACTICS_ITEM_ONE(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 INSTOCK_TRACTICS_ITEM_ONE 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; + } + } + + /** + * 上架:策略项:2级策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INSTOCK_TRACTICS_ITEM_TWO { + FULL_RECOMMEND(10, "FULL_RECOMMEND", "放满推荐"), + EMPTY_RECOMMEND(20, "EMPTY_RECOMMEND", "空位推荐"); + + private int value; + private String code; + private String description; + + INSTOCK_TRACTICS_ITEM_TWO(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 INSTOCK_TRACTICS_ITEM_TWO 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; + } + } + + /** + * 上架:策略项:3级策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INSTOCK_TRACTICS_ITEM_THREE { + FCL_RECOMMEND(10, "FCL_RECOMMEND", "整箱推荐"), + EMPTY_BOX_RECOMMEND(20, "EMPTY_BOX_RECOMMEND", "零箱推荐"), + WHOLE_BOX_RECOMMEND(30, "WHOLE_BOX_RECOMMEND", "整零箱推荐"); + + private int value; + private String code; + private String description; + + INSTOCK_TRACTICS_ITEM_THREE(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 INSTOCK_TRACTICS_ITEM_THREE 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; + } + } + + /** + * 拣货:策略项:1级策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PICKING_TRACTICS_ITEM_ONE { + ABSOLUTE_PATH(10, "ABSOLUTE_PATH", "绝对路径"), + RELATIVE_PATH(20, "RELATIVE_PATH", "相对路径"), + LOCATE_ORDER_BY(30, "LOCATE_ORDER_BY", "库位编号排序"); + + private int value; + private String code; + private String description; + + PICKING_TRACTICS_ITEM_ONE(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 PICKING_TRACTICS_ITEM_ONE 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 DOWN_OR_UP { + + IS_TRUE(10, "IS_TRUE", "允许"), + IS_FALSE(20, "IS_FALSE", "不允许"); + + private int value; + private String codeValue; + private String description; + + DOWN_OR_UP(int value, String codeValue, String description) { + this.value = value; + this.codeValue = codeValue; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCodeValue() { + return codeValue; + } + + public String getDescription() { + return description; + } + } + + /** + * 动作类型 + * 10-锁定库位，20-锁定库存、30-锁定料车、40-解锁库存、50-解锁库位、60-解锁料车、70-生成任务、 + * 80-取消任务、90-递进交换 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STRATEGY_ACTION_TYPE { + LOCKING_LOCATE(10, "LOCKING_LOCATE", "锁定库位"), + LOCKING_IN_STOCK(20, "LOCKING_IN_STOCK", "锁定库存"), + LOCKING_FEED_CAR(30, "LOCKING_FEED_CAR", "锁定料车"), + UNLOCK_IN_STOCK(40, "UNLOCK_IN_STOCK", "解锁库存"), + UNLOCK_LOCATE(50, "UNLOCK_LOCATE", "解锁库位"), + UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"), + GENERATE_TASK(70, "GENERATE_TASK", "生成任务"), + CANCEL_TASK(80, "CANCEL_TASK", "取消任务"), + PROGRESSIVE_EXCHANGE(90, "PROGRESSIVE_EXCHANGE", "递进交换"); + + private int value; + private String code; + private String description; + + STRATEGY_ACTION_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) { + 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 STRATEGY_ACTION_TYPE 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; + } + } + + /** + * 自动化策略 数量控制 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTO_STRATEGY_QTY_CONTROL { + LESS_SEND(10, "少发"), + MANY_SEND(20, "多发"), + CONSISTENT(30, "一致"); + + private int value; + private String description; + + AUTO_STRATEGY_QTY_CONTROL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static AUTO_STRATEGY_QTY_CONTROL 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; + } + } + + + /** + * 自动入库任务 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTO_FORK_TASK_TYPE { + START(10, "start", "start"), + END(20, "end", "end"); + + private int value; + private String code; + private String description; + + AUTO_FORK_TASK_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + + /** + * AUTO 命令状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTO_FORK_TASK_STATUS { + CREATE(10, "新建"), + PROCESSING(20, "处理中"), + COMPLETE(30, "已完成"), + ERROR(40, "处理异常"); + + private int value; + private String description; + + AUTO_FORK_TASK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static AUTO_FORK_TASK_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 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-单据生成，20-策略动作、30-任务生成、40-START、50-END、60-其它 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATE_TYPE { + ORDER_GENERATE(10, "ORDER_GENERATE", "单据生成"), + STRATEGIC_ACTION(20, "STRATEGIC_ACTION", "策略动作"), + TASK_GENERATE(30, "TASK_GENERATE", "任务生成"), + START(40, "START", "START"), + END(50, "END", "END"), + OTHER(60, "OTHER", "其它"); + + private int value; + private String code; + private String description; + + OPERATE_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) { + 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 OPERATE_TYPE 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; + } + } + + /** + * RFID操作类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RFID_OPERATE_TYPE { + IN_STORAGE(10, "IN_STORAGE", "入库"), + SHIPEMNT(20, "SHIPEMNT", "发运"), + BACK_STORAGE(30, "BACK_STORAGE", "回库"), + UN_BUNDING(40, "UN_BUNDING", "解绑"), + BUNDING(50, "BUNDING", "绑定"); + + private String code; + private String description; + int value; + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + RFID_OPERATE_TYPE(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 RFID_OPERATE_TYPE 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 FREQUENCY { + ORDER_GENERATE(10, "MULTI_FREQUENCY", "多频次"), + STRATEGIC_ACTION(20, "NON_MULTI_FREQUENCY", "非多频次"), + TASK_GENERATE(30, "AMP", "AMP"); + + private int value; + private String code; + private String description; + + FREQUENCY(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 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 FREQUENCY 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 SUSPEN_STOCK_SYNC_STATUS { + CREATE(10, "CREATE", "创建"), + HANDLED(20, "HANDLED", "已处理"), + HANDLE_ERROR(30, "HANDLE_ERROR", "处理错误"), + PLC_HANDLE_OUTITME(40, "PLC_HANDLE_OUTITME", "PLC处理超时"), + SRC_DATA_ERROR(50, "SRC_DATA_ERROR", "来源数据解析错误"); + + private String code; + private String description; + int value; + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + SUSPEN_STOCK_SYNC_STATUS(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 SUSPEN_STOCK_SYNC_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) + public enum RC_BOARD_STATUS { + FINISH(10, "已完成(绿色)"), + OVER_TIME(20, "已超时（红色）"), + UNRECEIVED(30, "未收货（蓝色）"), + VARIANT(40, "有差异（黄色）"); + + 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++) { @@ -5906,4 +8855,4 @@ public class WmsEnumUtil { return tmp; } } -} \ No newline at end of file +} 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 9d06adc..e2e0255 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 @@ -243,6 +243,9 @@ public interface BaseRepository extends JpaReposito T getByProperty(String[] propertyNames, Object[] values); + @Deprecated + T getByPropertyPager(String[] propertyNames, Object[] values,Pager pager); + int listCount(); int findByPropertyCount(String propertyName, Object value); 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 b60d2e0..3b2f5a2 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 @@ -20,7 +20,13 @@ import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.UUID; /** * @Description : 自定义持久化接口实现 @@ -40,6 +46,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; private SnowflakeIdMaker snowflakeIdMaker; + /* 默认查询数据条数 */ + private static final Pager DEFAULT_PAGER = new Pager(10,10); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -53,6 +61,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep } public void detachObject(T t){ + if (t == null) { + return; + } entityManager.detach(t); } @@ -384,7 +395,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List listPager(Pager pager) { - if (pager.getTotalRows() > 0) { + if (pager != null) { return entityManager.createQuery("from " + persistentClass.getName()) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -500,10 +511,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { - try { - List list = findByHqlWhere(packBean); - return list.size() != 0 ? list.get(0) : null; + List list = findByHqlWherePage(packBean,DEFAULT_PAGER); + return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在，DdlPackBean：{}",packBean); return null; @@ -515,21 +525,18 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; - try { - List list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); - return list.size() != 0 ? list.get(0) : null; - }catch(NoResultException ne){ - LOGGER.error("数据不存在，prop：{},value：{}",propertyName,value,ne); - return null; - }catch(NonUniqueResultException ex){ - LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}",propertyName,value,ex); - throw new RuntimeException("存在多条记录：" + ex.getMessage()); - } + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); } @Override public T getByProperty(String[] propertyNames, Object[] values) { + return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); + } + + @Override + public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { + pager = pager == null ? DEFAULT_PAGER: pager; + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -555,7 +562,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep } try{ - List list = queryObject.getResultList(); + List list = queryObject + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); return list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在",ne); @@ -569,7 +579,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int listCount() { try{ - Long count = entityManager.createQuery("select count(distinct 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){ @@ -580,7 +590,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByPropertyCount(String propertyName, Object value) { try{ - String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName; + String queryString = "select count(model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName; Long count = entityManager.createQuery(queryString, Long.class) .setParameter(propertyName, value) .getSingleResult(); @@ -596,7 +606,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep try { if(!StringUtil.isEmpty(vendorNoStr)){ String queryString = "from " + persistentClass.getSimpleName() + " as model where model.vendorNo= :vendorNo"; - list=entityManager.createQuery(queryString) + list=entityManager.createQuery(queryString) .setParameter("vendorNo", vendorNoStr) .getResultList(); } @@ -612,7 +622,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); - queryString.append("select count(distinct model) from " + persistentClass.getName() + " as model"); + queryString.append("select count(model) from " + persistentClass.getName() + " as model"); int size = propertyNames.length; if (size > 0) { @@ -642,7 +652,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff; return entityManager.createQuery(queryString) .setParameter(propertyName, value) @@ -654,7 +664,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -755,7 +765,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); - queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 "); + queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 "); if (hqlWhere != null && hqlWhere.length() > 0) { queryString.append(hqlWhere); @@ -785,7 +795,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) { - if(pager.getTotalRows() > 0){ + if(pager != null){ if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -820,7 +830,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Deprecated @Override public List findByHqlWherePage(String hqlWhere, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -839,7 +849,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWherePage(DdlPackBean packBean, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); @@ -859,7 +869,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(String hqlWhere) { StringBuffer queryString = new StringBuffer(); - queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 "); + queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 "); if (hqlWhere != null && hqlWhere.length() > 0) { queryString.append(hqlWhere); @@ -875,7 +885,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); - queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); @@ -917,7 +927,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(String hqlWhere, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -936,7 +946,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(DdlPackBean packBean, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); @@ -954,7 +964,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if(pager.getTotalRows() > 0) { + if(pager != null) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -982,7 +992,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlPage(String sql, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -994,7 +1004,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlPage(String sql, Class entity, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ return entityManager.createNativeQuery(sql,entity) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -1107,7 +1117,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { StringBuffer queryString = new StringBuffer(); queryString.append(hql + " as model where 1=1 "); @@ -1146,7 +1156,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPageObjects(String hql, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); }else{ return new ArrayList(); @@ -1155,7 +1165,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if(pager.getTotalRows() > 0) { + if(pager != null) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -1176,7 +1186,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlObjListByPager(String sql, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -1579,8 +1589,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep } Query query = entityManager.createQuery(queryString.toString()); - for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + if (packBean != null) { + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + } } return query.getResultList(); 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 3009cfa..9a6e187 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 @@ -300,6 +300,16 @@ public class DdlPreparedPack { } /** + * 判断字段为空 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNullPack(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(null, " and ( model." + columnName + + " is null or model." + columnName + " ='')", null); + } + /** * 封装String对象成equal语句 * * @param columnName 列名 @@ -668,6 +678,28 @@ public class DdlPreparedPack { } /** + * 为空查询 + * + * @param columnName + * @param packBean + */ + public static void getIsNull(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(columnName, " and (model." + columnName + " is null or model." + columnName + " = '')", null); + + } + + /** + * 不为空查询 + * + * @param columnName + * @param packBean + */ + public static void getIsNotNull(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(columnName, " and (model." + columnName + " is not null and model." + columnName + " != '')", null); + + } + + /** * 转换排序列 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..37b8a51 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/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index 8dc3a8f..11a0bcf 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "表单按钮", description = "表单按钮") public class BfButton extends BaseBean { + private static final long serialVersionUID = -1675967061983417558L; @Column(name = "BUTTON_NAME") @ApiParam(value = "按钮名称") private String buttonName; @@ -46,6 +47,15 @@ public class BfButton extends BaseBean { } } + @Column(name = "IS_NEED_SELECT_DATA") + @ApiParam(value = "是否需要选中数据") + private Integer isNeedSelectData; + + @Column(name = "IS_REFRESH") + @ApiParam(value = "是否刷新") + private Integer isRefresh; + + // 关联表单功能表id @Column(name = "METHOD_ID") @ApiParam(value = "表单功能id") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java index 44bd93e..14be338 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java @@ -33,6 +33,7 @@ import java.util.List; @Api(value="级联元素",description = "级联元素") public class BfCascade extends BaseBean { + private static final long serialVersionUID = -2114224803602089395L; @Column(name = "ELEMENT_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/BfCascadeDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java index ffbebed..368da78 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="级联元素明细",description = "级联元素") public class BfCascadeDetail extends BaseBean { + private static final long serialVersionUID = -8365699249398175846L; @Column(name = "CASCADE_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/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index b673a6a..5d5f78a 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 @@ -30,6 +30,7 @@ import java.util.List; @Api(value="数据对象",description = "原数据对象，最原始数据") public class BfDataObject extends BaseBean { + private static final long serialVersionUID = -6450328805517462673L; @Column(name = "DATA_SOURCE_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/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 6ea46e8..c12f8d0 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,7 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; @@ -32,6 +33,7 @@ import java.util.List; @Api(value = "数据对象属性表", description = "数据对象的属性明细表") public class BfDataObjectProperty extends BaseBean { + private static final long serialVersionUID = 2607149135728621568L; //外键关联数据对象主键 @Column(name = "DATA_OBJECT_ID") @ApiParam(value = "数据对象ID", example = "-1") @@ -66,6 +68,10 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value = "是否允许为空") private Integer isNullable; + public Integer getIsNullableVal(){ + return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue(); + } + // 字段长度 @ApiParam(value = "字段长度") @Column(name="OBJECT_COLUMN_PRECISION") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java index 9d00452..cfce1b5 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java @@ -29,6 +29,7 @@ import java.util.List; @Api(value="数据对象",description = "原数据对象，最原始数据") public class BfDataSource extends BaseBean { + private static final long serialVersionUID = -749606489129498769L; @Column(name="SOURCE_NAME") @ApiParam(value ="数据源名称") private String sourceName; 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 96c8901..29d0044 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.form.bean; 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; @@ -32,6 +33,7 @@ import java.util.List; @Api(value = "对象元素基础", description = "元素基础表") public class BfElement extends BaseBean { + private static final long serialVersionUID = -3309080566388373068L; //外键关联数据对象主键 @Column(name = "ELEMENT_INFO_ID") @ApiParam(value = "对象元素明细ID", example = "-1") @@ -82,6 +84,10 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否弱删除") private Integer isObjectDelWeak; + public Integer getIsObjectDelWeakVal(){ + return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue(); + } + @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID") @ApiParam(value = "元素弱删除属性id") private Long elementDelWeakAttrId; @@ -90,10 +96,22 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否有效") private Integer isObjectValid; + public Integer getIsObjectValidVal(){ + return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue(); + } + @Column(name = "ELEMENT_VALID_ATTR_ID") @ApiParam(value = "元素有效属性id") private Long elementValidAttrId; + @Column(name = "IS_ORGANIZE_ISOLATION") + @ApiParam(value = "是否组织隔离") + private Integer isOrganizeIsolation; + + public Integer getIsOrganizeIsolationVal(){ + return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue(); + } + @Column(name = "IS_OBJECT_EXPORT") @ApiParam(value = "是否导出") private Integer isObjectExport; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java index 7a6ee13..e226eaf 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api(value = "元素约束", description = "元素约束") public class BfElementConstraint extends BaseBean { + private static final long serialVersionUID = 6951083749548881908L; @Column(name = "ELEMENT_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/BfElementConstraintProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java deleted file mode 100644 index 839099e..0000000 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java +++ /dev/null @@ -1,56 +0,0 @@ -//package cn.estsh.i3plus.pojo.form.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 : 2020-03-12 13:36 -// * @Modify: -// **/ -//@Data -//@Entity -//@DynamicInsert -//@DynamicUpdate -//@EqualsAndHashCode(callSuper = true) -//@Table(name = "BF_ELEMENT_CONSTRAINT_PROPERTY") -//@Api(value = "元素约束属性", description = "元素约束属性") -//public class BfElementConstraintProperty extends BaseBean { -// -// @Column(name = "CONSTRAINT_ID") -// @ApiParam(value = "约束ID", example = "-1") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long constraintId; -// -// @Column(name = "ELEMENT_PROPERTY_ID") -// @ApiParam(value = "元素属性ID", example = "-1") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long elementPropertyId; -// -// @Column(name = "DATA_OBJECT_PROPERTY_ID") -// @ApiParam(value = "数据对象属性ID", example = "-1") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long dataObjectPropertyId; -// -// @Column(name="PROPERTY_NAME") -// @ApiParam(value ="元素属性名称") -// private String propertyName; -// -// @Column(name="PROPERTY_CODE_RDD") -// @ApiParam(value ="元素属性代码") -// private String propertyCodeRdd; -// -//} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index 86a7c19..a3675cd 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.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 com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -30,6 +32,7 @@ import javax.persistence.Table; @Api(value = "对象元素表格", description = "对象元素表格") public class BfElementGrid extends BaseBean { + private static final long serialVersionUID = -3730288075103132153L; //外键关联数据对象主键 @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @@ -38,10 +41,12 @@ public class BfElementGrid extends BaseBean { @Column(name = "IS_LINE_SHOW_NUMBER") @ApiParam(value = "显示行号") + @AnnoOutputColumn(refClass = BlockFormEnumUtil.TABLE_ROW_NUMBER.class) private Integer isLineShowNumber; @Column(name = "IS_LINE_MULTIPLE") @ApiParam(value = "是否单选") + @AnnoOutputColumn(refClass = BlockFormEnumUtil.TABLE_ROW_PICK.class) private Integer isLineMultiple; @Column(name = "IS_OBJECT_FIND") 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 new file mode 100644 index 0000000..8bf2d5c --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.form.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 : 2020-05-27 21:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BF_ELEMENT_PICK_UP_PROPERTY") +@Api(value = "表单拾取属性", description = "表单拾取属性") +public class BfElementPickUpProperty extends BaseBean { + + @Column(name = "PICK_UP_PROPERTY_ID") + @ApiParam(value = "拾取属性id", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pickUpPropertyId; + + @Column(name = "ELEMENT_ID") + @ApiParam(value = "对象元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + + @Column(name="ELEMENT_PROPERTY_ID") + @ApiParam(value ="元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementPropertyId; + + @Column(name="ELEMENT_PROPERTY_NAME") + @ApiParam(value ="元素属性名称") + private String elementPropertyName; + + @Column(name = "PICK_UP_ELEMENT_ID") + @ApiParam(value = "拾取元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pickUpElementId; + + @Column(name="PICK_UP_ELEMENT_PROPERTY_ID") + @ApiParam(value ="拾取元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long pickUpElementPropertyId; + + @Column(name="PICK_UP_ELEMENT_PROPERTY_NAME") + @ApiParam(value ="拾取元素属性名称") + private String pickUpElementPropertyName; + +} 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 569c3ed..a89a117 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 @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 数据对象 @@ -32,6 +33,7 @@ import javax.persistence.Transient; @Api(value="对象元素属性",description = "对象元素属性 相当于数据对象属性的扩展") public class BfElementProperty extends BaseBean { + private static final long serialVersionUID = 8391877375302721425L; @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -148,6 +150,9 @@ public class BfElementProperty extends BaseBean { @ApiParam(value ="是否为唯一约束字段") private transient Integer isUniqueProperty; + @Transient + @ApiParam(value ="拾取关联属性") + private List pickUpPropertyList; // public Object getFormValue() { // return propertyFormValue == null ? propertyDefaultValue : propertyFormValue; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 688db18..26ca40e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -30,6 +30,7 @@ import java.util.List; @Api(value="对象元素虚拟属性",description = "对象元素虚拟属性") public class BfElementPropertyVirtual extends BaseBean { + private static final long serialVersionUID = -8746243539245788738L; @Column(name = "ELEMENT_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/BfElementTree.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java index ef4c996..9fae58a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api(value = "对象元素基础", description = "元素基础表") public class BfElementTree extends BaseBean { + private static final long serialVersionUID = -6173269177770192337L; //外键关联数据对象主键 @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java index 5e67b40..e336296 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.form.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; @@ -30,6 +28,7 @@ import javax.persistence.Table; @Api(value="拦截器主体") public class BfIntercept extends BaseBean { + private static final long serialVersionUID = -7880837699871138830L; @Column(name="INTERCEPT_NAME") @ApiParam(value ="拦截器名称") private String interceptName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java index c4a9495..a0cf303 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api(value="拦截器明细") public class BfInterceptDetail extends BaseBean { + private static final long serialVersionUID = -2813973524088674573L; @Column(name="INTERCEPT_ID") @ApiParam(value ="拦截器id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java index d58c49c..a56d039 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.List; @@ -28,6 +27,7 @@ import java.util.List; @Api(value = "自定义表单布局") public class BfLayout extends BaseBean { + private static final long serialVersionUID = 4951428858633293563L; @Column(name = "LAYOUT_NAME") @ApiParam(value = "名称") private String layoutName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java index bafc0a5..6c4abed 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "自定义表单布局-列") public class BfLayoutColumn extends BaseBean { + private static final long serialVersionUID = -8711414349182712011L; @Column(name = "LAYOUT_ID") @ApiParam(value = "布局主键") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java index c9888f1..d96cc02 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.List; @@ -30,6 +29,7 @@ import java.util.List; @Api(value = "自定义表单布局-行") public class BfLayoutRow extends BaseBean { + private static final long serialVersionUID = -3327441937912038000L; @Column(name = "LAYOUT_ID") @ApiParam(value = "布局主键") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index 115b32d..f12fc60 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -10,7 +10,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.List; @@ -33,6 +32,7 @@ import java.util.List; @Api(value="表单菜单目录",description = "表单菜单目录") public class BfMenu extends BaseBean { + private static final long serialVersionUID = 6559248298739431579L; @Column(name="MENU_NAME") @ApiParam(value ="菜单名称") private String menuName; @@ -89,6 +89,10 @@ public class BfMenu extends BaseBean { @ApiParam(value ="功能名称") private String methodNameRdd; + @Column(name="SOFT_TYPE") + @ApiParam(value ="所属模块") + private Integer softType; + @Column(name = "MENU_STATUS") @ApiParam(value = "菜单状态") private Integer menuStatus; @@ -96,8 +100,4 @@ public class BfMenu extends BaseBean { @Transient @ApiParam(value = "菜单子集") private List bfMenuList; - - @Transient - @ApiParam(value = "菜单父级") - private List parentBfMenuList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java index 31953ee..661cf28 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="表单功能",description = "表单功能") public class BfMethod extends BaseBean { + private static final long serialVersionUID = 6976569600026342045L; @Column(name="METHOD_NAME") @ApiParam(value ="功能名称") private String methodName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java index dec8a80..7adc527 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="表单功能明细",description = "表单功能明细") public class BfMethodDetail extends BaseBean { + private static final long serialVersionUID = 3982619673130000003L; @Column(name="METHOD_ID") @ApiParam(value ="功能id") @JsonSerialize(using = ToStringSerializer.class) 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 373f34e..06adc7a 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 @@ -13,6 +13,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.List; /** * @Description : @@ -30,6 +32,7 @@ import javax.persistence.Table; @Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") public class BfMethodDetailProperty extends BaseBean { + private static final long serialVersionUID = -7541677357317732343L; @Column(name="METHOD_ID") @ApiParam(value ="功能id") @JsonSerialize(using = ToStringSerializer.class) @@ -54,29 +57,11 @@ public class BfMethodDetailProperty extends BaseBean { @ApiParam(value ="主对象元素名称") private String priElementNameRdd; - @Column(name="PRI_ELEMENT_PROPERTY_ID") - @ApiParam(value ="主对象元素属性id") - @JsonSerialize(using = ToStringSerializer.class) - private Long priElementPropertyId; - - @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") - @ApiParam(value ="主对象元素属性名称") - private String priElementPropertyNameRdd; - - @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD") - @ApiParam(value ="主对象元素属性code") - private String priElementPropertyCodeRdd; - // 枚举:BlockFormEnumUtil.TRIGGER_EVENT @Column(name="PRI_ELEMENT_EVENT") @ApiParam(value ="主对象元素事件") private Integer priElementEvent; - // 枚举:BlockFormEnumUtil.SQL_REF_TYPE - @Column(name="ASSOCIATE_TYPE") - @ApiParam(value ="关联类型") - private Integer associateType; - @Column(name="SEC_METHOD_DETAIL_ID") @ApiParam(value ="关联功能明细id") @JsonSerialize(using = ToStringSerializer.class) @@ -95,16 +80,7 @@ public class BfMethodDetailProperty extends BaseBean { @ApiParam(value ="关联对象元素名称") private String secElementNameRdd; - @Column(name="SEC_ELEMENT_PROPERTY_ID") - @ApiParam(value ="关联对象元素属性id") - @JsonSerialize(using = ToStringSerializer.class) - private Long secElementPropertyId; - - @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") - @ApiParam(value ="关联对象元素属性名称") - private String secElementPropertyNameRdd; - - @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD") - @ApiParam(value ="关联对象元素属性Code") - private String secElementPropertyCodeRdd; + @Transient + @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 new file mode 100644 index 0000000..0a5e8be --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.form.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 : 2019-03-21 21:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BF_METHOD_DETAIL_PROPERTY") +@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") +public class BfMethodDetailPropertyRef extends BaseBean { + + private static final long serialVersionUID = -7541677357317732343L; + @Column(name="DETAIL_PROPERTY_ID") + @ApiParam(value ="功能明细关联属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long detailPropertyId; + + @Column(name="PRI_ELEMENT_PROPERTY_ID") + @ApiParam(value ="主对象元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long priElementPropertyId; + + @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") + @ApiParam(value ="主对象元素属性名称") + private String priElementPropertyNameRdd; + + @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="主对象元素属性code") + private String priElementPropertyCodeRdd; + + @Column(name="SEC_ELEMENT_PROPERTY_ID") + @ApiParam(value ="关联对象元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long secElementPropertyId; + + @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") + @ApiParam(value ="关联对象元素属性名称") + private String secElementPropertyNameRdd; + + @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="关联对象元素属性Code") + private String secElementPropertyCodeRdd; +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java index 14eefa8..2dda683 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :按钮功能关系 @@ -30,6 +31,7 @@ import javax.persistence.Table; @Api(value="按钮功能关系",description = "按钮功能关系") public class BfRefButtonMethod extends BaseBean { + private static final long serialVersionUID = 1145541515189800147L; @Column(name="BUTTON_ID") @ApiParam(value ="按钮id") @JsonSerialize(using = ToStringSerializer.class) @@ -61,4 +63,10 @@ public class BfRefButtonMethod extends BaseBean { @ApiParam(value ="按钮位置关联名称") private String buttonPositionRefNameRdd; + /** + * 关联按钮 + */ + @Transient + private BfButton bfbutton; + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java index 4837677..a59f430 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="对象元素虚拟属性",description = "对象元素虚拟属性") public class BfRefElementPropertyVirtualDetail extends BaseBean { + private static final long serialVersionUID = 3315763374468711786L; @Column(name = "ELEMENT_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/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java index 42eff42..7f6a4b5 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "功能角色关系", description = "功能角色关系") public class BfRefMethodRole extends BaseBean { + private static final long serialVersionUID = 8134565165534099843L; @Column(name = "METHOD_ID") @ApiParam(value = "表单功能id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java deleted file mode 100644 index b3de0fb..0000000 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -//package cn.estsh.i3plus.pojo.form.repository; -// -//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -//import cn.estsh.i3plus.pojo.form.bean.BfElementConstraintProperty; -// -///** -// * @Description : 元素约束属性 -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2019-03-21 20:27 -// * @Modify: -// **/ -//public interface BfElementConstraintPropertyRepository extends BaseRepository { -//} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java new file mode 100644 index 0000000..99bbfc8 --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.form.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.form.bean.BfElementPickUpProperty; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-21 15:18 + * @Modify: + **/ +public interface BfElementPickUpPropertyRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java new file mode 100644 index 0000000..122ba80 --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.form.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.form.bean.BfMethodDetailPropertyRef; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-06-16 16:56 + * @Modify: + **/ +public interface BfMethodDetailPropertyRefRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 2ec710e..d913912 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -39,12 +39,12 @@ public final class FormHqlPack { * @param params 参数 * @return hql */ - public static String packHqlIds(String columnName, Long[] params) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlIds(String columnName, Long[] params) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(StringUtils.join(params, ","), columnName, result); - return result.toString(); + DdlPreparedPack.getInPack(StringUtils.join(params, ","), columnName, result); + return result; } /** @@ -69,11 +69,11 @@ public final class FormHqlPack { * @param isDeleted 数据状态 * @return hql */ - public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) { - StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params)); + public static DdlPackBean packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) { + DdlPackBean result = FormHqlPack.packHqlIds(columnName, params); - HqlPack.getNumEqualPack(isDeleted, "isDeleted", result); - return result.toString(); + DdlPreparedPack.getNumEqualPack(isDeleted, "isDeleted", result); + return result; } /** @@ -81,13 +81,13 @@ public final class FormHqlPack { * @param bfLayout 表单布局 * @return hql */ - public static String packHqlBfLayout(BfLayout bfLayout) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfLayout(BfLayout bfLayout) { + DdlPackBean result = DdlPackBean.getDdlPackBean(bfLayout); - HqlPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result); - HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result); + DdlPreparedPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result); + DdlPreparedPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result); - return result.toString(); + return result; } /** @@ -95,14 +95,13 @@ public final class FormHqlPack { * @param bfLayoutRow 表单布局 * @return hql */ - public static String packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) { + DdlPackBean result =DdlPackBean.getDdlPackBean(bfLayoutRow); - HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result); - HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result); + DdlPreparedPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result); - result.append(bfLayoutRow.orderBy()); - return result.toString(); + return result; } /** @@ -110,14 +109,13 @@ public final class FormHqlPack { * @param bfLayoutColumn 表单布局行 * @return hql */ - public static String packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) { + DdlPackBean result = DdlPackBean.getDdlPackBean(bfLayoutColumn); - HqlPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result); - HqlPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result); + DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result); - result.append(bfLayoutColumn.orderBy()); - return result.toString(); + return result; } /** @@ -126,13 +124,13 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfMenu(BfMenu bfMenu) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(bfMenu); DdlPreparedPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result); DdlPreparedPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result); DdlPreparedPack.getNumEqualPack(bfMenu.getMenuStatus(), "menuStatus", result); DdlPreparedPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result); - result.setOrderByStr(bfMenu.orderBy()); + DdlPreparedPack.getNumEqualPack(bfMenu.getSoftType(), "softType", result); return result; } @@ -143,12 +141,11 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfMethod(BfMethod bfMethod) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(bfMethod); DdlPreparedPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result); DdlPreparedPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result); DdlPreparedPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result); - result.setOrderByStr(bfMethod.orderBy()); return result; } @@ -159,12 +156,11 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfMethodDetail(BfMethodDetail bfMethodDetail) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetail); DdlPreparedPack.getStringLikerPack(bfMethodDetail.getMethodDetailName(), "methodDetailName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfMethodDetail.getMethodId(), "layoutId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfMethodDetail.getIsDeleted(), "isDeleted", ddlPackBean); - ddlPackBean.setOrderByStr(bfMethodDetail.orderBy()); return ddlPackBean; } @@ -175,14 +171,13 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfIntercept(BfIntercept bfIntercept) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfIntercept); DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean); - ddlPackBean.setOrderByStr(bfIntercept.orderBy()); return ddlPackBean; } @@ -193,7 +188,7 @@ public final class FormHqlPack { * @return 查询条件 */ public static DdlPackBean packHqlBfButton(BfButton bfButton){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfButton); DdlPreparedPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", ddlPackBean); @@ -209,7 +204,7 @@ public final class FormHqlPack { * @return 查询条件 */ public static DdlPackBean packHqlBfRefMethodRoleByRoleIds(Long[] roleIds){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getInPackArray(roleIds, "roleId", ddlPackBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); @@ -223,14 +218,13 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfRefButtonMethod(BfRefButtonMethod bfRefButtonMethod) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefButtonMethod); DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonId(), "buttonId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionType(), "buttonPositionType", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionRefId(), "buttonPositionRefId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonNameRdd(), "buttonNameRdd", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonPositionRefNameRdd(), "buttonPositionRefNameRdd", ddlPackBean); - ddlPackBean.setOrderByStr(bfRefButtonMethod.orderBy()); return ddlPackBean; } @@ -241,11 +235,10 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfRefMethodRole(BfRefMethodRole bfRefMethodRole) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefMethodRole); DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getMethodId(), "methodId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getRoleId(), "roleId", ddlPackBean); - ddlPackBean.setOrderByStr(bfRefMethodRole.orderBy()); return ddlPackBean; } @@ -256,7 +249,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfInterceptDetail(BfInterceptDetail bfInterceptDetail) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptId(), "interceptId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptTargetId(), "interceptTargetId", ddlPackBean); @@ -275,7 +268,7 @@ public final class FormHqlPack { * @return */ public static DdlPackBean packHqlBfRefButtonMethodByRefIds(Long[] ids) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getInPackArray(ids, "buttonPositionRefId", ddlPackBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); @@ -290,7 +283,7 @@ public final class FormHqlPack { * @return */ public static DdlPackBean findBfMenuByMethodIdsAndStatus(Long[] methodIds, int status) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getInPackArray(methodIds, "methodId", ddlPackBean); DdlPreparedPack.getNumEqualPack(status, "menuStatus", ddlPackBean); @@ -305,7 +298,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfElement(BfElement bfElement){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean); @@ -322,7 +315,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfDataSource(BfDataSource source){ - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(source); DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean); DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean); @@ -341,7 +334,7 @@ public final class FormHqlPack { * @return hql */ public static DdlPackBean packHqlBfMenuTree(BfMenu bfMenu) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(bfMenu); DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result); DdlPreparedPack.getNumEqualPack( @@ -363,7 +356,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfElementConstraint(BfElementConstraint bfElementConstraint){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint); DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean); @@ -378,7 +371,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfElementConstraintOnly(BfElementConstraint bfElementConstraint){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint); DdlPreparedPack.getNumNOEqualPack(bfElementConstraint.getId(), "id", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean); @@ -393,7 +386,7 @@ public final class FormHqlPack { * @return */ public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfDataObject); DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean); @@ -401,17 +394,29 @@ public final class FormHqlPack { return ddlPackBean; } - /** * 数据对象查询条件拼接 * @param bfCascade * @return */ public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfCascade); + + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "cascadeName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "cascadeDescription", ddlPackBean); + + return ddlPackBean; + } + + /** + * 数据对象查询条件拼接 + * @param bfMethodDetailPropertyRef + * @return + */ + public static DdlPackBean packHqlBfMethodDetailPropertyRef(BfMethodDetailPropertyRef bfMethodDetailPropertyRef){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetailPropertyRef); - DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfMethodDetailPropertyRef.getDetailPropertyId(), "detailPropertyId", ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..0a44fb0 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 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml new file mode 100644 index 0000000..6df1cc2 --- /dev/null +++ b/modules/i3plus-pojo-ics/pom.xml @@ -0,0 +1,23 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-ics + jar + + + + i3plus.pojo + i3plus-pojo-base + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java new file mode 100644 index 0000000..e4aa123 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:56 + * @Modify: + **/ +@Data +public class IcsActuatorMetrics implements Serializable { + + private static final long serialVersionUID = 4341201186821752353L; + private String name; + private List measurements; + private List availableTags; + + @Data + @NoArgsConstructor + public static class Measurements { + + private String statistic; + private Object value; + + } + + @Data + @NoArgsConstructor + public static class AvailableTags { + + private String tag; + private List values; + + } +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java new file mode 100644 index 0000000..5575103 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 应用信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-09 17:55 + * @Modify: + **/ +@Data +@ApiModel("应用信息") +public class IcsApplication implements Serializable { + + private static final long serialVersionUID = -1923997516217683087L; + @ApiModelProperty("应用名称") + private String appName; + + @ApiModelProperty("实例数量") + private Integer totalInstanceNum; + + @ApiModelProperty("在线实例数量") + private Integer upInstanceNum; + + public int getUpInstanceNumVal() { + return upInstanceNum == null ? 0 : upInstanceNum.intValue(); + } + + + public void addUpInstanceNum() { + if (upInstanceNum == null) { + upInstanceNum = 0; + } + upInstanceNum++; + } + + @ApiModelProperty("下线实例数量") + private Integer downInstanceNum; + + public int getDownInstanceNumVal() { + return downInstanceNum == null ? 0 : downInstanceNum.intValue(); + } + + public void addDownInstanceNum() { + if (downInstanceNum == null) { + downInstanceNum = 0; + } + downInstanceNum++; + } + + @ApiModelProperty("应用状态") + private Integer appStatus; + + public String getAppStatusTxt(){ + return appStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(appStatus); + } + + @ApiModelProperty("状态时间戳") + private Long statusTimeStamp; + + @ApiModelProperty("状态时间") + private String statusTimeStampStr; + + @ApiModelProperty("实例集合") + private List icsInstanceList; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java new file mode 100644 index 0000000..df2d460 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-09 18:02 + * @Modify: + **/ +@Data +@ApiModel("实例信息") +public class IcsInstance implements Serializable { + + private static final long serialVersionUID = 2648298051066693374L; + @ApiModelProperty("实例id") + private String instanceId; + + @ApiModelProperty("实例状态url") + private String instanceStatusUrl; + + @ApiModelProperty("实例状态") + private Integer instanceStatus; + + @ApiModelProperty("状态时间戳") + private Long statusTimeStamp; + + @ApiModelProperty("状态时间") + private String statusTimeStampStr; + + public String getInstanceStatusTxt() { + return instanceStatus == null ? "无" : CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus); + } +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java new file mode 100644 index 0000000..f632be5 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 实例明细 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:52 + * @Modify: + **/ +@Data +@ApiModel("实例明细") +public class IcsInstanceDetail implements Serializable { + + private static final long serialVersionUID = -348649782622051827L; + @ApiModelProperty("pid") + private String pid; + + @ApiModelProperty("正常运行时间") + private double uptime; + + @ApiModelProperty("正常运行时间") + private String uptimeStr; + + @ApiModelProperty("进程Cpu使用情况") + private double processCpuUsage; + + @ApiModelProperty("系统Cpu使用情况") + private double systemCpuUsage; + + @ApiModelProperty("CPU数量") + private int cpuNum; + + @ApiModelProperty("gc计数") + private int gcCount; + + @ApiModelProperty("gc总花费时间") + private double gcTotalTimeSpent; + + @ApiModelProperty("gc花费的最长时间") + private double gcMaxTimeSpent; + + @ApiModelProperty("监控网址") + private String monitorUrl; + + @ApiModelProperty("ApiUrl") + private String apiUrl; + + @ApiModelProperty("服务网址") + private String serviceUrl; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java new file mode 100644 index 0000000..ded6dcc --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 实例堆内存 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:57 + * @Modify: + **/ +@Data +@ApiModel("实例堆内存") +public class IcsInstanceMemoryHeap implements Serializable { + + private static final long serialVersionUID = -5982536759101768884L; + @ApiModelProperty("堆使用的内存") + private double heapMemoryUsed; + + @ApiModelProperty("堆内存大小") + private double heapMemorySize; + + @ApiModelProperty("堆内存最大") + private double heapMemoryMax; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java new file mode 100644 index 0000000..e767813 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description :实例堆非内存 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:57 + * @Modify: + **/ +@Data +@ApiModel("实例堆非内存") +public class IcsInstanceMemoryNonHeap implements Serializable { + + private static final long serialVersionUID = 5457399972284816473L; + @ApiModelProperty("非堆内存元空间") + private double nonHeapMemoryMetaspace; + + @ApiModelProperty("非堆内存使用") + private double nonHeapMemoryUsed; + + @ApiModelProperty("非堆内存大小") + private double nonHeapMemorySize; + + @ApiModelProperty("非堆内存最大") + private double nonHeapMemoryMax; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java new file mode 100644 index 0000000..d702cfa --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 实例线程信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:57 + * @Modify: + **/ +@Data +@ApiModel("实例线程信息") +public class IcsInstanceThread implements Serializable { + + private static final long serialVersionUID = -272358532317411617L; + @ApiModelProperty("实时线程") + private double threadLive; + + @ApiModelProperty("守护线程") + private double threadDaemon; + + @ApiModelProperty("线程峰值") + private double threadPeakLive; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java new file mode 100644 index 0000000..4bc3bd5 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 注册中心信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-09 10:12 + * @Modify: + **/ +@Data +@ApiModel("注册中心") +public class IcsRegist implements Serializable { + + private static final long serialVersionUID = -5624347440991960286L; + @ApiModelProperty("环境") + private String environment; + + @ApiModelProperty("数据中心") + private String dataCenter; + + @ApiModelProperty("集群信息") + private List clusterInfo; + + @ApiModelProperty("是否低于续订阈值") + private Integer isBelowRenewThresold; + + @ApiModelProperty("启用自我保护模式") + private Integer selfPreservationModeEnabled; + + @ApiModelProperty("注册中心启动时长") + private String upDateTime; + + @ApiModelProperty("租约到期启用") + private Integer leaseExpirationEnabled; + + @ApiModelProperty("实例IP") + private String instanceIp; + + @ApiModelProperty("实例状态") + private String instanceStatus; + + @ApiModelProperty("cpu数量") + private Integer cpuNum; + + @ApiModelProperty("总可用内存") + private Integer totalAvailMemory; + + @ApiModelProperty("当前的内存使用情况") + private Integer currentMemoryUsage; + + @ApiModelProperty("应用数量") + private Integer appNum; + + @ApiModelProperty("实例数量") + private Integer instanceNum; + + @ApiModelProperty("下线实例数量") + private Integer downInstanceNum; + + @ApiModelProperty("应用集合") + private List icsApplicationList; + +} diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..ba89b61 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 50ab2c2..fdcf6e3 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-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java index 178579f..dbae345 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -15,25 +17,27 @@ import lombok.Data; **/ @Data @ApiModel("指令操作") -public class LacCommandOperate { +public class LacCommandOperate implements Serializable { - @ApiParam(value ="指令集记录id" , example = "-1") + private static final long serialVersionUID = 2877359322522442241L; + @ApiParam(value = "指令集记录id", example = "-1") private Long operateObjId; - @ApiParam(value ="操作对象类型" , example = "-1") + @ApiParam(value = "操作对象类型", example = "-1") @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_OBJ_TYPE.class) private Integer operateObjType; - @ApiParam(value ="操作" , example = "-1") + @ApiParam(value = "操作", example = "-1") @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class) private Integer operateCommand; - public LacCommandOperate(){} + public LacCommandOperate() { + } - public LacCommandOperate(Long operateObjId,Integer operate){ + public LacCommandOperate(Long operateObjId, Integer operate) { this.operateObjId = operateObjId; LacEnumUtil.OPERATE_COMMAND operate_command = LacEnumUtil.OPERATE_COMMAND.valueOf(operate); - if(operate_command!=null) { + if (operate_command != null) { this.operateCommand = operate_command.getValue(); this.operateObjType = operate_command.getOperateObjType().getValue(); } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index 1caf947..1fa346d 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -52,6 +52,7 @@ import java.util.List; @Api(value="指令集步骤",description = "指令集步骤") public class LacCommandStackStep extends BaseBean { + private static final long serialVersionUID = 4053765920069631323L; @Column(name="TEMPLATE_ID") @ApiParam(value ="模板ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index 63154b6..68619ff 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -55,6 +55,7 @@ import javax.persistence.Transient; @Api(value="步骤任务",description = "步骤任务信息") public class LacCommandStackStepTask extends BaseBean { + private static final long serialVersionUID = 7432247591995852126L; @Column(name="TEMPLATE_ID") @ApiParam(value ="模板ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java index 7f301fa..09a9a04 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java @@ -49,6 +49,7 @@ import java.util.List; @Api(value="指令集模板",description = "指令集模板信息") public class LacCommandStackTemplate extends BaseBean { + private static final long serialVersionUID = 4884527553767334910L; @Column(name="TEMPLATE_NAME") @ApiParam(value ="模板名称") private String templateName; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java index c08c908..6978fdf 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java @@ -24,21 +24,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="LAC_COMMAND_STACK_TYPE") -@Api(value="指令集类型",description = "指令集类型") +@Table(name = "LAC_COMMAND_STACK_TYPE") +@Api(value = "指令集类型", description = "指令集类型") public class LacCommandStackType extends BaseBean { - @Column(name="TYPE_NAME") - @ApiParam(value ="类型名称") + private static final long serialVersionUID = -2699452452325728351L; + @Column(name = "TYPE_NAME") + @ApiParam(value = "类型名称") private String typeName; - @Column(name="TYPE_REF_NUM") - @ApiParam(value ="适配器使用数量") + @Column(name = "TYPE_REF_NUM") + @ApiParam(value = "适配器使用数量") private Integer typeRefNum; - @Column(name="TYPE_DESCRIPTION") - @ApiParam(value ="类型描述") + @Column(name = "TYPE_DESCRIPTION") + @ApiParam(value = "类型描述") private String typeDescription; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java index 9caa3b2..22fde54 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -57,17 +57,18 @@ import javax.persistence.Table; @Api(value="适配器",description = "适配器信息") public class LacSuitCase extends BaseBean { - @Column(name="SUTI_CASE_NAME_RDD") + private static final long serialVersionUID = 6325924633917664579L; + @Column(name="SUIT_CASE_NAME_RDD") @ApiParam(value ="适配器名称") - private String sutiCaseNameRdd; + private String suitCaseNameRdd; @Column(name="SUIT_CASE_CODE_RDD") @ApiParam(value ="适配器代码") private String suitCaseCodeRdd; - @Column(name="SUTI_TYPE") + @Column(name="SUIT_TYPE") @ApiParam(value ="适配器类型") - private Integer sutiType; + private Integer suitType; @Column(name="HARDWARE_TYPE") @ApiParam(value ="硬件类型") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 1c73450..33dfa08 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -61,6 +61,7 @@ import java.util.List; @Api(value="调度任务",description = "调度任务信息") public class LacSuitTask extends BaseBean { + private static final long serialVersionUID = -6592851798133225109L; @Column(name="TASK_NAME") @ApiParam(value ="适配器名称") private String taskName; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index 76e34fa..b281b0d 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -54,6 +54,7 @@ import javax.persistence.Transient; @Api(value="调度任务参数",description = "调度任务参数信息") public class LacSuitTaskParam extends BaseBean { + private static final long serialVersionUID = 3521650869017242460L; @Column(name="TASK_ID") @ApiParam(value ="任务ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java index 3ed31a6..05d07be 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java @@ -55,6 +55,7 @@ import javax.persistence.Table; @Api(value="调度任务参数转换",description = "调度任务参数转换信息") public class LacSuitTaskParamAdapter extends BaseBean { + private static final long serialVersionUID = -4049358225863293288L; @Column(name="TASK_ID") @ApiParam(value ="任务ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java index dd50d24..23f0b4d 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java @@ -33,6 +33,7 @@ import javax.persistence.Transient; @Api(value="任务检查",description = "任务检查") public class LacTaskCheck extends BaseBean { + private static final long serialVersionUID = -4157772560831884634L; @Column(name="COMMAND_STACK_TEMPLATE_ID") @ApiParam(value ="指令集模板ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java index 32a5f3c..32df0a3 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="任务类型",description = "任务类型") public class LacTaskType extends BaseBean { + private static final long serialVersionUID = 7596608775083338503L; @Column(name="TYPE_NAME") @ApiParam(value ="类型名称") private String typeName; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index a315c8c..150a518 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -55,8 +55,9 @@ public class LacHqlPack { } public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) { - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); + DdlPreparedPack.getNumEqualPack(bean.getLogTaskId(),"logTaskId",ddlPackBean); return ddlPackBean; } @@ -65,6 +66,7 @@ public class LacHqlPack { DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", ddlPackBean); return ddlPackBean; } @@ -165,6 +167,8 @@ public class LacHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackId(), "commandStackId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getCommandStackNameRdd(), "commandStackNameRdd", ddlPackBean); DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true); @@ -199,9 +203,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); - DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSuitType(),"suitType",ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index b79a192..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,12 +5,18 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mdm + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file 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 new file mode 100644 index 0000000..3fef7c4 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +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.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 lombok.Data; + +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; + +/** + * @Description : MDM基础bean + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 17:30 + * @Modify: + **/ +@Data +@MappedSuperclass +@ApiModel("MDM基础bean") +public abstract class BaseMdmBean extends BaseBean { + + private static final long serialVersionUID = 3957595289035947441L; + + @Transient + @ApiModelProperty("是否主数据") + @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数据版本") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + private Long mdmVersion; + + public long getMdmVersionVal() { + return mdmVersion == null ? 0 : mdmVersion; + } + + // 版本递增 + public long nextMdmVersion() { + mdmVersion = getMdmVersionVal() + 1; + return mdmVersion; + } + + @Column(name = "IS_MDM_PUBLISHED") + @ApiModelProperty("是否发布") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) + private Integer isMdmPublished; + + @Column(name = "MDM_OPERATE_TYPE") + @ApiModelProperty("操作类型") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true) + private Integer mdmOperateType; + + public Integer getMdmOperateTypeVal() { + return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType; + } + + public String getMdmOperateTypeTxt(){ + return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal()); + } + + @Column(name = "MDM_REF_ID") + @ApiModelProperty("关联id") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + private Long mdmRefId; + + //排序方式 + @Override + public String orderBy() { + String result = ""; + if (orderByParam != null && orderByParam.trim().length() > 0) { + result = " order by "; + if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == isMdmMaster) { + result += "master."; + } else { + result += "busi."; + } + + result += orderByParam; + + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + } else { + result += " desc"; + } + } + return result; + } +} 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 new file mode 100644 index 0000000..ef84a68 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 lombok.Data; + +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; + +/** + * @Description : MDM业务基础bean + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 17:30 + * @Modify: + **/ +@Data +@MappedSuperclass +@ApiModel("MDM业务基础bean") +public class BaseMdmBusiExtdBean extends BaseMdmBean { + + private static final long serialVersionUID = 4267453020130810967L; + + @Transient + @ApiModelProperty("是否主数据") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) + public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Transient + @ApiModelProperty("主数据Class") + @AnnoOutputColumn(hidden = true) + protected static Class mdmMasterClass = BaseMdmBean.class; + + @Transient + @ApiModelProperty("软件模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true) + protected static Integer mdmSoftType; + + @Column(name = "MDM_MASTER_ID") + @ApiModelProperty("主数据id") + @JsonSerialize(using = ToStringSerializer.class) + 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 new file mode 100644 index 0000000..1fe17c1 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description :MDM模型bean + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-18 20:52 + * @Modify: + **/ +public abstract class BaseMdmBusiModelBean { + + public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) { + this.mdmMasterBean = mdmMasterBean; + this.mdmBusiBean = mdmBusiBean; + } + + @ApiModelProperty("主数据") + private M mdmMasterBean; + + @ApiModelProperty("业务扩展") + private B mdmBusiBean; + + public BaseMdmBusiModelBean() { + } + + /** + * 获取主数据m + * + * @return + */ + public M getMaster() { + return mdmMasterBean; + } + + /** + * 获取业务扩展数据 + * + * @return + */ + public B getBusi() { + return mdmBusiBean; + } + + /** + * 设置主数据m + * + * @return + */ + public void setMaster(M baseMdmBean) { + this.mdmMasterBean = baseMdmBean; + } + + /** + * 设置业务扩展数据 + * + * @return + */ + public void setBusi(B baseMdmBusiExtdBean) { + this.mdmBusiBean = baseMdmBusiExtdBean; + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java new file mode 100644 index 0000000..22475d9 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java @@ -0,0 +1,271 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.sqlpack.DdlMdmModelPreparedPack; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : hql脚本封装类 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-03-29 15:57 + * @Modify: + **/ +public class DdlPackMdmModelBean { + + /** + * 条件实体 + */ + List entityTypeList; + + /** + * 条件属性名称 + */ + List keyList; + + /** + * 条件值 + */ + List valueList; + + //是否是hql + private boolean isHql; + + //手动hql，尽量避免直接传参，使用？代替 + private String hqlAppend; + + //where后跟着的hql/sql + private StringBuilder whereAppend; + + //排序内容 + private String orderByStr; + + //需要拼接的hql + private StringBuilder sb = null; + + public DdlPackMdmModelBean() { + this.isHql = true; + whereAppend = new StringBuilder(); + entityTypeList = new ArrayList<>(); + keyList = new ArrayList<>(); + valueList = new ArrayList<>(); + } + + public DdlPackMdmModelBean(boolean isHql) { + this.isHql = isHql; + whereAppend = new StringBuilder(); + entityTypeList = new ArrayList<>(); + keyList = new ArrayList<>(); + valueList = new ArrayList<>(); + } + + /** + * 查询制定组织有效的数据 + * + * @param organizeCode + * @return + */ + public static DdlPackMdmModelBean getDdlPackBean(String organizeCode) { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, organizeCode, "organizeCode", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, organizeCode, "organizeCode", result); + + return result; + } + + /** + * 查询指定组织、指定是否有效的数据 + * + * @param organizeCode + * @param isValid + * @return + */ + public static DdlPackMdmModelBean getDdlPackBean(String organizeCode, int isValid) { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, isValid, "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, organizeCode, "organizeCode", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, isValid, "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, organizeCode, "organizeCode", result); + + return result; + } + + public static DdlPackMdmModelBean getDdlPackBean() { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + return result; + } + + public static DdlPackMdmModelBean getDdlPackBean(BaseMdmBusiModelBean bean) { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + if (bean != null) { + if (bean.getBusi() != null) { + result.setOrderByStr(bean.getBusi().orderBy()); + } else if (bean.getMaster() != null) { + result.setOrderByStr(bean.getMaster().orderBy()); + } + } + + return result; + } + + public boolean isHql() { + return isHql; + } + + public void setHql(boolean hql) { + isHql = hql; + } + + public String getOrderByStr() { + return orderByStr; + } + + public void setOrderByStr(String orderByStr) { + this.orderByStr = orderByStr; + } + + public String getHqlAppend() { + return hqlAppend; + } + + public void setHqlAppend(String hqlAppend) { + this.hqlAppend = hqlAppend; + } + + public String getWhereAppend() { + return whereAppend.toString(); + } + + public void setWhereAppend(String whereAppend) { + this.whereAppend = new StringBuilder(whereAppend); + } + + public List getEntityTypeList() { + return entityTypeList; + } + + public void setEntityTypeList(List entityTypeList) { + this.entityTypeList = entityTypeList; + } + + public List getKeyList() { + return keyList; + } + + public void setKeyList(List keyList) { + this.keyList = keyList; + } + + public List getValueList() { + return valueList; + } + + public void setValueList(List valueList) { + this.valueList = valueList; + } + + /** + * 添加查询条件 + * + * @param hql + * @param val + */ + public void addColumnQuery(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String column, String hql, Object val) { + if (entityTypeList == null) { + entityTypeList = new ArrayList<>(); + } + if (keyList == null) { + keyList = new ArrayList<>(); + } + if (valueList == null) { + valueList = new ArrayList<>(); + } + if (entityType != null && column != null && val != null) { + entityTypeList.add(entityType); + keyList.add(column); + valueList.add(val); + } + + whereAppend.append(hql); + } + + /** + * 需要查询属性的数量 + * + * @return + */ + public int getColumnSize() { + return keyList.size(); + } + + /** + * 获取包含hql的最终的ddl + * + * @return + */ + public String getPackedHqlAll() { + sb = new StringBuilder(); + if (hqlAppend != null) { + sb.append(hqlAppend); + } + if (whereAppend != null) { + sb.append(whereAppend); + } + if (orderByStr != null) { + sb.append(orderByStr); + } + return sb.toString(); + } + + /** + * 获取最终的ddl + * + * @return + */ + public String getPackedHql() { + sb = new StringBuilder(); + if (whereAppend != null) { + sb.append(whereAppend); + } + if (orderByStr != null) { + sb.append(orderByStr); + } + return sb.toString(); + } +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java new file mode 100644 index 0000000..43c2037 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 数据中心同步数据 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-06-02 16:14 + * @Modify: + **/ +@Data +@ApiModel("数据中心同步数据") +public class MdmSyncData implements Serializable { + + private static final long serialVersionUID = -1642626000860074060L; + + @ApiModelProperty("同步数据类型") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_TYPE.class) + private Integer syncType; + + public int getSyncTypeVal(){ + return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType; + } + + public String getSyncTypeTxt(){ + return syncType == null ? "无":MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType); + } + + @ApiModelProperty("同步模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class) + private Integer syncSoftType; + + public String getSyncSoftTypeTxt(){ + return syncSoftType == null ? "无":CommonEnumUtil.SOFT_TYPE.valueOfDescription(syncSoftType); + } + + @ApiModelProperty("是否是主数据") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isMasterData; + + public int getIsMasterDataVal() { + return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData; + } + + public String getIsMasterDataTxt(){ + return isMasterData == null ? "无":CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData); + } + + @ApiModelProperty("同步数据class") + private String syncDataClass; + + public String getSyncDataClassSimpleName(){ + if(syncDataClass == null){ + return null; + } + + return syncDataClass.trim().substring(syncDataClass.trim().lastIndexOf(".") + 1); + } + + @ApiModelProperty("同步数据id") + private List syncDataId; + + @ApiModelProperty("同步数据用户名") + private String syncDateUserName; + + @ApiModelProperty("同步时间") + private String syncDateTime; + + @ApiModelProperty("同步失败键") + private String syncFailKey; + + @ApiModelProperty("同步失败时间") + private String syncFailDateTime; + + @ApiModelProperty("同步失败信息") + private String syncFailMessage; +} 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 new file mode 100644 index 0000000..7c498ef --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi.core; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 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-05-12 18:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_GEAR_CORE_EXTD") +@ApiModel("主数据齿轮-平台扩展") +public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean { + + private static final long serialVersionUID = -3535174942277452194L; + + @Transient + @ApiModelProperty("主数据Class") + @AnnoOutputColumn(hidden = true) + public static Class mdmMasterClass = MdmGear.class; + + @Transient + @ApiModelProperty("软件模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true) + public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue(); + + @Column(name = "CORE_NUM") + @ApiModelProperty("核心数量") + 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 new file mode 100644 index 0000000..18dbcb1 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java @@ -0,0 +1,41 @@ +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 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-05-12 18:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_GEAR") +@ApiModel("主数据齿轮") +public class MdmGear extends BaseMdmBean { + + private static final long serialVersionUID = -7580444601811207793L; + + @Column(name="NAME") + @ApiModelProperty("齿轮名称") + private String name; + + @Column(name="GEAR_MODEL") + @ApiModelProperty("齿轮规格") + private String gearModel; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java new file mode 100644 index 0000000..015bd8b --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.mdm.jpa.dao; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; + +import java.util.List; + +/** + * @Description : 自定义Repository的方法接口 + * @Reference : 对jpaRepository进行扩展 + * @Author : alwaysfrin + * @CreateDate : 2018-09-13 10:34 + * @Modify: + **/ +public interface MdmBusiModelRepository, M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> { + T getById(long id); + + List list(); + + List list(final String hql); + + List listPager(Pager pager); + + List findByPage(final DdlPackMdmModelBean packBean, final int offset, final int pageSize); + + /** + * @param hql hql入参需要用问号代替 + * @param values 按照入参问号的顺序进行赋值 + * @param offset + * @param pageSize + * @return + */ + List findByPage(final String hql, final Object[] values, final int offset, final int pageSize); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff); + + T getByProperty(DdlPackMdmModelBean packBean); + + T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + int listCount(); + + int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager); + + List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff, Pager pager); + + List findByHqlWhere(DdlPackMdmModelBean packBean); + + List findByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff); + + int findByHqlWhereCount(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + List findByHqlWherePage(String hqlWhere, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff); + + List findByHqlWherePage(DdlPackMdmModelBean packBean, Pager pager); + + int findByHqlWhereCount(DdlPackMdmModelBean packBean); + + int findByHqlCount(String hql); + + int findByHqlCount(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + List findByHqlPage(DdlPackMdmModelBean packBean, Pager pager); + + List findByHqlPage(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + double findByHqlDouble(DdlPackMdmModelBean packBean); + + long findByHqlLong(DdlPackMdmModelBean packBean); + + List findByHqlTopWhere(DdlPackMdmModelBean packBean, int topNum); + + /********************** 多表联查，返回Object[]数组根据hql查询翻页信息 开始 ****************************/ + List findByHqlObjects(String hql); + + List findByHqlObjects(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + List findByHqlPageObjects(String hql, Pager pager); + + List findByHqlPageObjects(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + List findBySqlObjList(String sql); + + List findBySqlObjListByPager(String sql, Pager pager); + + /****************** 部分业务处理 *******************/ + + boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + boolean isExitByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + boolean isExitByHql(DdlPackMdmModelBean packBean); + +} 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 new file mode 100644 index 0000000..76a4cd5 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java @@ -0,0 +1,840 @@ +package cn.estsh.i3plus.pojo.mdm.jpa.daoimpl; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; +import cn.estsh.i3plus.pojo.mdm.jpa.dao.MdmBusiModelRepository; +import org.hibernate.NonUniqueResultException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.persistence.EntityManager; +import javax.persistence.NoResultException; +import javax.persistence.Query; +import java.lang.reflect.ParameterizedType; +import java.text.MessageFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; + +/** + * @Description : 自定义持久化接口实现 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-21 15:05 + * @Modify: + **/ +public class MdmBusiModelRepositoryImpl, M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> + implements MdmBusiModelRepository { + public static final Logger LOGGER = LoggerFactory.getLogger(MdmBusiModelRepositoryImpl.class); + + /** + * 持久化上下文 + */ + @Autowired + private EntityManager entityManager; + + private final Class modelClass; + private final Class masterClass; + private final Class busiExtdClass; + + private final String selectCount; + private final String selectAll; + private final String formStr; + + public MdmBusiModelRepositoryImpl() { + // 通过反射获取model的真实类型 + ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass(); + modelClass = (Class) pt.getActualTypeArguments()[0]; + masterClass = (Class) pt.getActualTypeArguments()[1]; + busiExtdClass = (Class) pt.getActualTypeArguments()[2]; + + this.formStr = String.format("from %s as busi left join %s as master on busi.mdmMasterId = master.id ", + busiExtdClass.getName(), masterClass.getName() + ); + + this.selectCount = "select count(distinct busi) " + formStr; + this.selectAll = MessageFormat.format("select new {0}(master,busi) ", modelClass.getName()) + formStr; + } + + private void setParameter(Query query, String[] propName, Object[] propValue) { + String name = null; + Object value = null; + for (int i = 0; i < propName.length; i++) { + name = propName[i]; + value = propValue[i]; + if (value != null) { + if ((value instanceof Object[])) { + query.setParameter(name.replace(".", ""), (Object[]) value); + } else if ((value instanceof Collection)) { + query.setParameter(name.replace(".", ""), (Collection) value); + } else { + query.setParameter(name.replace(".", ""), value); + } + } + } + } + + private void appendQL(StringBuffer sb, String[] propName, Object[] propValue) { + String name = null; + Object value = null; + for (int i = 0; i < propName.length; i++) { + name = propName[i]; + value = propValue[i]; + 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(".", "") + ")"); + } + } else if (value == null) { + sb.append(" and model." + name + " is null "); + } else { + sb.append(" and model." + name + "=:" + name.replace(".", "")); + } + } + } + + @Override + public T getById(long id) { + try { + List busiModelList = + entityManager.createQuery(selectAll + " where busi.id = :busi_id").setParameter("busi_id", id).getResultList(); + + return busiModelList.isEmpty() ? modelClass.newInstance() : busiModelList.get(0); + } catch (Exception e) { + return null; + } + } + + @Override + public List list() { + List l = entityManager.createQuery(selectAll).getResultList(); + return l; + } + + @Override + public List listPager(Pager pager) { + if (pager.getTotalRows() > 0) { + return entityManager.createQuery(selectAll) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List list(final String hql) { + return entityManager.createQuery(hql).getResultList(); + } + + @Override + public List findByPage(DdlPackMdmModelBean packBean, int offset, int pageSize) { + Query query = null; + String ddl = selectAll + " where 1=1 " + packBean.getPackedHql(); + + if (packBean.isHql()) { + query = entityManager.createQuery(ddl); + } else { + query = entityManager.createNativeQuery(ddl); + } + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(offset) + .setMaxResults(pageSize) + .getResultList(); + } + + @Override + public List findByPage(String hql, Object[] values, int offset, int pageSize) { + Query query = entityManager.createQuery(hql); + for (int i = 0; i < values.length; i++) { + query.setParameter(i, values[i]); + } + return query.setFirstResult(offset).setMaxResults(pageSize).getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + String queryString = MessageFormat.format("{0} where {1}.{2}= :{3}_{4}", selectAll, entityType.getAlias(), propertyName, + entityType.getAlias(), propertyName); + return entityManager.createQuery(queryString).setParameter(entityType.getAlias() + "_" + propertyName, value).getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (entityTypes.length != propertyNames.length || propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!entityTypes:" + entityTypes.length + " propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff) { + String queryString = MessageFormat.format("{0} where {1}.{2}= :{3} {4}", selectAll, entityType.getAlias(), propertyName, propertyName, orderByStuff); + return entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + queryString.append(" " + orderByStuff); + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.getResultList(); + } + + @Override + public T getByProperty(DdlPackMdmModelBean packBean) { + + try { + List list = findByHqlWhere(packBean); + return list.size() != 0 ? list.get(0) : null; + } catch (NoResultException ne) { + LOGGER.error("数据不存在，DdlPackMdmModelBean：{}", packBean); + return null; + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。packBean：{}", packBean); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override + public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + String queryString = + selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; + try { + List list = entityManager.createQuery(queryString) + .setParameter(entityType.getAlias() + "_" + propertyName, value) + .getResultList(); + return list.size() != 0 ? list.get(0) : null; + } catch (NoResultException ne) { + LOGGER.error("数据不存在，prop：{},value：{}", propertyName, value, ne); + return null; + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}", propertyName, value, ex); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override + public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + try { + List list = queryObject.getResultList(); + return list.size() != 0 ? list.get(0) : null; + } catch (NoResultException ne) { + LOGGER.error("数据不存在", ne); + return null; + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。", ex); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override + public int listCount() { + try { + Long count = entityManager.createQuery(selectCount, Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + try { + String queryString = selectCount + " where " + entityType.getAlias() + "." + propertyName + + "= :" + entityType.getAlias() + "_" + propertyName; + Long count = entityManager.createQuery(queryString, Long.class) + .setParameter(entityType.getAlias() + "_" + propertyName, value) + .getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, 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(distinct model) from " + masterClass.getName() + " as model"); + + int size = propertyNames.length; + if (size > 0) { + queryString.append(" where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString(), Long.class); + for (int i = 0; i < size; 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(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; + return entityManager.createQuery(queryString) + .setParameter(entityType.getAlias() + "_" + propertyName, value) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, + String orderByStuff, Pager pager) { + if (pager.getTotalRows() > 0) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + if (orderByStuff != null && orderByStuff.length() > 0) { + queryString.append(orderByStuff); + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + + return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByHqlWhere(DdlPackMdmModelBean packBean) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + return query.getResultList(); + } + + @Override + public List findByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll + " as where 1=1 "); + + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } + + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if (propertyNames[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + queryString.append("" + orderByStuff); + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + return queryObject.getResultList(); + } + + @Override + public int findByHqlWhereCount(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectCount + " where 1=1 "); + + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } + + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + try { + Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByHqlWherePage(String hqlWhere, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) { + if (pager.getTotalRows() > 0) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll + " where 1=1 "); + + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } + + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + queryString.append(" " + orderByStuff); + + Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByHqlWherePage(DdlPackMdmModelBean packBean, Pager pager) { + if (pager.getTotalRows() > 0) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public int findByHqlWhereCount(DdlPackMdmModelBean packBean) { + StringBuffer queryString = new StringBuffer(); + queryString.append(selectCount + " where 1=1 " + packBean.getWhereAppend()); + + 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.getValueList().get(i) + ); + } + try { + Long count = (Long) query.getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByHqlCount(String hql) { + try { + Long count = entityManager.createQuery(hql, Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByHqlCount(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue) { + Query queryObject = entityManager.createQuery(hql, Integer.class); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]); + } + } + try { + return (int) queryObject.getSingleResult(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByHqlPage(DdlPackMdmModelBean packBean, Pager pager) { + if (pager.getTotalRows() > 0) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByHqlPage(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue) { + if (pager.getTotalRows() > 0) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]); + } + } + + return queryObject.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public double findByHqlDouble(DdlPackMdmModelBean packBean) { + try { + Query query = entityManager.createQuery(packBean.getPackedHqlAll(), Double.class); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + Double result = (Double) query.getSingleResult(); + return result == null ? 0 : result; + } catch (NoResultException e) { + return 0; + } + } + + @Override + public long findByHqlLong(DdlPackMdmModelBean packBean) { + try { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql(), Long.class); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return (long) query.getSingleResult(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByHqlTopWhere(DdlPackMdmModelBean packBean, int topNum) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(0).setMaxResults(topNum).getResultList(); + } + + @Override + public List findByHqlObjects(String hql) { + return entityManager.createQuery(hql).getResultList(); + } + + @Override + public List findByHqlObjects(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, + Object[] paramValue) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]); + } + } + + return queryObject.getResultList(); + } + + @Override + public List findByHqlPageObjects(String hql, Pager pager) { + if (pager.getTotalRows() > 0) { + return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + } else { + return new ArrayList(); + } + } + + @Override + public List findByHqlPageObjects(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (pager.getTotalRows() > 0) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < propertyNames.length; i++) { + if (propertyNames[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + } else { + return new ArrayList(); + } + } + + @Override + public List findBySqlObjList(String sql) { + return entityManager.createNativeQuery(sql).getResultList(); + } + + @Override + public List findBySqlObjListByPager(String sql, Pager pager) { + if (pager.getTotalRows() > 0) { + return entityManager.createNativeQuery(sql) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList(); + } + } + + /************** 部分业务 *************/ + private String getNowTime(boolean needSecond) { + return needSecond ? getNowTime("yyyy-MM-dd HH:mm:ss") : getNowTime("yyyy-MM-dd HH:mm"); + } + + private String getNowTime(String format) { + String dateTime; + try { + dateTime = (new SimpleDateFormat(format)).format(new Date()); + } catch (Exception e) { + dateTime = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date()); + } + + return dateTime; + } + + @Override + public boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + //大于0，存在 + return findByPropertyCount(entityType, propertyName, value) > 0; + } + + @Override + public boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + return findByPropertyCount(entityTypes, propertyNames, values) > 0; + } + + @Override + public boolean isExitByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + return findByHqlWhereCount(hqlWhere, entityTypes, propertyNames, values) > 0; + } + + @Override + public boolean isExitByHql(DdlPackMdmModelBean packBean) { + return findByHqlWhereCount(packBean) > 0; + } + + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java new file mode 100644 index 0000000..51c84a3 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mdm.model; + + +import cn.estsh.i3plus.pojo.base.common.Pager; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-29 10:23 + * @Modify: + **/ +@Data +public class MdmPagerQueryModel { + + /** + * 实体 + */ + private T bean; + + /** + * 分页条件 + */ + private Pager pager; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java new file mode 100644 index 0000000..6768a27 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mdm.model.core; + +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @Description : 主数据齿轮-平台model + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +@Data +@ApiModel("齿轮平台业务model") +public class MdmGearCoreBusiModel extends BaseMdmBusiModelBean { + public MdmGearCoreBusiModel(MdmGear mdmMasterBean, MdmGearCoreBusiExtd mdmBusiBean) { + super(mdmMasterBean, mdmBusiBean); + } +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java new file mode 100644 index 0000000..acede04 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mdm.modelrepository.core; + +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import cn.estsh.i3plus.pojo.mdm.jpa.dao.MdmBusiModelRepository; +import cn.estsh.i3plus.pojo.mdm.jpa.daoimpl.MdmBusiModelRepositoryImpl; +import cn.estsh.i3plus.pojo.mdm.model.core.MdmGearCoreBusiModel; +import org.springframework.stereotype.Component; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-25 11:42 + * @Modify: + **/ +@Component +public class MdmGearCoreRepository + extends MdmBusiModelRepositoryImpl + implements MdmBusiModelRepository { +} 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 new file mode 100644 index 0000000..6e7cc79 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mdm.repository; + +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; + +import java.util.List; + +/** + * @Description : 主数据中心 HQL 包 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-20 15:23 + * @Modify: + **/ +public class MdmHqlPack { + + public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + return ddlPackBean; + } + + public static DdlPackBean getMdmPackBean() { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + return ddlPackBean; + } + + + public static DdlPackBean packHqlIdList(List idList) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(idList,"id",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlMdmGear(MdmGear mdmGear) { + DdlPackBean ddlPackBean = getMdmPackBean(mdmGear); + + DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean); + DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean); + DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true); + + return ddlPackBean; + } + + public static DdlPackBean packHqlMdmGearCoreExtd(MdmGearCoreBusiExtd mdmGear) { + DdlPackBean ddlPackBean = getMdmPackBean(mdmGear); + + DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean); + DdlPreparedPack.getNumEqualPack(mdmGear.getMdmMasterId(),"mdmMasterId",ddlPackBean); + DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true); + + return ddlPackBean; + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java new file mode 100644 index 0000000..6a6f3e9 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.busi.core; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmGearCoreBusiModelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java new file mode 100644 index 0000000..43b555f --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmGearRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java new file mode 100644 index 0000000..a5db9fa --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java @@ -0,0 +1,699 @@ +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 org.apache.commons.lang3.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * @Description : 数据库脚本封装方法，封装成预加载hql，HqlPack仅限用于一些特定的sql，可能造成性能低下 + * example： name = :name + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-03-29 + * @Modify: + **/ +public class DdlMdmModelPreparedPack { + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String startDate, String endDate, String columnName, + DdlPackMdmModelBean packBean, boolean isShowTime) { + if (startDate == null || startDate.trim().length() == 0) { + startDate = "1900-01-01"; + } else { + 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 = endDate.trim(); + } + if (isShowTime && endDate.trim().length() <= 11) { + endDate += " 23:59:59"; + } + + packBean.addColumnQuery(entityType, columnName + , " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName + , startDate); + packBean.addColumnQuery(entityType, "s_" + columnName + , " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName + , endDate); + } + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) { + if (isLeftContain) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, startDate.trim()); + } else { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, startDate.trim()); + } + if (isRightContain) { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, endDate.trim()); + } else { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, endDate.trim()); + } + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) { + if (date != null && date.trim().length() > 0) { + String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); + if (date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) { + //只有一个逗号 + date = ""; + } + + String[] time = date.split(","); + if (time.length == 1) { + //只有开始日期，没有结束日期 + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + time[0] + "%"); + } 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"; + } + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, time[0]); + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, time[1]); + } else { + if (showTaday) { + if (isShowTime) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, today + " 00:00:00"); + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, today + " 23:59:59"); + } else { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " " +">= :" + entityType.getAlias() + "_" + columnName,today); + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, today); + } + } + } + } + } + + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String date, String startColumnName, String endColumnName, + DdlPackMdmModelBean packBean, boolean isShowTime) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (date == null || date.trim().length() == 0) { + date = sdf.format(new Date()); + } + if (!isShowTime) { + date = date.substring(0, 10); + packBean.addColumnQuery(entityType, null, " and '" + date + "' between substring(" + entityType.getAlias() + "." + startColumnName + + ",1,10) and substring(" + entityType.getAlias() + "." + endColumnName + ",1,10)", null); + return; + } else if (date.trim().length() <= 11) { + date += " 00:00:00"; + } + packBean.addColumnQuery(entityType, null, " and '" + date + "' between " + entityType.getAlias() + "." + startColumnName + + " and " + entityType.getAlias() + "." + endColumnName, null); + } + + /** + * 封装String对象成order by排序 + * + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object order[], String[] columnName, + DdlPackMdmModelBean packBean) { + String sqlStr = ""; + String orderByStr = ""; + for (int i = 0; i < order.length; i++) { + if (order[i] != null && order[i].toString().trim().length() > 0) { + if (Integer.parseInt(order[i].toString()) == 1) { + order[i] = "asc"; + } else { + order[i] = "desc"; + } + if (columnName[i].indexOf(" model.") == -1) { + sqlStr += entityTypes[i].getAlias() + "." + columnName[i]; + } else { + sqlStr += columnName[i]; + } + sqlStr += " " + order[i].toString() + ","; + } + } + + if (sqlStr.length() > 0 && sqlStr.lastIndexOf(",") == sqlStr.length() - 1) { + sqlStr = sqlStr.substring(0, sqlStr.length() - 1); + orderByStr = " order by " + sqlStr; + } + + packBean.setOrderByStr(orderByStr); + } + + /** + * 对象默认排序 + */ + public static void getOrderDefault(BaseBean bean) { + if (bean != null && StringUtils.isBlank(bean.getOrderByParam())) { + bean.setOrderByParam("modifyDatetime"); + bean.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + } + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val + "%"); + } + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val + "%"); + } + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringRightLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, val + "%"); + } + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLeftLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装String对象成不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <> :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotNullPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, DdlPackMdmModelBean packBean) { + packBean.addColumnQuery(entityType, null, " and " + entityType.getAlias() + "." + columnName + " is not null", null); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotBlanklPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, DdlPackMdmModelBean packBean) { + packBean.addColumnQuery(entityType, null, " and (" + entityType.getAlias() + "." + columnName + " is not null and " + entityType.getAlias() + "." + columnName + " !='')", null); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装long或者int的正整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Long.parseLong(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param packBean + */ + public static void getNotEqueals(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) { + packBean.addColumnQuery(entityType, null, " and UPPER(" + entityType.getAlias() + "." + firstColumnName + ")!= UPPER(" + entityType.getAlias() + "." + twoColumnName + ")", null); + } + + /** + * 封装long或者int的负整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Long.parseLong(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOverZero(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumWithZeroEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) >= 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装String对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装String对象成大于不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装String对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, data); + } + } + + /** + * 封装String对象成小于不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " < :" + entityType.getAlias() + "_s_" + columnName, data); + } + } + + /** + * 封装double对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成大于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " < :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成小于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <> :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName, + " and " + entityType.getAlias() + "." + columnName + " in ( :" + entityType.getAlias() + "_in_" + columnName + " ) ", data); + } + } + + /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and (" + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ") " + + "or " + entityType.getAlias() + "." + columnName + " is null)", data); + } + } + + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName," or " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackArray(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object[] data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", Arrays.asList(data)); + } + } + + /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object[] data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", Arrays.asList(data)); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackList(MdmEnumUtil.HQL_ENTITY_TYPE entityType, List data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.size() > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(MdmEnumUtil.HQL_ENTITY_TYPE entityType, List data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.size() > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.trim().length() > 0) { + //判断最后一位是不是逗号 + 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] + "',"; + } + } + packBean.addColumnQuery(entityType, "in_"+columnName, " or " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.trim().length() > 0) { + //判断最后一位是不是逗号 + 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] + "',"; + } + } + packBean.addColumnQuery(entityType,"in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 转换排序列 + * + * @param columnName 列名 + * @param basisType 基本类型 + * @return + * @see CommonEnumUtil.BASIS_TYPE + */ + public static String getOrderColConvertType(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, int basisType) { + String name = " " + entityType.getAlias() + "." + columnName; + + if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) { + name = " cast(" + name + " as integer)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) { + name = " cast(" + name + " as decimal)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) { + name = " cast(" + name + " as long)"; + } + return name; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..60d9861 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 index 5e7684b..651f8dc 100644 --- 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 @@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @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/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java new file mode 100644 index 0000000..6464445 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java @@ -0,0 +1,74 @@ +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/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java new file mode 100644 index 0000000..6153d23 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java @@ -0,0 +1,14 @@ +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/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT 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 new file mode 100644 index 0000000..cc05df3 Binary files /dev/null and b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store 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 new file mode 100644 index 0000000..eb1c3c2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java @@ -0,0 +1,105 @@ +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 : 供应商 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_VENDOR") +@Api("供应商信息") +public class BasVendor extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8041987864739007553L; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; + + @Column(name="VENDOR_NAME") + @ApiParam("供应商简称") + private String vendorName; + + @Column(name="VENDOR_DESC") + @ApiParam("供应商全称") + private String vendorDesc; + + @Column(name="VENDOR_ADDR") + @ApiParam("供应商地址") + private String vendorAddr; + + @Column(name="VENDOR_OWNER") + @ApiParam("联系人") + private String vendorOwner; + + @Column(name="VENDOR_EMAIL") + @ApiParam("邮箱") + private String vendorEmail; + + @Column(name = "IS_ASN") + @ApiParam(value = "是否发ASN", example = "0") + private Integer isAsn; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名") + private String userName; + + @Column(name = "PASSWORD") + @ApiParam(value = "密码") + private String password; + + @Column(name = "VENDOR_CALL") + @ApiParam("供应商电话") + private String vendorCall; + + @Column(name = "VENDOR_FAX") + @ApiParam("传真") + private String vendorFax; + + @Column(name = "VENDOR_PHONE") + @ApiParam("手机") + private String vendorPhone; + + @Column(name = "KILOBIT") + @ApiParam("千位符号") + private String kilobit; + + @Column(name = "DECIMALS") + @ApiParam("小数位符号") + private String decimals; + + //20-承运商 + @Column(name = "VENDOR_TYPE") + private Integer vendorType; + + @Column(name = "MAP_LOCATION") + @ApiParam("经纬度") + private String mapLocation; + + public BasVendor() { + } + + public BasVendor(Long id, String userName) { + this.id = id; + this.userName = userName; + } +} 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 new file mode 100644 index 0000000..d95ebc1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -0,0 +1,90 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :不良信息接口表 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_DEFECT_DATA") +@Api("不良信息接口数据") +public class IfDefectData extends BaseBean implements Serializable { + private static final long serialVersionUID = 4320604250440221049L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serailNumber; + + @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 = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private Integer defectActionType; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Lob + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_TYPE") + @ApiParam("动作代码") + private String actionType; + + @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 98d4fc0..39063b7 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 @@ -10,6 +10,7 @@ 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; @@ -93,6 +94,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/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java new file mode 100644 index 0000000..a41617f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java @@ -0,0 +1,56 @@ +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 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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_EDI_INITIAL_DATA") +@Api("EDI_初始数据表") +public class IfEdiInitialData extends BaseBean implements Serializable { + private static final long serialVersionUID = -523843818485699827L; + + @Column(name = "PROGRAM_DATA") + @ApiParam("EDI抓取程序代码") + private String programData; + + @Column(name = "CONTENT") + @ApiParam("数据") + private String content; + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Lob + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + +} 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 d08568e..280de6b 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 @@ -10,6 +10,7 @@ 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; @@ -39,9 +40,13 @@ public class IfPackageDetail extends BaseBean implements Serializable { private String partName; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PACKAGE_NO") @ApiParam("包装条码") private String packageNo; @@ -84,6 +89,7 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") @@ -93,4 +99,20 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + + @Column(name = "SAMPLE_TYPE") + @ApiParam("条码类型") + private String sampleType; + + @Column(name = "CUST_DELIVERY_LOCATION") + @ApiParam("客户发往地") + private String custDeliveryLocation; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; } 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 5d8e27c..2be9e5b 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 @@ -10,6 +10,7 @@ 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; @@ -58,6 +59,26 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("特殊批次") private String fixLotNo; + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("原材料物料名称") + private String itemPartName; + + @Column(name = "ITEM_QTY") + @ApiParam("原材料用量") + private Double itemQty; + + @Column(name = "ITEM_UNIT") + @ApiParam("原材料单位") + private String itemUnit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + @Column(name = "ACTION_USER") @ApiParam("操作人") private String actionUser; @@ -76,6 +97,7 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") @@ -85,4 +107,28 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置") + private String produceCategoryCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; } 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 new file mode 100644 index 0000000..74de05a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -0,0 +1,105 @@ +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: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_QC_ORDER") +@Api("IF_质检单") +public class IfQcOrder extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0D; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuid; + + @Column(name = "ORGANIZTION_CODE") + @ApiParam("工厂代码") + private String organiztionCode; + + @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 = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "DELIVERY_DATE") + @ApiParam("发运时间") + private String deliveryDate; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CUST_DELIERY_LOCATION") + @ApiParam("客户发运地") + private String custDelieryLocation; + +} 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 new file mode 100644 index 0000000..7972aa2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.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 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: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_QC_RESULT") +@Api("IF_质检结果") +public class IfQcResult extends BaseBean implements Serializable { + + //private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuid; + + @Column(name = "QC_RESULT") + @ApiParam("质检结果") + private String qcResult; + + @Column(name = "ORGANIZTION_CODE") + @ApiParam("工厂代码") + private String organiztionCode; + + @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/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index d239828..42e7bfb 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 @@ -11,9 +11,9 @@ 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.util.Date; /** * @Description :JIT发运数据同步 @@ -27,65 +27,120 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "if_queue_shipping") +@Table(name = "IF_QUEUE_SHIPPING") @Api("JIT发运数据同步") public class IfQueueShipping extends BaseBean implements Serializable { - private static final long serialVersionUID = -8961182851667690154L; - @Column(name = "JIT_NO") - @ApiParam("JIT队列编号") - private String jitNo; - - @Column(name = "VIN_CODE") - @ApiParam("vin") - private String vinCode; - - @Column(name = "CUST_FLAG_NO") - @ApiParam("客户标识号") - private String custFlagNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("操作人") - private String supplierCode; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private Date 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 Integer ifCode; - + private static final long serialVersionUID = -3385698810529084423L; + @Column(name = "JIT_NO") + @ApiParam("JIT队列编号") + private String jitNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @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 = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置") + private String produceCategoryCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + + @Column(name = "SYNC_STATUS") + @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; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("原材料物料名称") + private String itemPartName; + + @Column(name = "ITEM_QTY") + @ApiParam("原材料物料用量") + private Double itemQty; + + @Column(name = "ITEM_UNIT") + @ApiParam("原材料物料用量") + private String itemUnit; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "JIT_TYPE_FLAG") + @ApiParam("JIT类型标识") + private String jitTypeFlag; + + @Column(name = "CUST_POINT_DATE") + @ApiParam("客户需求时间") + private String custPointDate; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; } 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 new file mode 100644 index 0000000..bb50de6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -0,0 +1,93 @@ +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.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) +@Table(name = "IF_RAW_PART_DATA") +@Api("原料上线数据") +public class IfRawPartData extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895596L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PART_TYPE") + @ApiParam("原料类型") + private String partType; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("原料条码") + private String serialNumber; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @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; + + @Column(name = "ORGANIZATION_CODE") + @ApiParam("工厂代码") + private String organizationCode; +} 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 df240bc..221abea 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 @@ -11,6 +11,7 @@ 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; @@ -47,6 +48,7 @@ public class IfWmsPpm 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/MesAgvStopRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java new file mode 100644 index 0000000..fb1dcd3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java @@ -0,0 +1,72 @@ +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 :停机记录表 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-03 15:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_AGV_STOP_RECORD") +@Api("MES_停机记录表") +public class MesAgvStopRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182851767690154L; + @Column(name = "STOP_TYPE") + @ApiParam("停机类型") + private Integer stopType; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @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 = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "STOP_START_TIME") + @ApiParam("停机开始时间") + private String stopStartTime; + + @Column(name = "STOP_END_TIME") + @ApiParam("停机结束时间") + private String stopEndTime; + + @Column(name = "STOP_REASON") + @ApiParam("停机原因") + private String stopReason; +} 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 new file mode 100644 index 0000000..2f35bf8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BLIND_HISTORY") +@Api("MES_盲检记录") +public class MesBlindHistory extends BaseBean implements Serializable { + private static final long serialVersionUID = -7459452475180601499L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "BLIND_OBJECT") + @ApiParam("盲检对象") + private String blindObject; + + @Column(name = "BLIND_ITEM") + @ApiParam("盲检问题") + private String blindItem; + + @Column(name = "SYSTEM_ANSWER") + @ApiParam("系统答案") + private String systemAnswer; + + @Column(name = "CHOOSED_ANSWER") + @ApiParam("选中答案") + private String choosedAnswer; + + @Column(name = "CHECKED") + @ApiParam("是否一致") + private Integer checked; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Transient + @ApiParam("主队列编号") + private String orderNo; + +} 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 new file mode 100644 index 0000000..147e91c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BLIND_RULE") +@Api("MES_盲检规则") +public class MesBlindRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -7459452475180601498L; + + @Column(name = "RULE_ID") + @ApiParam("匹配规则ID") + private String ruleId; + + @Column(name = "CAR_TYPE") + @ApiParam("车辆类型") + private String carType; + + @Column(name = "CAR_COLOR") + @ApiParam("车辆颜色") + private String carColor; + + @Column(name = "PART_CODE") + @ApiParam("零件号") + private String partCode; + + @Column(name = "PART_NAME") + @ApiParam("零件名称") + private String partName; + + @Column(name = "CAR_CONFIG") + @ApiParam("配置") + private String carConfig; + + @Column(name = "CAR_LEVEL") + @ApiParam("等级") + private String carLevel; + + @Column(name = "PART_COLOR") + @ApiParam("零件颜色") + private String partColor; + + @Transient + @ApiParam("零件颜色") + private String rightKey; + +} 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 new file mode 100644 index 0000000..b82bbae --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java @@ -0,0 +1,65 @@ +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: + * @Reference: + * @Author: jessica.chen + * @CreateDate: + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BLIND_TOPIC_SETTING") +@Api("MES_盲检问题设置") +public class MesBlindTopicSetting extends BaseBean implements Serializable { + private static final long serialVersionUID = -7459452475180601497L; + + @Column(name = "TOPIC_ID") + @ApiParam("序号") + private String topicId; + + @Column(name = "TOPIC_CODE") + @ApiParam("题目编号") + private String topicCode; + + @Column(name = "TOPIC_DESC") + @ApiParam("题目描述") + private String topicDesc; + + @Column(name = "TOPIC_OBJECT") + @ApiParam("零件名称") + private String topicObject; + + @Column(name = "TOPIC_TYPE") + @ApiParam("盲检类型") + private Integer topicType; + + @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; + +} 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 new file mode 100644 index 0000000..7893a30 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:49 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD") +@Api("MES_看板") +public class MesBoard extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3932883110518753734L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "BOARD_NAME") + @ApiParam("看板名称") + private String boardName; + + @Column(name = "BOARD_TYPE") + @ApiParam("看板类型") + private String boardType; + + @Column(name = "REFRESH_INTERVAL") + @ApiParam("刷新时间") + private Integer refreshInterval; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; +} 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 new file mode 100644 index 0000000..16462e9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -0,0 +1,88 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonProperty; +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: + * @Author: jokelin + * @Date: 2020/4/20 5:07 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_EQU_DETAIL") +@Api("MES_看板设备明细") +public class MesBoardEquDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2187463105092165451L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "X_AXES") + @ApiParam(value = "横坐标") + private Double xAxes = 0d; + + @Column(name = "Y_AXES") + @ApiParam(value = "纵坐标") + private Double yAxes = 0d; + + @Transient + @ApiParam("设备状态") + private Integer equStatus; + + @Transient + @ApiParam("颜色") + private String color; + + @JsonProperty("xAxes") + public Double getxAxes() { + return xAxes; + } + + public void setxAxes(Double xAxes) { + this.xAxes = xAxes; + } + + @JsonProperty("yAxes") + public Double getyAxes() { + return yAxes; + } + + public void setyAxes(Double yAxes) { + this.yAxes = yAxes; + } + + public double getXAxes() { + return this.xAxes == null ? 0.0d : this.xAxes; + } + + public double getYAxes() { + return this.yAxes == null ? 0.0d : this.yAxes; + } +} 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 new file mode 100644 index 0000000..a4f9a61 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java @@ -0,0 +1,48 @@ +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: jokelin + * @Date: 2020/4/20 5:01 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_EQU_STATUS") +@Api("MES_看板设备状态") +public class MesBoardEquStatus extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8426698586967483537L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "EQU_STATUS_CODE") + @ApiParam("状态代码") + private Integer equStatusCode; + + @Column(name = "EQU_STATUS_DESC") + @ApiParam("状态描述") + private String equStatusDesc; + + @Column(name = "COLOR") + @ApiParam("颜色") + private String color; +} 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 new file mode 100644 index 0000000..cfca7b3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java @@ -0,0 +1,48 @@ +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: jokelin + * @Date: 2020/4/20 5:19 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_MONITOR_OBJECT") +@Api("MES_看板监控对象") +public class MesBoardMonitorObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4136991652901768961L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private String objectType; + + @Column(name = "OBJECT_VALUE") + @ApiParam("对象值") + private String objectValue; + + @Column(name = "OBJECT_VALUE_DESC") + @ApiParam("对象值描述") + private String objectValueDesc; +} 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 new file mode 100644 index 0000000..ae43578 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java @@ -0,0 +1,40 @@ +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: jokelin + * @Date: 2020/4/20 4:53 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_PICTURE") +@Api("MES_看板图片") +public class MesBoardPicture extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5784111763887252647L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "PICTURE_URL") + @ApiParam("图片路径") + private String pictureUrl; +} 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 new file mode 100644 index 0000000..842f52f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.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 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: + * @Author: jokelin + * @Date: 2020/4/20 6:49 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_PLAN_CAPACITY") +@Api("MES_看板计划产能") +public class MesBoardPlanCapacity extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7355311263972875850L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "PLAN_DATE") + @ApiParam("计划日期") + private String planDate; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "PLAN_PEOPLE_NUM") + @ApiParam("计划人数") + private Integer planPeopleNum; + + @Column(name = "ACTUAL_PEOPLE_NUM") + @ApiParam("实际人数") + private Integer actualPeopleNum; + + @Column(name = "PLAN_CAPACITY") + @ApiParam("计划产量") + private Integer planCapacity; + + @Transient + @ApiParam("班次名称") + private String shiftName; + + @Transient + @ApiParam("看板时段计划产量") + 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 new file mode 100644 index 0000000..4c1f609 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.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: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SHIFT") +@Api("MES_看板班次") +public class MesBoardShift extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404086L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; +} 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 new file mode 100644 index 0000000..e9138cf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.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 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:13 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SHIFT_SECTION") +@Api("MES_看板班次时段") +public class MesBoardShiftSection extends BaseBean implements Serializable { + + private static final long serialVersionUID = -957301986885952078L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @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 = "IS_SPANDAY") + @ApiParam("是否跨天") + private Integer isSpanday; + + @Transient + @ApiParam("班次名称") + private String shiftName; +} 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/MesBoardShiftSectionCapacity.java new file mode 100644 index 0000000..2b2e211 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.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 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:24 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY") +@Api("MES_看板时段计划产量") +public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1184108324734484237L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "PLAN_DATE") + @ApiParam("计划日期") + private String planDate; + + @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 = "PLAN_CAPACITY") + @ApiParam("计划产量") + private Integer planCapacity; + + @Transient + @ApiParam("实际产量") + private Integer actualCapacity; +} 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 new file mode 100644 index 0000000..7ca60bc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.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: jokelin + * @Date: 2020/4/20 4:43 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_TYPE") +@Api("MES_看板类型") +public class MesBoardType extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3652595133806144706L; + + @Column(name = "BOARD_TYPE") + @ApiParam("看板类型") + private String boardType; + + @Column(name = "BOARD_TYPE_NAME") + @ApiParam("看板类型名称") + private String boardTypeName; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; +} 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 new file mode 100644 index 0000000..786c128 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.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: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_TYPE_BASE_CFG") +@Api("MES_看板类型基础配置") +public class MesBoardTypeBaseCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5405378688706555644L; + + @Column(name = "BOARD_TYPE") + @ApiParam("看板类型") + private String boardType; + + @Column(name = "WINDOW_NO") + @ApiParam("界面编号") + private String windowNo; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; +} 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 new file mode 100644 index 0000000..59d5305 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.mes.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.JsonProperty; +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 : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_BOARD_WORK_CELL") +@Api("MES_看板工位信息") +public class MesBoardWorkCell extends BaseBean implements Serializable { + private static final long serialVersionUID = 6251886604848913685L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "X_AXES") + @ApiParam("横坐标") + private Double xAxes = 0d; + + @Column(name = "Y_AXES") + @ApiParam("纵坐标") + private Double yAxes = 0d; + + @Column(name = "WORK_CELL_IP") + @ApiParam("工位IP") + private String workCellIp; + + @Transient + @ApiParam("看板工位状态") + private Boolean boardWorkCellStatus; + + @JsonProperty("xAxes") + public Double getxAxes() { + return xAxes; + } + + public void setxAxes(Double xAxes) { + this.xAxes = xAxes; + } + + @JsonProperty("yAxes") + public Double getyAxes() { + return yAxes; + } + + public void setyAxes(Double yAxes) { + this.yAxes = yAxes; + } + + public double getXAxes() { + return this.xAxes == null ? 0.0d : this.xAxes; + } + + public double getYAxes() { + return this.yAxes == null ? 0.0d : this.yAxes; + } +} 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 8298ef7..700a5cb 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 @@ -81,6 +81,10 @@ public class MesBom extends BaseBean implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String effEndTime; + @Column(name = "BOM_CODE") + @ApiParam("BOM代码") + private String bomCode; + 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/MesCachaQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java index a3b9f8b..e250191 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 @@ -46,4 +46,8 @@ public class MesCachaQueue extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; + @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/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index 41042ca..a7e233a 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -30,6 +31,11 @@ import java.io.Serializable; @Api("工位投料信息") public class MesCellFeed extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369479107782L; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -66,6 +72,9 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Transient + @ApiParam(value = "原料类型名称") + private String rawTypeName; 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/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java new file mode 100644 index 0000000..9056293 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +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", indexes = { + @Index(columnList = "ORDER_NO") +}) +@Api("工位投料履历信息") +public class MesCellFeedRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369489107783L; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @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/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 1328e56..129d45e 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 @@ -53,4 +53,8 @@ public class MesCustomer extends BaseBean implements Serializable { @Column(name = "TELEPHONE") @ApiParam("客户电话") private String telephone; + + @Column(name = "CUST_DELIVERY_LOCATION") + @ApiParam("客户发往地") + private String custDeliveryLocation; } 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 a943c4a..83396d1 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 @@ -45,4 +45,8 @@ public class MesCustomerPart extends BaseBean implements Serializable { @Column(name = "CUSTOMER_PART_NAME") @ApiParam("客户零件描述") private String customerPartName; + + @Column(name = "CUSTOMER_CFG_CODE") + @ApiParam("客戶配置代碼") + private String customerCfgCode; } 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 new file mode 100644 index 0000000..f727900 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java @@ -0,0 +1,65 @@ +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 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-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_AUTH") +@Api("数据权限") +public class MesDataAuth extends BaseBean implements Serializable { + private static final long serialVersionUID = -8665559475167190408L; + @Column(name = "ROLE_ID") + @ApiParam("角色编号") + private Long roleId; + + @Column(name = "ROLE_NAME") + @ApiParam("角色名称") + private String roleName; + + @Column(name = "DATA_OBJECT") + @ApiParam("数据对象") + private String dataObject; + + @Column(name = "DATA_OBJECT_FULL_NAME") + @ApiParam("数据对象全称") + private String dataObjectFullName; + + @Column(name = "DATA_OBJECT_NAME") + @ApiParam("数据对象名称") + private String dataObjectName; + + @Column(name = "FILTER_RULE", columnDefinition = "TEXT") + @ApiParam("过滤规则") + private String filterRule; + + public long getRoleIdVal() { + return this.roleId == null ? 0 : this.roleId.longValue(); + } + +} 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 fddbb26..a4a2dca 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 @@ -44,6 +44,14 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("缺陷类型") private String defectType; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "DEFECT_FLAG_VALUE") + @ApiParam("缺陷标识值") + private String defectFlagValue; + @Transient @ApiParam("缺陷类型名称") private String defectTypeName; 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 1b9a071..fbd81ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -37,6 +36,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; @@ -77,9 +80,17 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("备注") private String memo; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private Integer defectActionType; + @Transient private List mesDefectList; + @Transient + @ApiParam("后移数量") + private Integer backwardNum; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } 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 0be20a3..6a682d7 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 @@ -56,6 +56,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String sn; + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + @Column(name = "QTY") @ApiParam("产品数量") private Double qty; @@ -92,6 +96,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @ApiParam("关联批次") private String lotNo; +// @Column(name = "WORK_ORDER_NO") +// @ApiParam("工单号") +// private String workOrderNo; + @Transient private String serialNumber; } 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 new file mode 100644 index 0000000..f21e756 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/28 21:30 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EDI_DATA") +@Api("EDI数据") +public class MesEdiData extends BaseBean implements Serializable { + private static final long serialVersionUID = 4671561947551462256L; + + @Column(name = "HOST") + @ApiParam("edi电脑名") + private String host; + + @Column(name = "DATA") + @ApiParam("数据") + private String data; + + @Column(name = "CONFIG") + @ApiParam("edi配置") + private String config; +} 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 new file mode 100644 index 0000000..5e4db8a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/27 21:39 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EDI_PARSER_CONFIG") +@Api("EDI解析配置表") +public class MesEdiParserConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = 7225381299744633270L; + + @Column(name = "PARSER_CODE") + @ApiParam("解析配置代码") + private String parserCode; + + @Column(name = "PARSER_NAME") + @ApiParam("解析配置名称") + private String parserName; + + @Column(name = "PARSER_TYPE") + @ApiParam("解析程序集") + private String parserType; + + @Column(name = "GETTING_CODE") + @ApiParam("edi抓取程序代码") + private String gettingCode; + + @Column(name = "CURRENT_ORDER") + @ApiParam("当前订单号") + private String currentOrder; + + +} 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 new file mode 100644 index 0000000..d631542 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_CAUSE") +@Api("MES_设备故障原因") +public class MesEquFaultCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825283741375978L; + @Column(name = "FC_CODE") + @ApiParam("故障原因代码") + private String fcCode; + + @Column(name = "FC_NAME") + @ApiParam("故障原因描述") + private String fcName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} 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 new file mode 100644 index 0000000..2d65481 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_METHOD") +@Api("MES_设备故障处理措施") +public class MesEquFaultMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1366849727309967125L; + @Column(name = "FM_CODE") + @ApiParam("故障方法代码") + private String fmCode; + + @Column(name = "FM_NAME") + @ApiParam("故障方法描述") + private String fmName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} 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 new file mode 100644 index 0000000..44fcf64 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_PHENOMENON") +@Api("MES_设备故障现象") +public class MesEquFaultPhenomenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4373435091738791300L; + @Column(name = "FP_CODE") + @ApiParam("故障现象代码") + private String fpCode; + + @Column(name = "FP_NAME") + @ApiParam("故障现象描述") + private String fpName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} 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 15f8628..b33ac9b 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 @@ -81,6 +81,10 @@ public class MesEquipment extends BaseBean implements Serializable { @ApiParam("连接类型") private Integer connectType; + @Column(name = "CHECK_MODEL") + @ApiParam("作业校验模式") + private Integer checkModel; + @Column(name = "MEMO") @ApiParam("备注") private String memo; 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 9353299..38d4717 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 @@ -63,10 +63,26 @@ public class MesEquipmentTooling extends BaseBean implements Serializable { @ApiParam("更换结束时间") private String endTime; - @Transient - @ApiParam("最大次数") + @Column(name = "USE_COUNT_MAX") + @ApiParam("最大使用次数") private Integer useCountMax; + @Column(name = "REMIND_COUNT") + @ApiParam("提醒次数") + private Integer remindCount; + + @Transient + @ApiParam("按钮名称") + private String btnName; + + @Transient + @ApiParam("按钮颜色") + private String btnColor; + + @Transient + @ApiParam("按钮类别") + private String btnType; + public Integer getToolingType() { return this.toolingType == null ? 0 : this.toolingType; } 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 1234ffb..c20de53 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 @@ -62,6 +62,10 @@ public class MesEsop extends BaseBean implements Serializable { @ApiParam("文件id") private Long fileId; + @Column(name = "ESOP_URL") + @ApiParam("文件路径") + private String esopUrl; + @Transient @ApiParam("文件名称") private String fileName; @@ -90,4 +94,8 @@ public class MesEsop extends BaseBean implements Serializable { @ApiParam("同步标记") private Integer syncTag = 0; + @Transient + @ApiParam("过程条码") + private String serialNumber; + } 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 new file mode 100644 index 0000000..33b0024 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; +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\11\5 10:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EXTEND_OBJECT_CFG") +@Api("扩展对象结构") +public class MesExtendObjectCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6773040095905972250L; + + @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("扩展字段类型") + @AnnoOutputColumn(refClass = MesEnumUtil.DATA_FORMAT.class, refForeignKey = "value", value = "description") + private Integer fieldType; + + @Column(name = "FIELD_LENGTH") + @ApiParam("扩展字段长度") + private String fieldLength; + + @Column(name = "DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + @Column(name = "FIELD_DESC") + @ApiParam("扩展字段描述") + private String fieldDesc; +} 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 213bebc..a78fc9f 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 @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_CAUSE") -@Api("mes设备故障原因表") +@Api("mes故障原因表") public class MesFaultCause extends BaseBean implements Serializable { private static final long serialVersionUID = 1229825197241375978L; @@ -38,7 +38,8 @@ public class MesFaultCause extends BaseBean implements Serializable { @ApiParam("故障原因描述") private String fcName; - @Column(name = "PARENT_FC_CODE") - @ApiParam("父阶原因代码") - private String parentFcCode; + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 + @Column(name = "FC_TYPE") + @ApiParam("故障原因类型编码") + private String fcType; } 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 7cdfd96..4a0e758 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 @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_METHOD") -@Api("mes设备故障方法表") +@Api("MES_故障处理措施") public class MesFaultMethod extends BaseBean implements Serializable { private static final long serialVersionUID = -1366849757709967125L; @@ -38,7 +38,8 @@ public class MesFaultMethod extends BaseBean implements Serializable { @ApiParam("故障方法描述") private String fmName; - @Column(name = "PARENT_FM_CODE") - @ApiParam("父阶故障代码") - private String parentFmCode; + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 + @Column(name = "FM_TYPE") + @ApiParam("故障措施类型编码") + private String fmType; } 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 9c36828..d66b12b 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 @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_PHENOMENON") -@Api("mes设备故障现象表") +@Api("mes故障现象表") public class MesFaultPhenomenon extends BaseBean implements Serializable { private static final long serialVersionUID = 4373435095236791300L; @@ -38,15 +38,8 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable { @ApiParam("故障现象描述") private String fpName; - @Column(name = "PARENT_FP_CODE") - @ApiParam("父阶现象代码") - private String parentFpCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 @Column(name = "FP_TYPE") - @ApiParam("故障现象类型") - private Integer fpType; + @ApiParam("故障现象类型编码") + private String fpType; } 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 e3982b1..3bbe40e 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 @@ -44,4 +44,8 @@ public class MesFiCfg extends BaseBean implements Serializable { @Column(name = "FI_QTY") @ApiParam("首检数量") private Double fiQty; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; } 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 new file mode 100644 index 0000000..83e625f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.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 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/5/27 2:20 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_GUN_CALIBRATION_RECORD") +@Api("校枪记录表") +public class MesGunCalibrationRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6166370020956801528L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "GUN_CODE") + @ApiParam("枪号") + private String gunCode; + + @Column(name = "CUN_TYPE") + @ApiParam("扭矩枪类型") + private String cunType; + + @Column(name = "PSET_CODE") + @ApiParam("PSET号") + private String psetCode; + + @Column(name = "EXPECT_COUNT") + @ApiParam("设定枪数") + private Integer expectCount; + + @Column(name = "REAL_COUNT") + @ApiParam("实际枪叔") + private Integer realCount; + + @Column(name = "CALIBRATION_STATUS") + @ApiParam("校枪状态") + private Integer calibrationStatus; + + @Column(name = "START_TIME") + @ApiParam("开始校枪时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束校枪时间") + private String endTime; + + @Transient + @ApiParam("校枪状态名称") + private String calibrationStatusName; + + @Transient + @ApiParam("界面编号") + private String windowNo; +} 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 new file mode 100644 index 0000000..25b58db --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.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 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/7/3 5:06 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIT_ISSUE_CFG") +@Api("MES_客户JIT队列下达配置") +public class MesJitIssueCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1475207048628221791L; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "QTY") + @ApiParam("配置数量") + private Integer qty; + + @Column(name = "THRESHOLD_QTY") + @ApiParam("触发阈值") + private Integer thresholdQty; + + @Column(name = "CFG_TYPE") + @ApiParam("缓存类型") + private Integer cfgType; + + @Transient + @ApiParam("当前JIT缓存数") + private Integer currentJitCacheNum; + + @Transient + @ApiParam("其他工单数") + private Integer otherWorkNum = 0; +} 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 new file mode 100644 index 0000000..5f98f5e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:14 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIT_LOCK_CACHE") +@Api("MES_JIT队列锁定池") +public class MesJitLockCache extends BaseBean implements Serializable { + + private static final long serialVersionUID = -308930683558229105L; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "JIT_ACTUAL_NO") + @ApiParam("队列编号") + private String jitActualNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer woType; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} 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 new file mode 100644 index 0000000..d764ed1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:11 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIT_ORDER_CACHE") +@Api("MES_JIT队列订单池") +public class MesJitOrderCache extends BaseBean implements Serializable { + private static final long serialVersionUID = -613326904053045367L; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "JIT_ACTUAL_NO") + @ApiParam("队列编号") + private String jitActualNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer woType; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; +} 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 5dd8c97..752cdd2 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 @@ -55,6 +55,10 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("数据下限") private Double lowerLimit; + @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/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index f11ae4d..793f30f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -27,8 +27,8 @@ import java.util.List; @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean implements Serializable { - private static final long serialVersionUID = 5371856566557305323L; + private static final long serialVersionUID = -7758794366003399222L; @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; @@ -42,6 +42,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable { @ApiParam(value = "模板内容") private String templateContent; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + @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 5b17a07..36fb0a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 6476163540527157643L; + private static final long serialVersionUID = -6834031991151345038L; @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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 new file mode 100644 index 0000000..6a2d772 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +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) +@Table(name = "MES_LOOP_QC_GENERATE_DETAIL") +@Api("MES_巡检项生成明细") +public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "LASR_TIME") + @ApiParam("末次时间") + private String lasrTime; + + @ApiParam(value = "物料号") + @Transient + private String partNo; + + @ApiParam(value = "产线") + @Transient + private String workCenterCode; +} 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 new file mode 100644 index 0000000..224a78c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java @@ -0,0 +1,49 @@ +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:车型等级 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MODEL_GRADE") +@Api("MES_车型等级") +public class MesModelGrade extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412635747427364076L; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + + @Column(name = "GRADE_NAME") + @ApiParam("等级名称") + private String gradeName; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "GRADE_FLAG_VALUE") + @ApiParam("等级标识值") + private String gradeFlagValue; +} 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 new file mode 100644 index 0000000..34186bd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :MES_模具_零件对照表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MOULD_PART") +@Api("MES_模具_零件对照表") +public class MesMouldPart extends BaseBean implements Serializable { + private static final long serialVersionUID = -773118210589936438L; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "MOULD_CODE") + @ApiParam("模具代码") + private String mouldCode; +} 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 9f25f06..a63724c 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 @@ -58,6 +58,14 @@ public class MesObjectCfg extends BaseBean implements Serializable { @ApiParam("是否保存 1存 2不存") private Integer isSave; + @Column(name = "SHOW_SEQ") + @ApiParam("显示顺序") + private Integer showSeq; + + @Column(name = "IS_SHOW") + @ApiParam("是否显示") + private Integer isShow; + @Transient @ApiParam("是否存储名") private String isSaveName; 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 new file mode 100644 index 0000000..0fedc5b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -0,0 +1,130 @@ +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 javax.persistence.Transient; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 4:19 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OEE") +@Api("MES_OEE数据") +public class MesOee extends BaseBean implements Serializable { + + private static final long serialVersionUID = -9163026983140909748L; + + @Column(name = "OBJECT_CODE") + @ApiParam("运算对象代码") + private String objectCode; + + @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; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "OEE_DATE") + @ApiParam("日期") + private String oeeDate; + + @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 = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)") + @ApiParam("总生产时间") + private Double totalRunTime; + + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)") + @ApiParam("总停机时间") + private Double totalStopTime; + + @Column(name = "TOTAL_QTY") + @ApiParam("总生产数") + private Integer totalQty; + + @Column(name = "QUALIFIED_QTY") + @ApiParam("一次合格数") + private Integer qualifiedQty; + + @Column(name = "PLAN_TAKT") + @ApiParam("计划节拍") + private Integer planTakt; + + @Column(name = "ACTUAL_TAKT") + @ApiParam("实际节拍") + private Integer actualTakt; + + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)") + @ApiParam("时间开动率") + private Double timeRate; + + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)") + @ApiParam("性能开动率") + private Double taktRate; + + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)") + @ApiParam("良品率") + private Double qualifiedRate; + + @Column(name = "OEE", columnDefinition = "decimal(18,4)") + @ApiParam("OEE") + private Double oee; + + @Column(name = "BUSI_DATA") + @ApiParam("自定义数据") + private String busiData; + + @Transient + @ApiParam("开始日期") + private String oeeDateStart; + + @Transient + @ApiParam("结束日期") + private String oeeDateEnd; + + @Transient + @ApiParam("自定义数据map") + private List operateObjectAttributes; + + @Transient + @ApiParam("手工录入集合") + private List attributes; +} 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 new file mode 100644 index 0000000..bc7b401 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.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 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/22 11:03 上午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OFF_LINE_RECORD") +@Api("MES_产品下线记录") +public class MesOffLineRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2767323581134885752L; + + @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 = "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 = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "OFF_LINE_TIME") + @ApiParam("下线时间") + private String offLineTime; +} 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 new file mode 100644 index 0000000..99cc4bb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java @@ -0,0 +1,45 @@ +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: jokelin + * @Date: 2020/4/28 4:04 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OPERATE_OBJECT") +@Api("MES_运算对象") +public class MesOperateObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7829216855303543146L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "OPERATE_TYPE") + @ApiParam("运算类型") + private Integer operateType; + +} 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 new file mode 100644 index 0000000..9a340e4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.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 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/28 4:08 下午 + * @Modify:MES_OPERATE_OBJECT_CFG + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE") +@Api("MES_运算对象属性") +public class MesOperateObjectAttribute extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3916105499867386686L; + + @Column(name = "ATTRIBUTE_CODE") + @ApiParam("属性代码") + private String attributeCode; + + @Column(name = "ATTRIBUTE_NAME") + @ApiParam("属性名称") + private String attributeName; + + @Column(name = "ATTRIBUTE_TYPE") + @ApiParam("属性类型") + private Integer attributeType; + + @Column(name = "OPERATE_TYPE") + @ApiParam("运算类型") + private Integer operateType; + + @Transient + @ApiParam("属性值") + private String attributeValue; +} 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 new file mode 100644 index 0000000..a70cac7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.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 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/28 4:12 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OPERATE_OBJECT_CFG") +@Api("MES_运算对象属性配置") +public class MesOperateObjectCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8066603810736365082L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "ATTRIBUTE_CODE") + @ApiParam("属性代码") + private String attributeCode; + + @Column(name = "VALUE_TYPE") + @ApiParam("赋值类型") + private String valueType; + + @Column(name = "METHOD_CODE") + @ApiParam("函数方法") + private String methodCode; + + @Column(name = "JOB_ID") + @ApiParam("job编号") + private String jobId; + + @Column(name = "SPEL_CONTENT") + @ApiParam("spel表达式") + private String spelContent; + + @Column(name = "SEQ") + @ApiParam("运算顺序") + private Integer seq; + + @Transient + @ApiParam("属性名称") + private String attributeName; + + @Transient + @ApiParam("属性类型") + private Integer attributeType; +} 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 1880189..dac14a4 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 @@ -43,7 +43,7 @@ public class MesPackSpec extends BaseBean implements Serializable { @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "包装数量", example = "0") - private Double qty; + private Double qty = 0d; @Column(name = "QTY2") @ColumnDefault("0") 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 b573418..a46c53d 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 @@ -110,6 +110,24 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("容器编号") private String ctNo; + @Column(name = "SAMPLE_TYPE") + @ApiParam("条码类型") + private String sampleType = "10"; + + @Transient + @ApiParam("客户发往地") + private String custDeliveryLocation; + + // 赋值模板代码 + @Column(name = "PACKAGE_LABEL_TEMPLATE") + @ApiParam("包装标签模板") + private String packageLabelTemplate; + + // 二维码 + @Column(name = "QR_CODE") + @ApiParam("包装二维码") + private String qrCode; + public MesPackage() { } 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 011f6f5..817a07c 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 @@ -48,6 +48,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("零件规格") private String partSpec; + @Column(name = "PART_SPEC_QTY") + @ApiParam("标准包规数量") + private Double partSpecQty; + @Column(name = "CATEGORY_CODE1") @ApiParam("分类1") private String categoryCode1; @@ -88,10 +92,34 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("产品编码匹配类型") private Integer productMatchType; - @Column(name = "产品生产类型") - @ApiParam("产品类型名称") + @Column(name = "PPT_CODE") + @ApiParam("产品类型代码") private String pptCode; + @Column(name = "PART_TRAIT") + @ApiParam("物料特性") + private Integer partTrait; + + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "SHELVES_AMOUNT") + @ApiParam("挂架数") + private Integer shelvesAmount; + + @Column(name = "QUANTITY_PER_RACK") + @ApiParam("挂架可放零件数") + private Integer quantityPerRack; + + @Column(name = "PAINT_TANK_CODE") + @ApiParam("供漆罐代码") + private String paintTankCode; + + @Column(name = "PRE_PART_NO") + @ApiParam("打磨件物料号") + private String prePartNo; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; 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 7fbe7f7..8cbe1c3 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -56,4 +57,15 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("校验表达式描述") private String recordNumDesc; + @Transient + @ApiParam("复核结果") + private Integer reviewResult = 1; + + @Transient + @ApiParam("对象名称") + private String objectCodeName; + + @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/MesPartColor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java new file mode 100644 index 0000000..578b4c6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description:产品颜色 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_COLOR") +@Api("MES_产品颜色") +public class MesPartColor extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412632727837364076L; + + @Column(name = "COLOR_TYPE") + @ApiParam("类型") + private Integer colorType; + + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "COLOR_NAME") + @ApiParam("颜色名称") + private String colorName; + + @Column(name = "IF_COLOR_CODE") + @ApiParam("接口颜色代码") + private String ifColorCode; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; +} 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 63b5871..87bcffe 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 @@ -38,6 +38,14 @@ public class MesPartFormula extends BaseBean implements Serializable { @ApiParam("配方内容") private String formulaContent; + @Column(name = "FORMULA_DESC") + @ApiParam("配方描述") + private String formulaDesc; + + @Column(name = "QTY") + @ApiParam("配方零件总数") + private Integer qty; + @Column(name = "FORMULA_TYPE") @ApiParam("配方类型") private Integer formulaType; 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 new file mode 100644 index 0000000..c5c1b75 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.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 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 +@Table(name = "MES_PART_PROD_CFG_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("MES_物料项目关系") +public class MesPartProdCfgType extends BaseBean implements Serializable { + private static final long serialVersionUID = -640972198237355570L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; +} 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 new file mode 100644 index 0000000..4b756ee --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_SAMPLE") +@Api("产品样本配置") +public class MesPartSample extends BaseBean implements Serializable { + private static final long serialVersionUID = -9190123981329081945L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + +} 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 new file mode 100644 index 0000000..2d24638 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/12 5:53 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_STOCK_SCHEDULE") +@Api("MES_库存排程配置") +public class MesPartStockSchedule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8265586624645977526L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "MIN_CAPACITY") + @ApiParam("最小库存") + private Integer minCapacity; + + @Column(name = "TOTAL_CAPACITY") + @ApiParam("总容量") + private Integer totalCapacity; + + @Column(name = "STANDARD_CAPACITY") + @ApiParam("标准值") + private Integer standardCapacity; + + @Column(name = "SCHEDULE_CAPACITY") + @ApiParam("待生产箱数") + private Integer scheduleCapacity; + + @Column(name = "PLAN_QTY") + @ApiParam("产品JSP个数") + private Integer planQty; + + @Column(name = "TOTAL_PLAN_QTY") + @ApiParam("JSP总数") + private Integer totalPlanQty; +} 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 new file mode 100644 index 0000000..c738fc7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.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.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-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLAN_TAKT") +@Api("MES_生产节拍") +public class MesPartTakt extends BaseBean implements Serializable { + private static final long serialVersionUID = -7731182105899332278L; + + @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 = "PLAN_TAKT") + @ApiParam("节拍") + private Integer planTakt; +} 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 ef7ae49..627f7c1 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 @@ -61,8 +61,8 @@ public class MesPatternJis extends BaseBean implements Serializable { private Integer patternType; @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "MATCH_RULE") + @ApiParam("匹配规则") + private String matchRule; } 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 94a4da7..2385ff4 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 @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class MesPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = 2756240593256441951L; + private static final long serialVersionUID = 2756240593256441951L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; 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 dc26568..b5d583b 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 @@ -31,8 +31,7 @@ import java.io.Serializable; @Table(name = "MES_PCN_SYS_USER_OFFLINE") @Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class MesPcnSysUserOffline extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7617353154826718154L; + private static final long serialVersionUID = -7483799830588482021L; @Column(name = "USER_ID") @ApiParam(value = "人员ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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 83f9049..f22f371 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 @@ -11,6 +11,7 @@ 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; 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 d483cd6..a9d885f 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 @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PCN_TASK_LOG") @Api("mes-pcn定时任务工作清单同步记录") public class MesPcnTaskLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -784806389462540310L; + private static final long serialVersionUID = 1175730596573636224L; @Column(name = "SYNC_TIME_START") @ApiParam("同步数据开始时间") private String syncTimeStart; 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 4c9c79d..4e09969 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 @@ -2,6 +2,7 @@ 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; @@ -53,6 +54,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("通道") private String channel; + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + @Column(name = "TAG_NAME") @ApiParam("标签名称") private String tagName; @@ -69,14 +74,26 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("分组名称") private String groupName; - @Column(name = "DEVICE") - @ApiParam("驱动") - private String device; + @Column(name = "ANALYSIS_RULE") + @ApiParam("解析规则") + private String analysisRule; + + @Column(name = "IS_ANALYSIS") + @ApiParam("是否解析") + private String isAnalysis; + + @Column(name = "PLC_CFG") + @ApiParam("PLC配置") + private String plcCfg; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; + @Column(name = "WORK_CENTER_CODE") @ApiParam("生产线") private String workCenterCode; @@ -85,18 +102,6 @@ public class MesPlc extends BaseBean implements Serializable { @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; @@ -113,6 +118,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("空间索引") private Integer nameSpaceIndex = 2; + @Column(name = "PLC_TYPE") + @ApiParam("PLC类型") + private Integer plcType; + @Column(name = "USER_NAME") @ApiParam("用户名") private String userName; @@ -121,17 +130,25 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("密码") private String password; + @Column(name = "DEFAULT_RULE") + @ApiParam("默认赋值属性") + private String defaultRule; + + @Column(name = "DATA_DIRECT") + @ApiParam("数据方向 10 plc->mes 20 mes->plc 30共用地址") + private Integer dataDirect; + + @Column(name = "CALLBACK_METHOD") + @ApiParam("回调方法名称") + private String callbackMethod; + @Transient @ApiParam("设备名称") private String equipmentName; @Transient @ApiParam("OPC值") - private String opcValue; - - @Column(name = "TOOLING_CODE ") - @ApiParam("工装代码") - private String toolingCode; + private List opcValue; @Transient 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 bc05708..661059a 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 @@ -11,6 +11,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; /** @@ -37,4 +38,16 @@ public class MesProcess extends BaseBean implements Serializable { @Column(name = "PROCESS_NAME") @ApiParam("工序名称") private String processName; + + @Transient + @ApiParam("生产线代码") + private String workCenterCode; + + @Transient + @ApiParam("工位代码") + private String workCellCode; + + @Transient + @ApiParam("流程代码") + private String routeCode; } 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 61a2dc8..94ceddd 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 @@ -28,6 +28,7 @@ import java.io.Serializable; @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "KP_SN"), @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME"), @Index(columnList = "ITEM_PART_NO") }) @Api("产品绑定记录表") @@ -100,18 +101,30 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam(value = "动作类型") private Integer actionType; + @Transient @ApiParam(value = "是否绑定关键件名称") private String isBindKeyName; + @Transient @ApiParam(value = "动作类型名称") private String actionTypeName; + @Transient @ApiParam("产品条码零件名称") private String partName; + @Column(name = "ITEM_PART_NAME") @ApiParam("原材料零件名称") private String itemPartName; + @Transient + @ApiParam("生产队列号") + private String orderNo; + + @Transient + @ApiParam("产品条码") + private String productSn; + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; 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 42b3801..419799b 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 @@ -27,14 +27,14 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG_TYPE") -@Api("产品配置类型") +@Api("项目") public class MesProdCfgType extends BaseBean implements Serializable { private static final long serialVersionUID = -1726288926948811617L; @Column(name = "PROD_CFG_TYPE_CODE") - @ApiParam("产品配置类型代码") + @ApiParam("项目代码") private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") - @ApiParam("产品配置类型名称") + @ApiParam("项目名称") private String prodCfgTypeName; } 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 new file mode 100644 index 0000000..5bcc4c8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java @@ -0,0 +1,93 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description:产品车型配置 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 15:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_MODEL_CFG") +@Api("MES_产品车型配置") +public class MesProdModelCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5227132727837364076L; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "PART_NO") + @ApiParam("总成零件号") + private String partNo; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam("客户零件号") + private String customerPartNo; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + + @Column(name = "MODEL_FLAG_VALUE") + @ApiParam("车型标志值") + private String modelFlagValue; + + @Column(name = "MODEL_CFG_FLAG_VALUE") + @ApiParam("车型配置标志值") + private String modelCfgFlagValue; + + @Column(name = "QC_FLAG_VALUE") + @ApiParam("质量标志值") + private String qcFlagValue; + + @Column(name = "LABEL_DESC") + @ApiParam("条码标签描述") + private String labelDesc; + + @Column(name = "CCC_CODE") + @ApiParam("3C认证编码") + private String cccCode; + + @Column(name = "PROCESS_LABEL_TEMPLATE") + @ApiParam("过程标签模板") + private String processLabelTemplate; + + @Transient + @ApiParam("产品颜色") + private String produceColor; + + @Transient + @ApiParam("Vin") + private String vinCode; +} 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 80fd5fd..e632e1e 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 @@ -41,6 +41,10 @@ public class MesProdPack extends BaseBean implements Serializable { @ApiParam("包装规格") private String packSpec; + @Column(name = "PROCESS_LABEL_TEMPLATE") + @ApiParam("过程标签模板") + private String processLabelTemplate; + @Column(name = "PROD_LABEL_TEMPLATE") @ApiParam("产品标签模板") private String prodLabelTemplate; @@ -64,4 +68,8 @@ public class MesProdPack extends BaseBean implements Serializable { @Column(name = "PROD_CFG_TYPE") @ApiParam("项目") private String prodCfgType; + + @Column(name = "CUST_LABEL_TEMPLATE") + @ApiParam("客户标签模板") + private String custLabelTemplate; } 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 c0d1436..3bfe3b7 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 @@ -78,6 +78,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("是否执行 1=是 2=否") private Integer isActive; + @Column(name = "STEP_DISPLAY_NAME") + @ApiParam("工步展示名称") + private String stepDisplayName; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") 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 73fae24..0ccadd4 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 @@ -29,6 +29,7 @@ import java.math.BigDecimal; @Api("散件产品配置明细") public class MesProdScatterCfgBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -6413857842993992190L; @Column(name = "SP_CFG_CODE") @ApiParam("散件配置编码") private String spCfgCode; 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 new file mode 100644 index 0000000..c4eae0c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :产品工作中心配置 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_WORK_CENTER") +@Api("产品工作中心配置") +public class MesProdWorkCenter extends BaseBean implements Serializable { + + private static final long serialVersionUID = 9215737252535074536L; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "IS_DEFAULT") + @ApiParam("是否默认") + private Integer isDefault; + + @Column(name = "PART_SN") + @ApiParam("料箱条码") + private String partSn; +} 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 fdf53da..853652c 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 @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CATEGORY") -@Api("系统业务动作") +@Api("MES_产品位置") public class MesProduceCategory extends BaseBean implements Serializable { private static final long serialVersionUID = -992595557921651448L; @@ -37,4 +37,8 @@ public class MesProduceCategory extends BaseBean implements Serializable { @Column(name = "PRODUCE_CTGY_NAME") @ApiParam("产品类型名称") private String produceCategoryName; + + @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/MesProduceErrorRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java new file mode 100644 index 0000000..51f3b81 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @author Wynne.Lu + * @date 2020/5/28 14:32 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_ERROR_RECORD") +@Api("生产异常操作记录") +public class MesProduceErrorRecord extends BaseBean { + private static final long serialVersionUID = 209753108845613052L; + + @Column(name = "ERROR_TYPE") + @ApiParam("异常类型 10:工序跳过 20:工步跳过 40:扣料异常") + private Integer errorType; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位代码") + private String workCellCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态点代码") + private String statusCode; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常内容") + private String errorMessage; + +} 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 7bf1165..7fead57 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 @@ -123,6 +123,7 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; + @Column(name = "TRAY_NO") @ApiParam("托盘号") private String trayNo; @@ -131,6 +132,22 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("操作类型") private Integer operateType; + @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; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") @@ -164,6 +181,15 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型名称") private String snTypeName; + @Transient + @ApiParam("条码打印状态名称") + private String printStatusName; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + public MesProduceSn() { } 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 0bc3879..1b6ee58 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 @@ -80,6 +80,26 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("检测项类型") private String checkItemType; + @Column(name = "CHECK_INTERVAL") + @ApiParam("间隔时间") + private Integer checkInterval = 0; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private Integer isConcession = 0; + + @Column(name = "NUMBER_FLAG") + @ApiParam("数量标识") + private String numberFlag; + + @Column(name = "MAXIMUM") + @ApiParam("最大数") + private Double maximum = 0d; + + @Column(name = "MINIMUM") + @ApiParam("最小数") + private Double minimum = 0d; + @Transient @ApiParam("检测类型名称") private String checkTypeName; @@ -91,6 +111,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @Transient private List childQcList; + @Transient + @ApiParam("备注") + private String memo; + 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 new file mode 100644 index 0000000..925d075 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -0,0 +1,131 @@ +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 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) +@Table(name = "MES_QC_ORDER") +@Api("MES_检验单") +public class MesQcOrder extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "FINISH_QTY") + @ApiParam("已检数量") + private Double finishQty = 0D; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0D; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuid; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CHECK_REULST") + @ApiParam("检测整体结果") + private Integer checkReulst = 0; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "DELIVERY_DATE") + @ApiParam("发运时间") + private String deliveryDate; + + @Column(name = "CUST_DELIERY_LOCATION") + @ApiParam("客户发运地") + private String custDelieryLocation; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @ApiParam(value = "检测结果") + @Transient + private String reulstStatus; + + @ApiParam(value = "产品条码") + @Transient + private String serialNumber; + + @ApiParam(value = "工单号") + @Transient + private String mesWorkNo; + + @Transient + @ApiParam("产品条码") + private String productSn; + + @Transient + @ApiParam("本批次生产总数") + private Double locSrcLotNoQty; + +} 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 new file mode 100644 index 0000000..4e3ceb7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java @@ -0,0 +1,49 @@ +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: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER_ACCESSORY") +@Api("MES_检验单附件") +public class MesQcOrderAccessory extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2648132773643541110L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "ACCESSORY_NAME") + @ApiParam("附件名称") + private String accessoryName; + + @Column(name = "ACCESSORY_URL") + @ApiParam("附件路径") + private String accessoryUrl; + + @Column(name = "FASTDFS_URL") + @ApiParam("fastDfs地址") + private String fastdfsUrl; +} 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 new file mode 100644 index 0000000..c78132b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -0,0 +1,98 @@ +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 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) +@Table(name = "MES_QC_ORDER_DETAIL") +@Api("MES_检验单明细") +public class MesQcOrderDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @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 = 0; + + @Column(name = "CHECK_REULST") + @ApiParam("判定结果") + private Integer checkReulst = 0; + + @Column(name = "ITEM_NO") + @ApiParam("检验行号") + private Integer itemNo = 0; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + + @ApiParam(value = "已完成数量") + @Transient + private Integer finishQty = 0; + + @ApiParam(value = "检测项类型名称") + @Transient + private String businessTypeName; + + @Column(name = "MAXIMUM") + @ApiParam("最大数") + private Double maximum = 0d; + + @Column(name = "MINIMUM") + @ApiParam("最小数") + private Double minimum = 0d; +} 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 a459fb4..1c1795f 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 @@ -11,6 +11,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; /** @@ -46,4 +47,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable { @Column(name = "CNT_QTY") @ApiParam("累计数") private Integer cntQty; + + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; } 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 c9e3f4f..dd39bd2 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 @@ -14,7 +14,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description :MES_QUEUE_GROUP_COUNT + * @Description : * @Reference : * @Author : joke * @CreateDate : 2020-03-06 10:16 上午 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 84375d0..47cd239 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 @@ -4,8 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,12 +27,13 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_JIT_ACTUAL") +@NoArgsConstructor +@AllArgsConstructor +@Builder @Api("MES_客户JIT生产队列") public class MesQueueJitActual extends BaseBean implements Serializable { - private static final long serialVersionUID = 655875369308810110L; - @Column(name = "JIS_ACTUAL_NO") @ApiParam("队列编号") private String jisActualNo; @@ -52,7 +52,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("排序号") - private Double seq; + private String seq; @Column(name = "STATUS") @ApiParam("状态") @@ -71,7 +71,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { private String custCode; @Column(name = "CUST_PLANT_CODE") - @ApiParam("客户产线代码") + @ApiParam("客户工厂代码") private String custPlantCode; @Column(name = "MEMO") @@ -82,6 +82,54 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("生产组代码") private String pgCode; + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SUPPLIER_NAME") + @ApiParam("供应商名称") + private String supplierName; + + @Column(name = "VEHICLE_CODE") + @ApiParam("车型代码") + private String vehicleCode; + + @Column(name = "VEHICLE_NAME") + @ApiParam("车型名称") + private String vehicleName; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "CAR_MODEL_CODE") + @ApiParam("车系编号") + private String carModelCode; + + @Column(name = "CAR_SERIES") + @ApiParam("车系名称") + private String carSeries; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "IS_LOCK") + @ApiParam("锁定标识") + private Integer isLock; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer woType; + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; 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 new file mode 100644 index 0000000..cde084a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.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.*; +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 + * @CreateDate : 2020-03-06 10:01 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@AllArgsConstructor +@Builder +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM") +@Api("客户JIT生产队列散件清单") +public class MesQueueJitActualBom extends BaseBean implements Serializable { + private static final long serialVersionUID = 1604529847020812472L; + + @Column(name = "JIS_ACTUAL_NO") + @ApiParam("队列编号") + private String jisActualNo; + + @Column(name = "ASSY_NO") + @ApiParam("组件编号") + private String assyNo; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("用量") + private Double qty = 0d; + + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; + + @Column(name = "PART_COLOR_VALUE") + @ApiParam("零件色值") + private String partColorValue; +} 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 654cc56..1d1c468 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 @@ -3,8 +3,7 @@ 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 lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -26,12 +25,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL") @Api("MES_客户JIT生产队列明细") public class MesQueueJitActualDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 1442091799346314190L; - + private static final long serialVersionUID = 3211496242571643906L; @Column(name = "JIS_ACTUAL_NO") @ApiParam("队列编号") private String jisActualNo; @@ -48,6 +49,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("产品位置代码") private String produceCtgyCode; + @Column(name = "PRODUCE_CTGY_Name") + @ApiParam("产品位置名称") + private String produceCtgyName; + @Transient @ApiParam("产品位置") private String prodCfgName; @@ -68,11 +73,31 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; - @Column(name = "status") + @Column(name = "STATUS") @ApiParam("状态") private Integer status; - @Column(name = "seq") + @Column(name = "SEQ") @ApiParam("主序编号") private String seq; + + @Column(name = "PRODUCE_COLOR") + @ApiParam("产品颜色") + private String produceColor; + + @Column(name = "OPTION_CODE") + @ApiParam("选项代码") + private String optionCode; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + + @Column(name = "ASSY_NO") + @ApiParam("组件编号") + private String assyNo; + + @Transient + @ApiParam("工单类型") + private Integer woType; } 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 d982dab..b55af50 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 @@ -10,7 +10,9 @@ 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.io.Serializable; /** @@ -53,7 +55,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("计划排序号") - private String seq; + private Double seq; @Column(name = "STATUS") @ApiParam("状态") @@ -74,4 +76,44 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "VERSION") @ApiParam("版本号") private String version; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商编号") + private String supplierCode; + + @Column(name = "SUPPLIER_NAME") + @ApiParam("供应商名称") + private String supplierName; + + @Column(name = "FILE_NAME") + @ApiParam("解析文件名") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("解析文件路径") + private String fileUrl; + + @Column(name = "WORK_ORDER_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Transient + @ApiParam("计划上线开始时间") + private String planStartDate; + + @Transient + @ApiParam("计划上线结束时间") + private String planEndDate; } 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 1d9faad..5177ba9 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 @@ -35,13 +35,17 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @ApiParam("队列编号") private String jisPlanNo; + @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 = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; @Column(name = "DOCK_NO") @ApiParam("道口") 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 7111b75..d290454 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 @@ -44,6 +44,18 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { private String partNo; @Column(name = "PART_NAME") - @ApiParam("产品名称") + @ApiParam("物料名称") private String partName; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; } 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 3e4272d..bd996b0 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 @@ -92,6 +92,26 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("生产组代码") private String pgCode; + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + + @Column(name = "JIT_ACTUAL_NO") + @ApiParam("客户JIT队列编号") + private String jitActualNo; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + @Transient @ApiParam("起始车号") private String custFlagNoStart; @@ -112,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("队列类型名称") private String queueTypeName; + @Transient + @ApiParam("产品颜色") + private String colorName; + public int getStatusVal() { return this.status == null ? 0 : this.status; } 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 new file mode 100644 index 0000000..5a00f18 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.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 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: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_ORDER_BOM") +@Api("MES_生产队列散件清单") +public class MesQueueOrderBom extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("主队列编号") + private String orderNo; + + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + + @Column(name = "ASSY_NO") + @ApiParam("组件编号") + private String assyNo; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("用量") + private Double qty = 0d; + + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "OPTION_TYPE") + @ApiParam("选配类型") + private Integer optionType; +} 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 1fe5536..96d6044 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 @@ -65,11 +65,11 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { private String workType; @Column(name = "PRODUCE_CATEGORY_CODE") - @ApiParam("产品类型代码") + @ApiParam("产品位置") private String produceCategoryCode; @Column(name = "PRODUCE_CATEGORY_NAME_RDD") - @ApiParam("产品类型名称") + @ApiParam("产品位置名称") private String produceCategoryNameRdd; @Column(name = "PPT_CODE") @@ -86,7 +86,27 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @Column(name = "IS_GROUP_PRINTED") @ApiParam("料架是否已打印") - private Integer isGroupPrinted; + 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; @Transient @ApiParam("队列序号") @@ -96,6 +116,70 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("已生产数量") private Double finsihQty; + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; + + @Transient + @ApiParam("Vin") + private String vinCode; + + @Transient + @ApiParam("条码状态") + private Integer snStatus; + + @Transient + @ApiParam("开始时间") + private String startTime; + + @Transient + @ApiParam("结束时间") + private String endTime; + + @Transient + @ApiParam("过程标签模板") + private String processLabelTemplate; + + @Transient + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Transient + @ApiParam("等级代码") + private String gradeCode; + + @Transient + @ApiParam("标志值集合") + private String flagValueList; + + @Transient + @ApiParam("质量标志值") + private String qcFlagValue; + + @Transient + @ApiParam("3C认证编码") + private String cccCode; + + @Transient + @ApiParam("条码标签描述") + private String labelDesc; + + @Transient + @ApiParam("打印时间") + private String printTime; + + @Transient + @ApiParam("年度型") + private String modelYear; + + @Transient + @ApiParam("主队列状态") + private Integer masterStatus; + + @Transient + @ApiParam("产品条码") + private String productSn; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } @@ -120,4 +204,25 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.seq = seq; this.serialNumber = serialNumber; } + + 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) { + this.orderNo = orderNo; + this.vinCode = vinCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.status = status; + this.serialNumber = serialNumber; + this.seq = seq; + this.isGroupPrinted = isGroupPrinted; + this.createDatetime = createDatetime; + this.processLabelTemplate = processLabelTemplate; + this.prodLabelTemplate = prodLabelTemplate; + this.optionCode = optionCode; + this.produceColor = produceColor; + this.gradeCode = gradeCode; + this.assyNo = assyNo; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java similarity index 71% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java index 45dcf3d..bc23151 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -43,6 +43,10 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("vin") private String vinCode; + @Column(name = "CAR_NO") + @ApiParam("车号") + private String carNo; + @Column(name = "CUST_FLAG_NO") @ApiParam("客户标识号") private String custFlagNo; @@ -63,4 +67,23 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("客户产线代码") private String custPlantCode; + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + + @Column(name = "JIT_ACTUAL_NO") + @ApiParam("客户JIT队列编号") + private String jitActualNo; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java similarity index 88% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index 2e83143..6f0005e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -70,4 +70,12 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable { @Column(name = "qty") @ApiParam("数量") private Double qty; + + @Column(name = "SEQ") + @ApiParam("队列明细序号") + private Double seq; + + @Column(name = "PRODUCE_COLOR") + @ApiParam("产品颜色") + private String produceColor; } 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 bea56af..a0a107d 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 @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -47,4 +44,8 @@ public class MesRoute extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + + @Transient + @ApiParam("生产线") + private String workCenterCode; } 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 7eab5e8..5a75ba4 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 @@ -58,6 +58,10 @@ public class MesRouteProcessStep extends BaseBean implements Serializable { @ApiParam("工步参数值") private String paramValue; + @Column(name = "STEP_DISPLAY_NAME") + @ApiParam("工步展示名称") + private String stepDisplayName; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") 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 new file mode 100644 index 0000000..7642f27 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java @@ -0,0 +1,88 @@ +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; + +/** + * @author adair.song + * @date 2020/06/17 13:12 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "MES_SCATTER_BOM_CFG") +@EqualsAndHashCode(callSuper = true) +@Api("MES_散件BOM配置") +public class MesScatterBomCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 521506217898252289L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam("客户零件号") + private String customerPartNo; + + @Column(name = "PART_LOCATION1") + @ApiParam("产品位置1") + private String partLocation1; + + @Column(name = "PART_LOCATION2") + @ApiParam("产品位置2") + private String partLocation2; + + @Column(name = "PART_LOCATION3") + @ApiParam("产品位置3") + private String partLocation3; + + @Column(name = "PART_LOCATION4") + @ApiParam("产品位置4") + private String partLocation4; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "CATEGORY_CODE2") + @ApiParam("类型2") + private String categoryCode2; + + @Column(name = "CATEGORY_CODE3") + @ApiParam("类型3") + private String categoryCode3; + + @Column(name = "IS_BIND_KEY") + @ApiParam("是否关键件") + private Integer isBindKey = 1; + + @Column(name = "CHECK_GROUP") + @ApiParam("校验分组号") + private String checkGroup; + + @Column(name = "OPTION_CODE") + @ApiParam("选项代码") + private String optionCode; + + @Column(name = "RECIPE_ITEM") + @ApiParam("配方项") + private String recipeItem; + + @Column(name = "RECIPE_SEQ") + @ApiParam("配方序号") + private String recipeSeq; +} 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 cb0457f..44a5022 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 @@ -29,6 +29,7 @@ import java.math.BigDecimal; @Api("MES_散件配置报文关系") public class MesScatterCfgDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 1633467451954028328L; @Column(name = "SP_CFG_CODE") @ApiParam("散件配置编码") private String spCfgCode; 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 new file mode 100644 index 0000000..fd2e7c3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java @@ -0,0 +1,75 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description:车型散件配置清单 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCATTER_PART_CFG_BOM") +@Api("MES_车型散件配置清单") +public class MesScatterPartCfgBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412635772834364076L; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name = "PART_FLAG_LOCATION") + @ApiParam("零件标志位") + private Integer partFlagLocation; + + @Column(name = "PART_FLAG_VALUE") + @ApiParam("零件标志值") + private String partFlagValue; + + @Column(name = "QTY", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam(value = "用量", example = "0") + public Double qty; + + @Column(name = "OPTION_TYPE") + @ApiParam("选配类型") + private Integer optionType; +} 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 new file mode 100644 index 0000000..1144a04 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -0,0 +1,176 @@ +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:散件零件生产配置 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCATTER_PART_PROD_CFG") +@Api("MES_散件零件生产配置") +public class MesScatterPartProdCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412632727837782394L; + + @Column(name = "CFG_ID") + @ApiParam("配置编号") + private String cfgId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MODEL_FLAG_VALUE") + @ApiParam("车型标志值") + private String modelFalgValue; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "PART_FLAG_LOCATION") + @ApiParam("标志位") + private Integer partFlagLocation; + + @Column(name = "PART_FLAG_VALUE") + @ApiParam("标志值") + private String partFlagValue; + + @Column(name = "POKE_YOKE_FIX") + @ApiParam("防错码") + private String pokeYokeFix; + + @Column(name = "POKE_YOKE_FROM") + @ApiParam("防错码开始位") + private Integer pokeYokeFrom; + + @Column(name = "POKE_YOKE_END") + @ApiParam("防错码结束位") + private Integer pokeYokeEnd; + + @Column(name = "POKE_YOKE_LENGTH") + @ApiParam("防错码长度") + private Integer pokeYokeLength; + + @Column(name = "PSET1") + @ApiParam("PSET1") + private String pset1; + + @Column(name = "PSET2") + @ApiParam("PSET2") + private String pset2; + + @Column(name = "PSET3") + @ApiParam("PSET3") + private String pset3; + + @Column(name = "PSET4") + @ApiParam("PSET4") + private String pset4; + + @Column(name = "PSET5") + @ApiParam("PSET5") + private String pset5; + + @Column(name = "PSET6") + @ApiParam("PSET6") + private String pset6; + + @Column(name = "PSET7") + @ApiParam("PSET7") + private String pset7; + + @Column(name = "PSET8") + @ApiParam("PSET8") + private String pset8; + + @Column(name = "TORQUE_NO") + @ApiParam("扭矩枪编号") + private String torqueNo; + + @Column(name = "IS_PF") + @ApiParam("是否大枪") + private Integer isPf; + + @Column(name = "POKE_TYKE_SEQ") + @ApiParam("防错顺序") + private Integer pokeTypeSeq; + + @Column(name = "EFF_START_TIME") + @ApiParam("有效起始日期") + private String effStartTime; + + @Column(name = "EFF_END_TIME") + @ApiParam("有效截至日期") + private String effEndTime; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "CHECK_SCAN_COUNT") + @ApiParam("确认扫描次数") + private Integer checkScanCount; + + @Column(name = "SEND_SEQ") + @ApiParam("组合码发送顺序") + private Integer sendSeq; + + @Column(name = "YELLOW_GUN_RULE") + @ApiParam("黄枪规则") + private Integer yellowGunRule; + + @Column(name = "IS_END_SEQ") + @ApiParam("是否截至顺序号") + private Integer isEndSeq; + + @Column(name = "MULTIMEDIA_PLUG_QTY") + @ApiParam("多媒体插头数量") + private Double multimediaPlusQty; + + @Column(name = "QUALIFIED_COUNT") + @ApiParam("应收合格数") + private Double qualifiedCount; + + @Column(name = "IS_CHECK") + @ApiParam("是否复核校验") + private Integer isCheck; +} 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 bb4cb77..8263d3e 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 @@ -65,6 +65,14 @@ public class MesScrapRecord extends BaseBean implements Serializable { @ApiParam("工位") private String workCellCode; + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单编号") + private String workOrderNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + @Column(name = "MEMO") @ApiParam("备注") private String memo; 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 new file mode 100644 index 0000000..945aa56 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.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.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/28 4:58 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRIPT_PERSISTENCE") +@Api("动态脚本") +public class MesScriptPersistence extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1941422535481564572L; + + @Column(name = "SCRIPT_NO") + @ApiParam("脚本编号") + private String scriptNo; + + @Column(name = "SCRIPT_NAME") + @ApiParam("脚本名称") + private String scriptName; + + @Column(name = "SCRIPT_REMARK") + @ApiParam("脚本描述") + private String scriptRemark; + + @Column(name = "SCRIPT_TYPE") + @ApiParam("脚本类型") + private Integer scriptType; + + @Column(name = "LANGUAGE_TYPE") + @ApiParam("语言类型") + private Integer languageType; + + @Column(name = "SCRIPT_CONTENT") + @ApiParam("脚本内容") + private String scriptContent; +} 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 new file mode 100644 index 0000000..0403694 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java @@ -0,0 +1,40 @@ +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: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT_CLASS") +@Api("MES_班制表") +public class MesShiftClass extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222874834741345978L; + @Column(name = "SHIFT_CLASS_CODE") + @ApiParam("班制代码") + private String shiftClassCode; + + @Column(name = "SHIFT_CLASS_NAME") + @ApiParam("班制名称") + private String shiftClassName; +} 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 new file mode 100644 index 0000000..bd588d7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.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 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: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT_CLASS_DETAIL") +@Api("MES_班制班次表") +public class MesShiftClassDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222874274741347278L; + @Column(name = "SHIFT_CLASS_CODE") + @ApiParam("班制代码") + private String shiftClassCode; + + @Column(name = "SHIFT_CLASS_NAME") + @ApiParam("班制名称") + private String shiftClassName; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Transient + @ApiParam("开始-结束日期") + private String startEndTime; +} 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 new file mode 100644 index 0000000..d22f305 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java @@ -0,0 +1,40 @@ +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: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SKILLS") +@Api("MES_技能表") +public class MesSkills extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825214741345978L; + @Column(name = "SKILL_CODE") + @ApiParam("技能代码") + private String skillCode; + + @Column(name = "SKILL_NAME") + @ApiParam("技能名称") + private String skillName; +} 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 1672c91..63d6212 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 @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_STATE_MACHINE") @Api("MES状态机") public class MesStateMachine extends BaseBean implements Serializable { - private static final long serialVersionUID = 6093522587973076640L; + private static final long serialVersionUID = 4532746282478232478L; @Column(name = "SM_CODE") @ApiParam("状态机代码") private String smCode; 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 421dbcb..5bc6718 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,6 +1,7 @@ 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; @@ -33,6 +34,10 @@ 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; @@ -73,6 +78,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("状态类型 10=初始化状态") private Integer statusType; + @Column(name = "SEQ") + @ApiParam("状态点顺序") + private Integer seq; + @Transient @ApiParam("状态点是否完成") private boolean isComplete; @@ -84,4 +93,8 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @Transient @ApiParam("前端显示颜色") private String color; + + @Transient + @ApiParam("状态执行情况") + private StepResult stepResult; } 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 e1599ec..85e63bf 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 @@ -126,6 +126,26 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("半成品条码") private String halfProductSn; + @Transient + @ApiParam("主任务编号") + private String orderNo; + + @Transient + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Transient + @ApiParam("产品类型名称") + private String produceCategoryName; + + @Transient + @ApiParam("字符长度") + private Integer length; + + @Transient + @ApiParam("校验内容") + private String checkContent; + 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/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index 237df3e..dd0d6b0 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 @@ -11,7 +11,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; +import java.util.Map; /** * @Description :工步参数 @@ -49,4 +52,32 @@ public class MesStepParam extends BaseBean implements Serializable { @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性 text select") private String paramAttribute; + + @Column(name = "EXHIBITION_KEY") + @ApiParam("展示key") + private String exhibitionKey; + + @Column(name = "EXHIBITION_VALUE") + @ApiParam("展示value") + private String exhibitionValue; + + @Column(name = "OBJECT_CODE") + @ApiParam("参数对象") + private String objectCode; + + @Column(name = "TYPE") + @ApiParam("type") + private Integer type = 0; + + @Transient + @ApiParam("可选值的数据") + private List> enumList; + + @Transient + @ApiParam("key的值") + private Object geValue; + + @Transient + @ApiParam("value的值") + private Object geDescription; } 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 new file mode 100644 index 0000000..05466cb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -0,0 +1,39 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/6/7 15:20 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SUB_PART") +@Api("替代料") +public class MesSubPart extends BaseBean implements Serializable { + private static final long serialVersionUID = 4636507477301700549L; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "SUB_PART_NO") + @ApiParam("替代料") + private String subPartNo; + +} 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 3692f51..11a7383 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 @@ -31,8 +31,8 @@ import java.util.List; }) @Api("数据同步死信") public class MesSyncDeadLetter extends BaseBean implements Serializable { - private static final long serialVersionUID = 1151025992437433734L; + private static final long serialVersionUID = -6427776318518431855L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; 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 326dafe..11da3c6 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 @@ -22,8 +22,8 @@ import java.io.Serializable; @Table(name = "MES_TIME") @Api("工步参数") public class MesTime extends BaseBean implements Serializable { - private static final long serialVersionUID = 1562011791394529076L; + private static final long serialVersionUID = 5447356026236056885L; @Column(name = "MODULE") @ApiParam("组件") private String module; 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 cf099ca..e436ea3 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 @@ -11,6 +11,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; /** @@ -30,7 +31,7 @@ import java.io.Serializable; public class MesTooling extends BaseBean implements Serializable { private static final long serialVersionUID = -5033127912658757665L; - @Column(name = "TOOLING_CODE ") + @Column(name = "TOOLING_CODE") @ApiParam("工装代码") private String toolingCode ; @@ -49,4 +50,12 @@ public class MesTooling extends BaseBean implements Serializable { @Column(name = "USE_TIME_MAX") @ApiParam("最大使用时间") private String useTimeMax; + + @Column(name = "REMIND_COUNT") + @ApiParam("提醒次数") + private Integer remindCount; + + @Transient + @ApiParam("使用次数") + private Integer useCount; } 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 570ffd1..56743f5 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 @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 2900363253333046861L; + private static final long serialVersionUID = 8916087884118304236L; @Column(name = "SN") @ApiParam("过程条码") private String serialNumber; 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 new file mode 100644 index 0000000..276699a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_USER_SKILL") +@Api("MES_人员技能表") +public class MesUserSkill extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222847514741345978L; + @Column(name = "USER_EMP_NO") + @ApiParam("员工编码") + private String userEmpNo; + + @Column(name = "USER_NAME") + @ApiParam("员工名称") + private String userName; + + @Column(name = "SKILL_CODE") + @ApiParam("技能代码") + private String skillCode; + + @Column(name = "SKILL_NAME") + @ApiParam("技能名称") + private String skillName; + + @Column(name = "SKILL_LEVEL") + @ApiParam("技能等级") + private String skillLevel; +} 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 7d83053..d8ecd5d 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 @@ -54,6 +54,10 @@ public class MesWcCheck extends BaseBean implements Serializable { @ApiParam("检查标准") private String standard; + @Column(name = "IS_NECESSARY") + @ApiParam("是否必检") + private Integer isNecessary; + @Transient @ApiParam("检查类型名称") private String checkTypeName; 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 534e549..36a9394 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 @@ -80,4 +80,8 @@ public class MesWcCheckRecord extends BaseBean implements Serializable { @ApiParam("总体结果") private Integer overAllResult; + @Column(name = "IS_NECESSARY") + @ApiParam("是否必检") + private Integer isNecessary; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java similarity index 53% rename from modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java index 3961a36..68b7ee0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java @@ -1,9 +1,6 @@ -package cn.estsh.i3plus.pojo.ptl.bean; +package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -16,32 +13,41 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; /** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc + * @Description: + * @Author: jokelin + * @Date: 2020/4/26 11:43 上午 + * @Modify: */ - @Data @Entity @DynamicInsert @DynamicUpdate -@Table(name = "PTL_WINDOW") @EqualsAndHashCode(callSuper = true) -@Api("PTL_界面") -public class PtlWindow extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443842758197995L; +@Table(name = "MES_WINDOW") +@Api("MES_看板界面") +public class MesWindow extends BaseBean implements Serializable { + + private static final long serialVersionUID = -55209393692924780L; @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("界面编号") private String windowNo; @Column(name = "WINDOW_NAME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("界面名称") private String windowName; + + @Column(name = "WINDOW_TYPE") + @ApiParam("界面类型") + private Integer windowType; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Transient + @ApiParam("顺序") + private Integer seq; } 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 32e1908..2bb4bcf 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 @@ -31,11 +31,11 @@ import java.io.Serializable; }) @Api("工作单元组件参数配置") public class MesWorkCellModuleParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 4836155960343256982L; + private static final long serialVersionUID = 4836155960343256982L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") 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 92bcaf8..324db04 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 @@ -23,7 +23,8 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "WORK_CENTER_CODE") }) @Api("工位监控异常信息") public class MesWorkCellMonitorLog 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 cd8463a..9ab0cb3 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 @@ -32,8 +32,8 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = -6817903235638554748L; + private static final long serialVersionUID = -6817903235638554748L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -50,6 +50,10 @@ public class MesWorkCellPoint extends BaseBean implements Serializable { @ApiParam("队列明细表序号") private Double queueDetailSeq; + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + 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/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 9b36072..91a7275 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 @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_WORK_CELL_POINT_GROUP") @Api("工站分组队列") public class MesWorkCellPointGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = -6817903235638554748L; + private static final long serialVersionUID = -7544627137183733563L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -79,6 +79,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("显示颜色") private String color; + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置代码") + private String produceCategoryCode; + 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 new file mode 100644 index 0000000..153521a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_SKILL") +@Api("MES_工位技能表") +public class MesWorkCellSkill extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1239825214741345208L; + @Column(name = "SKILL_CODE") + @ApiParam("技能代码") + private String skillCode; + + @Column(name = "SKILL_NAME") + @ApiParam("技能名称") + private String skillName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; +} 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 6cfbd40..a80febf 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 @@ -62,6 +62,15 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("产能") private Integer productionCapacity; + @Column(name = "GENERATE_TYPE") + @ApiParam("条码生成模式") + private Integer generateType; + + // 10=工单作业，20=标准作业 + @Column(name = "MONITOR_TYPE") + @ApiParam("工位监控模式") + private Integer monitorType; + @Transient @ApiParam(value = "子集列表") private List childTreeList; 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 new file mode 100644 index 0000000..d431ff4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java @@ -0,0 +1,45 @@ +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; +import java.util.Date; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORKDAY") +@Api("MES_工作日历表") +public class MesWorkDay extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222899824741345978L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_DATE") + @ApiParam("日期") + private String workDate; + + @Column(name = "SHIFT_CLASS_CODE") + @ApiParam("班制代码") + private String shiftClassCode; +} 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 e9f1193..677525f 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * @Description: @@ -73,6 +74,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("工单状态") private Integer workOrderStatus; + @Column(name = "IS_PULL") + @ApiParam("是否投料") + private Integer isPull = 2; + @Column(name = "WO_TYPE") @ApiParam("工单类型") private Integer workOrderType; @@ -153,6 +158,31 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; + @Lob + @Column(name = "EXTEND") + @ApiParam("扩展数据") + public String extend; + + @Column(name = "RESERVED1") + @ApiParam("预留字段1") + private String reserved1; + + @Column(name = "RESERVED2") + @ApiParam("预留字段2") + private String reserved2; + + @Column(name = "RESERVED3") + @ApiParam("预留字段3") + private String reserved3; + + @Column(name = "RESERVED4") + @ApiParam("预留字段4") + private String reserved4; + + @Column(name = "PARENT_PART_NO") + @ApiParam("父阶物料号") + private String parentPartNo; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") @@ -224,6 +254,42 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("批量打包开窗页面查询工单=1") private String pageType; + @Transient + @ApiParam("产品批次") + private String productBatch; + + @Transient + @ApiParam("工单类型描述") + private String workOrderTypeDesc; + + @Transient + @ApiParam("工单状态描述") + private String workOrderStatusDesc; + + @Transient + @ApiParam("计划类型") + private Integer planType; + + @Transient + @ApiParam(value = "完成按钮编号") + public String comButtonCode; + + @Transient + @ApiParam("工单源序号") + private Double srcSeq; + + @Transient + @ApiParam("零件号集合") + private String partNoList; + + @Transient + @ApiParam("零件名称集合") + private String partNameList; + + @Transient + @ApiParam("客户集合") + private List custList; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -255,4 +321,5 @@ public class MesWorkOrder extends BaseBean implements Serializable { public int getApprovalStatusVal() { return this.approvalStatus == null ? 0 : this.approvalStatus; } + } 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 6366551..6213888 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 @@ -31,11 +31,11 @@ import java.io.Serializable; public class MesWorkOrderLog extends BaseBean implements Serializable { private static final long serialVersionUID = -5859382100462830988L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; @@ -151,6 +151,31 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; + @Lob + @Column(name = "EXTEND") + @ApiParam("扩展数据") + public String extend; + + @Column(name = "RESERVED1") + @ApiParam("预留字段1") + private String reserved1; + + @Column(name = "RESERVED2") + @ApiParam("预留字段2") + private String reserved2; + + @Column(name = "RESERVED3") + @ApiParam("预留字段3") + private String reserved3; + + @Column(name = "RESERVED4") + @ApiParam("预留字段4") + private String reserved4; + + @Column(name = "PARENT_PART_NO") + @ApiParam("父阶物料号") + private String parentPartNo; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") 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 new file mode 100644 index 0000000..a043ec9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.bean.template; + +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.util.List; + +/** + * @Description : 导入模板信息 + * @Reference : + * @Author : adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE") +@Api("导入模板信息") +public class BasImportTemplate extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592889L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TEMPLATE_NAME") + @ApiParam("模板名称") + private String templateName; + + @Column(name="TEMPLATE_DESC") + @ApiParam("模板描述") + private String templateDesc; + + @Column(name="GROUP_NAME") + @ApiParam("分组名称") + private String groupName; + + /** + * 10-单表，20-多表 + */ + @Column(name="IMPORT_TYPE") + @ApiParam(value = "导入类型", example = "0") + private Integer importType; + + /** + * 10-全覆盖，20-差异更新，30-重复不导入 + */ + @Column(name="UPDATE_TYPE") + @ApiParam(value = "更新类型", example = "0") + private Integer updateType; + + @Column(name="SCRIPT_NO") + @ApiParam("脚本编号") + private String scriptNo; + + @Column(name="START_ROW") + @ApiParam(value = "起始行", example = "0") + private Integer startRow; + + @Transient + @ApiParam("模板明细列表") + private List templateDetailsList; +} \ No newline at end of file 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 new file mode 100644 index 0000000..736b6ba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java @@ -0,0 +1,117 @@ +package cn.estsh.i3plus.pojo.mes.bean.template; + +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 : adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE_DETAILS") +@Api("导入模板明细信息") +public class BasImportTemplateDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592999L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TABLE_NAME") + @ApiParam("表名称") + private String tableName; + + @Column(name="FIELD_CODE") + @ApiParam("字段英文名称") + private String fieldCode; + + @Column(name="FIELD_ALIAS") + @ApiParam("字段别名") + private String fieldAlias; + + @Column(name="LABEL_CODE") + @ApiParam("标签代码") + private String labelCode; + + @Column(name="LABEL_NAME") + @ApiParam("标签名称") + private String labelName; + + @Column(name="DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + /** + * 数据格式 文本、整数、小数、日期 + */ + @Column(name="DATA_FORAMT") + @ApiParam("数据格式") + private String dataFormat; + + /** + * 1-是，2-否 + */ + @Column(name="IS_REQUIRE") + @ApiParam(value = "是否必填", example = "0") + private Integer isRequire; + + @Column(name="DECIMAIL_SPLIT") + @ApiParam("小数点分隔符") + private String decimalSplit; + + @Column(name="THOUSANDS_SPLIT") + @ApiParam("千分位分隔符") + private String thousandsSplit; + + // YYYY-MM-DD/DD-MM-YY/YYYY-MM-DD HH:mm:ss + @Column(name="DATE_FORMAT") + @ApiParam("日期格式") + private String dateFormat; + + @Column(name="REMARK") + @ApiParam("备注") + private String remark; + + @Column(name="SEQ") + @ApiParam(value = "序号", example = "0") + private Integer seq; + + @Column(name="MAX_LENGTH") + @ApiParam(value = "最大长度", example = "0") + private Integer maxLength; + + @Column(name="RELATION_TABLE") + @ApiParam("关联表名") + private String relationTable; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + /** + * 是否主键 1-是，2-否 + */ + @Column(name="IS_PK") + @ApiParam(value = "是否主键", example = "0") + private Integer isPk; + + @Column(name="SHEET_NAME") + @ApiParam("工作薄名称") + private String sheetName; +} \ No newline at end of file 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/template/MesWorkCellDefect.java new file mode 100644 index 0000000..025ae54 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean.template; + +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: + * @Author: jokelin + * @Date: 2020/6/17 8:39 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_DEFECT") +@Api("MES_工位缺陷") +public class MesWorkCellDefect extends BaseBean implements Serializable { + + private static final long serialVersionUID = -528051790747923632L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "PART_ASSEMBLE") + @ApiParam("物料集") + private String partAssemble; + + @Transient + @ApiParam("缺陷名称") + private String defectCodeName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java new file mode 100644 index 0000000..7bf7604 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * Mes - SAP 字段映射关系 + * 暂时不考虑字段的类型 + * + * @author Rock.Yu + * @since 2019-06-09 21:06 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MappingItem { + /** + * 来源字段名称 + */ + public String srcName; + /** + * 目标对象的名称 + */ + public String destBeanName; + /** + * 目标对象的属性名称 + */ + public String destName; + /** + * 该字段在目标表是不是主键 + * 1=主键 + */ + public Integer destPk; + /** + * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确 + * 可以使用的表达式： #date, #time, #guid, #Q.warehouse(#zone) + */ + public Object defaultValue; + + @Override + public String toString() { + return "srcName:" + + this.srcName + ", destBeanName:" + + this.destBeanName + ", destName" + + this.destName + ", defaultValue:" + + this.defaultValue + ", destPk:" + + this.destPk; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java new file mode 100644 index 0000000..a37e754 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java @@ -0,0 +1,161 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * Mes - SAP 中间数据库接口映射关系 + * + * @author Rock.Yu + * @since 2019-06-09 20:08 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_INTERFACE_DATA_MAPPER") +@Api("接口数据映射") +public class MesInterfaceDataMapper extends BaseBean { + /** + * 排序编号 + */ + @Column(name = "SEQ") + public Integer seq; + /** + * 来源表的每次查询记录数，防止大量数据造成内存溢出 + */ + @Column(name = "SRC_GET_LIMIT") + public Integer srcGetLimit; + /** + * 接口数据源编号（在动态表单中配置） + */ + @Column(name = "SRC_DATA_SOURCE", length = 50) + public String dataSource; + /** + * 来源表名 + */ + @Column(name = "SRC_TABLE_NAME", length = 50) + public String srcTableName; + /** + * 来源表的排序条件 + */ + @Column(name = "SRC_ORDER_BY", length = 50) + public String srcOrderBy; + /** + * 来源表的查询条件 + */ + @Column(name = "SRC_WHERE", length = 500) + public String srcWhere; + + /** + * 来源表的分组条件，按分组发送，多个列名用半角逗号分隔 + */ + @Column(name = "SRC_GROUP_COLUMNS", length = 255) + public String srcGroupColumns; + /** + * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔 + * 例如：SYNFLG=Y,SYNDATE={#XX} + * 可以使用的动态变量： #sap_date, #sap_time, #date, #time, #guid + */ + @Column(name = "SRC_UPDATE_SYNC", length = 255) + public String srcUpdateSync; + /** + * 业务表单的主键，多个主键用半角逗号分隔 + */ + @Column(name = "SRC_PK_COLUMNS", length = 255) + public String srcPkColumns; + /** + * 按照组织代码(半角逗号分隔)复制多份到业务表（用于物料、供应商、客户...等集团数据） + */ + @Column(name = "COPY_BY_ORGS", length = 50) + public String copyByOrgs; + /** + * 目标实体对象的名字，多个字段用半角逗号分隔 + */ + @Column(name = "DEST_BEAN_NAME", length = 500) + public String destBeanName; + /** + * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔 + */ + @Column(name = "DEST_PK_PROPERTIES", length = 500) + public String destPkProperties; + /** + * 源表字段与目标对象属性的映射关系，List 对象，JSON 格式存储 + * + */ + @Column(name = "DEST_COLUMN_MAPPING", length = 5000) + public String destColumnMapping; + + /** + * 接口分组名称 + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES + */ + @Column(name = "GROUP_NAME") + public String groupName; + + /** + * 业务的路由规则 + * 一表对多表时需要配置路由规则 + */ + @Column(name = "BUSI_ROUTE") + public String busiRoute; + + /** + * 同步频率 + */ + @Column(name = "SYNC_FREQUENCY") + public Integer syncFrequency; + + /** + * 上次同步时间 + */ + @Column(name = "LAST_SYNC_TIME") + public String lastSyncTime; + + /** + * 软适配编号 + */ + @Column(name = "SOFT_ADAPATOR_CODE") + public String softAdaptorCode; + + /** + * 扩展脚本编号，用于扩展接口功能 + */ + @Column(name = "SCRIPT_NO") + public String scriptNo; + + /** + * 调用脚本方法获取数据 + */ + @Column(name = "USE_SCRIPT_PULL") + public Integer useScriptPull; + + /** + * 调用脚本方法保存数据 + */ + @Column(name = "USE_SCRIPT_PUSH") + public Integer useScriptPush; + + /** + * 调用脚本方法更新同步标志 + */ + @Column(name = "USE_SCRIPT_MARK") + public Integer useScriptMark; + + /** + * 调用脚本方法过滤数据（查询来源数据后过滤） + */ + @Column(name = "USE_SCRIPT_FILTER") + public Integer useScriptFilter; +} 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 new file mode 100644 index 0000000..76123e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import com.fasterxml.jackson.annotation.JsonFormat; + +public class MesInterfaceEnumUtil { + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DIRECTION_TYPE { + SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), + MES2WMS(30, "MES2WMS", "MES --> WMS"), + WMS2MES(40, "WMS2MES", "WMS --> MES"); + + private int value; + private String name; + private String description; + + DIRECTION_TYPE() { + } + + DIRECTION_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + 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].getName(); + } + } + return tmp; + } + + public static int nameOf(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(val)) { + tmp = values()[i].value; + } + } + return tmp; + } + + /** + * -1 不在范围内 + * @param desc + * @return + */ + 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; + } + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java new file mode 100644 index 0000000..4136acd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 回写接口库的值 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class UpdateSyncItem { + + /** + * 字段名 + */ + public String columnName; + + /** + * 写入的值 + * 支持表达式 + * #sap_date, #sap_time, #guid + */ + public String updateValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BasBeanFieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BasBeanFieldModel.java new file mode 100644 index 0000000..c8747c9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BasBeanFieldModel.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 数据库实例字段模型 + * @author adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + */ +@Data +@Api("数据库实例字段模型") +public class BasBeanFieldModel { + + @ApiParam("表名") + private String tableName; + + @ApiParam("表描述") + private String tableDesc; + + @ApiParam("字段英文名称") + private String fieldEnName; + + @ApiParam("字段类型") + public String fieldType; + + @ApiParam("字段描述") + private String fieldDesc; + + @ApiParam("实例类名") + public String entityName; + + @ApiParam("实例字段名称") + public String propertyName; + + @ApiParam("实例类全名") + public String entityClassName; +} 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 new file mode 100644 index 0000000..8076ead --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.*; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 6:55 下午 + * @Modify: + */ +@Data +public class BoardModel { + + @ApiParam("看板名称") + private String boardName; + + @ApiParam("班别") + private String shiftName; + + @ApiParam("对象值描述") + private String objectValueDesc; + + @ApiParam("计划人数") + private Integer planPeopleNum; + + @ApiParam("实际人数") + private Integer actualPeopleNum; + + @ApiParam("计划产量") + private Integer planCapacity; + + @ApiParam("目标达成数") + private Integer achievedNum; + + @ApiParam("看板图片路径") + private String pictureUrl; + + @ApiParam("当天停机时间(min)") + private String theDayShutDownTime; + + @ApiParam("看板时段计划产量") + private List boardShiftSectionCapacityList; + + @ApiParam("看板设备状态") + private List boardEquStatusList; + + @ApiParam("看板设备明细") + private List boardEquDetailList; + + @ApiParam("oee") + private List oeeList; + + @ApiParam("工位状态监控明细") + private List boardWorkCellList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java index 47a4f4f..44ba836 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java @@ -1,12 +1,20 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class ButtonBean implements Serializable { + private static final long serialVersionUID = -4012120630477190414L; + @ApiParam(value = "按钮代码") private String buttonCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java index 46dcdbd..93e598e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java @@ -52,4 +52,7 @@ public class ButtonComponentReqModel { @ApiParam("客户标识号") private String custFlagNo; + @ApiParam("用户信息") + private String userInfo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java index 4a8aec6..ef91b1e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -37,13 +37,29 @@ public class ButtonDynamicModel { private String paramValue; - public ButtonDynamicModel(Long id, String buttonCode, String buttonName){ + public ButtonDynamicModel(Long id, String buttonCode, String buttonName, String windowNo, String windowModuleBack) { this.id = id; this.buttonCode = buttonCode; this.buttonName = buttonName; + this.windowNo = windowNo; + this.windowModuleBack = windowModuleBack; + } + + + public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode) { + this.buttonCode = buttonCode; + this.buttonName = buttonName; + this.paramCode = paramCode; + } + + public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode, String paramValue) { + this.buttonCode = buttonCode; + this.buttonName = buttonName; + this.paramCode = paramCode; + this.paramValue = paramValue; } - public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){ + public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue) { this.id = id; this.buttonCode = buttonCode; this.windowNo = windowNo; 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 new file mode 100644 index 0000000..2e7cfef --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/9 18:00 + * @desc + */ +@Data +public class BypassModel { + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("Bypass编码") + private String bypassCode; + + @ApiParam("检测项") + private String businessValue; + + @ApiParam("是否确认，1=已确认，2=未确认") + private String isVerify; + + @ApiParam("生产数据ID") + private Long productDataId; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index d97a57a..976542a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -30,4 +30,6 @@ public class CellFeedModel { private String scanQty; + private String lineRemainQty; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java similarity index 93% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 22a3440..3d121d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Api("数据复核model") -public class DataReviewStepModel { +public class DataReviewModel { @ApiParam("关键件") private String itemPartNo; @@ -25,5 +25,4 @@ public class DataReviewStepModel { @ApiParam("对象代码") private String objectCode; - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java new file mode 100644 index 0000000..3620dd2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class DefectTypeModel implements Serializable { + + // 缺陷/维修 + @ApiParam("业务类型") + private String busiType; + + @ApiParam("List结果集") + private List resultList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java new file mode 100644 index 0000000..e7a11f5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 15:23 + * @desc + */ +@Data +public class EdiFileModel implements Serializable { + private static final long serialVersionUID = 7085611430865514271L; + + private String content; + + private String fileName; + + private String fileUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java new file mode 100644 index 0000000..e1361c9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 14:51 + * @desc + */ +@Data +public class EdiRequestModel implements Serializable { + private static final long serialVersionUID = 7203497485903427292L; + + private String organizeCode; + + private String sourcePath; + + private String fileName; + + private String fileUrl; + + private String content; + + private Integer ediType; + + private String ediCode; + + private String host; + + private String config; + + private String programCode; + + private String messageType; + + private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index bd38834..bc6bb5f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; -//import com.sun.tools.javac.util.List; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; @@ -24,8 +23,7 @@ import java.util.ArrayList; @ElasticSearch public class EsProductDataModule extends BaseBean implements Serializable { - private static final long serialVersionUID = 4514407617515827040L; - + private static final long serialVersionUID = -5907453749571718168L; @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportResultModel.java index 16dc4f7..e3ed164 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportResultModel.java @@ -39,4 +39,7 @@ public class ExcelImportResultModel implements Serializable { @ApiParam("导入数据集合") private List excelList; + @ApiParam("导入进度") + private String importSpeed; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java new file mode 100644 index 0000000..2834455 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class FilterGroup { + private String andOr; + private List groups; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java new file mode 100644 index 0000000..21da796 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +@Data +public class FilterRule { + private String field; + private String op; + private Object value; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java new file mode 100644 index 0000000..1a74bdf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class FilterRules { + private String andOr; + private List rules; +} 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 28b8235..c130f5b 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 @@ -82,6 +82,12 @@ public class GenSerialNoModel { @ApiParam("当前编号") private String currentNumber; + @ApiParam("物料类型3") + private String categoryCode3; + + @ApiParam("零件号后4位") + private String partNoAfterFour; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java new file mode 100644 index 0000000..c3f6856 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java @@ -0,0 +1,94 @@ +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.NoArgsConstructor; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\18 9:34 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("QC质检单model") +public class IfQcOrderDataModel extends BaseBean { + + @ApiParam("ruid") + private Long ruid; + + @ApiParam("收货流水号") + private Long uuid; + + @ApiParam("域") + private String werks; + + @ApiParam("地点") + private String lgort; + + @ApiParam("收货库位") + private String wlbrt; + + @ApiParam("单据号") + private String refid; + + @ApiParam("行号") + private Integer zeile; + + @ApiParam("业务类型") + private String action; + + @ApiParam("供应商编码") + private String lifnr; + + @ApiParam("物料编码") + private String matnr; + + @ApiParam("收货数量") + private Double erfmg; + + @ApiParam("计量单位") + private String erfme; + + @ApiParam("检验编号") + private String chkno; + + @ApiParam("炉批号") + private String stono; + + @ApiParam("收货日期") + private String zpost; + + @ApiParam("收货时间") + private String ztime; + + @ApiParam("添加日期") + private String addtimeYmd; + + @ApiParam("添加时间") + private String addtimeHms; + + @ApiParam("处理日期") + private String finishtimeYmd; + + @ApiParam("处理时间") + private String finishtimeHms; + + @ApiParam("删除标记") + private Integer deleteFlag; + + @ApiParam("读取标识") + private Integer readFlag; + + @ApiParam("错误代码") + private String errCode; + + @ApiParam("错误信息") + private String errMsg; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java new file mode 100644 index 0000000..c8c44fe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java @@ -0,0 +1,73 @@ +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.NoArgsConstructor; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\18 9:34 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("QC质检单model（发货检验）") +public class IfQcOrderRcCheckModel extends BaseBean { + + @ApiParam("Ruid") + private Long ruid; + + @ApiParam("单据号") + private String orderNo; + + @ApiParam("发运时间") + private String deliveryDate; + + @ApiParam("客户代码") + private String customerCode; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("计划数量") + private Double orderQty; + + @ApiParam("工厂代码") + private String factoryCode; + + @ApiParam("客户发往地代码") + private String customerDeliveryCode; + + @ApiParam("物流供应商") + private String option1; + + @ApiParam("业务类型") + private String checkType; + + @ApiParam("到达时间") + private Double arrivalDate; + + @ApiParam("运输方式") + private String transportTypeDesc; + + @ApiParam("发出地") + private String srcSite; + + @ApiParam("发往地") + private String destSite; + + @ApiParam("运输类型") + private String transportClass; + + @ApiParam("同步状态") + private Integer syncStatus; + + @ApiParam("错误信息") + private String errMsg; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java new file mode 100644 index 0000000..38dc1b4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java @@ -0,0 +1,118 @@ +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; + +import java.util.LinkedList; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("散件BOM导入MODEL") +public class ImportBomExcelDataModel { + + @ApiParam("零件号") + private String partNo; + + @ApiParam("零件名称") + private String partName; + + @ApiParam("零件简称") + private String briefText; + + @ApiParam("零件规格") + private String partSpec; + + @ApiParam("分类1") + private String categoryCode1; + + @ApiParam("分类2") + private String categoryCode2; + + @ApiParam("分类3") + private String categoryCode3; + + @ApiParam("单位") + private String unit; + + @ApiParam("包装规格代码") + private String packSpecCode; + + @ApiParam("默认工作中心") + private String defaultWorkCenter; + + @ApiParam("产品位置") + private String produceCategoryCode; + + @ApiParam("过程编码匹配类型") + private Integer processMatchType; + + @ApiParam("包装编码匹配类型") + private Integer packageMatchType; + + @ApiParam("产品编码匹配类型") + private Integer productMatchType; + + @ApiParam("产品类型代码") + private String pptCode; + + @ApiParam("物料特性") + private Integer partTrait; + + @ApiParam("产品类型名称") + private String produceCategoryName; + + @ApiParam("过程编码匹配类型名称") + private String processMatchTypeName; + + @ApiParam("包装编码匹配类型") + private String packageMatchTypeName; + + @ApiParam("产品编码匹配类型") + private String productMatchTypeName; + + @ApiParam("分类名称") + private String categoryName; + + @ApiParam("原材料物料号") + private String itemPartNo; + + @ApiParam("原材料物料名称") + private String itemPartName; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("产出工位") + private String workCellCode; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam(value = "数量", example = "0") + private Double qty; + + @ApiParam("消耗工位") + private String usedWorkCellCode; + + @ApiParam("客户物料号") + private String custPartNo; + + @ApiParam("配置") + private LinkedList cfgCodeList; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("用户名") + private String userName; + + @ApiParam("关键物料类型") + private String keyPartType; + + @ApiParam("是否关键件") + private String isKeyPart; +} 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 new file mode 100644 index 0000000..0b33b5d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java @@ -0,0 +1,51 @@ +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 InjectionProductionControlModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("当前合格数量") + private String standardQtyCur; + + @ApiParam("总完成数量") + private String completeQty; + + @ApiParam("总不合格数量") + private String scrapQty; + + @ApiParam("已打包数量") + private String packageQty; + + @ApiParam("未打包数量") + private String unPackageQty; + + @ApiParam("包装编号") + private String packageNo; + + @ApiParam("数量") + private String qty; + + @ApiParam("包装时间") + private String createDatetime; + + @ApiParam("箱条码状态") + private String printStatusName; + + @ApiParam("序号") + private Integer index; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java new file mode 100644 index 0000000..0bc1fbd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/4 10:26 上午 + * @Modify: + */ +@Data +public class JitIssueCfgModel { + + @ApiParam("客户工厂代码") + private String custPlantCode; + + @ApiParam("数量") + private Integer qty; + + @ApiParam("触发阈值") + private Integer thresholdQty; + + @ApiParam("当前JIT缓存数") + private Integer currentJitCacheNum; + + @ApiParam("其他工单数") + private Integer otherWorkNum = 0; + + @ApiParam("缓存类型") + private String cfgType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java new file mode 100644 index 0000000..01e2d64 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java @@ -0,0 +1,42 @@ +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; + +import java.util.List; + +/** +* @Description : 盲检问题清单 +* @Reference : +* @author: jessica.chen +* @date: 2020/4/16 17:10 +* @Modify: +*/ + +@Data +@Api(value="盲检问题清单",description = "盲检问题清单") +public class MesBlindProbleModel extends BaseBean { + + private static final long serialVersionUID = 5790342327875844345L; + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "提问内容") + private String questionContents; + + @ApiParam(value = "答案集合") + private List answerList; + + @ApiParam(value = "正确答案") + private String rightKey; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam("序号") + private String topicId; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindRuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindRuleModel.java new file mode 100644 index 0000000..7fd98ec --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindRuleModel.java @@ -0,0 +1,53 @@ +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 : 盲检规则模板 +* @Reference : +* @author: jessica.chen +* @date: 2020/4/16 17:10 +* @Modify: +*/ + +@Data +@Api(value="盲检规则模板",description = "盲检规则模板") +public class MesBlindRuleModel extends BaseBean { + + private static final long serialVersionUID = 5790342327875844321L; + @ApiParam(value = "车辆类型") + @AnnoOutputColumn + private String carType; + + @ApiParam(value = "车辆颜色") + @AnnoOutputColumn + private String carColor; + + @ApiParam(value = "零件号") + private String partCode; + + @ApiParam(value = "零件名称") + @AnnoOutputColumn + private String partName; + + @ApiParam(value = "配置") + @AnnoOutputColumn + private String carConfig; + + @ApiParam(value = "等级") + @AnnoOutputColumn + private String carLevel; + + @ApiParam(value = "零件颜色") + @AnnoOutputColumn + private String partColor; + + @ApiParam(value = "下标") + @AnnoOutputColumn + private Integer index; + +} 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 19d1a22..d1220a7 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 @@ -97,6 +97,9 @@ public class MesEquipmentModel implements Serializable { @ApiParam("连接类型") private String connectTypeName; + @ApiParam("作业校验模式") + private Integer checkModel; + public MesEquipmentModel() { @@ -139,7 +142,7 @@ public class MesEquipmentModel implements Serializable { } //获取设备分页数据 queryMesEquipmentByPager - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -163,6 +166,7 @@ public class MesEquipmentModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.checkModel = checkModel; } } 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 new file mode 100644 index 0000000..abf1eff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020\06\22 15:58 + * @Modify: + **/ +@Data +public class MesPaintSnPrintModel implements Serializable { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产品条码") + private String produceSn; + + @ApiParam("包装编号") + private String packageNo; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("打印模板") + private MesLabelTemplate labelTemplate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java new file mode 100644 index 0000000..4a4db6e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java @@ -0,0 +1,42 @@ +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 : 生产配方模板 +* @Reference : +* @author: jessica.chen +* @date: 2020/4/16 17:10 +* @Modify: +*/ + +@Data +@Api(value="生产配方模板",description = "生产配方模板") +public class MesPartFormulaModel extends BaseBean { + + private static final long serialVersionUID = 5790342327875844545L; + @ApiParam(value = "组号") + @AnnoOutputColumn + private String groupNo; + + @ApiParam(value = "组内名称") + @AnnoOutputColumn + private String groupName; + + @ApiParam(value = "原材料物料号") + @AnnoOutputColumn(required = false) + private String partNo; + + @ApiParam(value = "编号") + @AnnoOutputColumn + private String orderNo; + + @ApiParam(value = "下标值") + @AnnoOutputColumn + private Integer index; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 9ea903c..a5dd664 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -96,6 +96,15 @@ public class MesPlcModel implements Serializable { @ApiParam("OPCUA路径") private String opcUrl; + @ApiParam("PLC类型") + private Integer plcType; + + @ApiParam("默认赋值属性") + private String defaultRule; + + @ApiParam("工装代码") + private String toolingCode; + public MesPlcModel() { } @@ -103,7 +112,8 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, + String objectCode, String opcUrl, Integer plcType, String defaultRule, String toolingCode) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -131,5 +141,8 @@ public class MesPlcModel implements Serializable { this.device = device; this.objectCode = objectCode; this.opcUrl = opcUrl; + this.plcType = plcType; + this.defaultRule = defaultRule; + this.toolingCode = toolingCode; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java index bc4ac3d..af0d641 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java @@ -24,4 +24,7 @@ public class MesRouteCfgModel { @ApiParam("流程代码") private String routeCode; + + @ApiParam("是否执行 1=是 2=否") + private Integer isActive; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java index 94e14e2..5f29e63 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java @@ -18,8 +18,5 @@ public class MesRouteCfgParamModel { @ApiParam("工序代码") private String processCode; - @ApiParam("是否执行 1=是 2=否") - private Integer isActive; - List stepModelList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java index be57f42..f1b9b77 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java @@ -18,5 +18,11 @@ public class MesRouteCfgStepModel { @ApiParam("工步代码") private String stepCode; + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数值") + private String paramValue; + List routeCfgModelList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java index e0f1f6f..45d14ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java @@ -40,6 +40,9 @@ public class MesStationBomModel { @ApiParam("报废数") private Integer scrapQty; + @ApiParam(value = "是否可重复") + private Integer isRepeat; + public MesStationBomModel() { } @@ -72,4 +75,19 @@ public class MesStationBomModel { 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, Integer isRepeat) { + 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; + this.isRepeat = isRepeat; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java new file mode 100644 index 0000000..cf9c3a1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.springframework.beans.BeanUtils; +import org.springframework.util.StringUtils; + +import javax.persistence.Transient; +import java.util.HashMap; +import java.util.Map; + +/** + * @Description : 生产工单扩展 + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-03-30 13:42 + * @Modify: + **/ +@Data +@Api(value="生产工单扩展",description = "生产工单扩展") +public class MesWorkOrderExtendModel extends MesWorkOrder { + + @Transient + @ApiParam(value = "扩展数据MAP") + public Map extendMap; + + public Map getExtendMap() { + try { + if (!StringUtils.isEmpty(super.extend)) { + return JSONObject.parseObject(super.extend, Map.class); + } else { + return new HashMap<>(); + } + } catch (Exception e) { + return new HashMap<>(); + } + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java new file mode 100644 index 0000000..70851a9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 生产工单导入 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-30 13:42 + * @Modify: + **/ +@Data +@Api(value="生产工单导入",description = "生产工单导入") +public class MesWorkOrderModel { + + //工单号 + @ApiParam("OrderCode") + @AnnoOutputColumn + private String orderNo; + + //物料号 + @ApiParam("ItemCode") + @AnnoOutputColumn + private String partNo; + + //产线代码 + @ApiParam("ProductionLineID") + @AnnoOutputColumn + private String workCenterCode; + + //数量 + @ApiParam("DemandQty") + @AnnoOutputColumn + private Double qty; + + //开始时间 + @ApiParam("ProductDate") + @AnnoOutputColumn + private String startTime; + +} 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/OnLineSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java new file mode 100644 index 0000000..94d0db4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 动作请求参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +public class OnLineSnModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("用户信息") + private String userInfo; + +} 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 new file mode 100644 index 0000000..2b25ff8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/30 2:01 下午 + * @Modify: + */ +@Data +public class OperateObjectParamModel { + + private String organizeCode; + + @ApiParam("设备代码") + private String equCode; + + @ApiParam("运算对象代码") + private String objectCode; + + @ApiParam("日期") + private String oeeDate; + + @ApiParam("开始时段") + private String startTime; + + @Transient + @ApiParam("结束时段") + private String endTime; + + @ApiParam("属性值") + private Integer attributeValue = 0; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java new file mode 100644 index 0000000..33fd2aa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java @@ -0,0 +1,49 @@ +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; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/6/16 14:21 + * @desc 打包样本 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("打包样本") +public class PackageSampleModel { + + @ApiParam(name = "已打包数量") + private Double alreadyPackageCount; + + @ApiParam(name = "标准打包数量") + private Double standardPackageCount; + + @ApiParam(name = "样本类型") + private Map sampleTypeMap; + + @ApiParam(name = "样本类型代码") + private String lastSampleTypeCode; + + @ApiParam(name = "选择的样本类型") + private String chooseSampleTypeCode; + + @ApiParam(name = "强制执行工步") + private String forceStepCode; + + @ApiParam(name = "强制打包密码") + private String password; + + @ApiParam(name = "工厂") + private String organizeCode; + + @ApiParam(name = "工单号") + private String workOrderNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java new file mode 100644 index 0000000..426707f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class PackageSnLabelTemplateDataModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + // 工单表.包装规格描述 + @ApiParam("包装规格") + private Double packSpecQty; + + @ApiParam("生产日期") + private String prodDate; + + @ApiParam("工单班次") + private String workOrderShift; + + @ApiParam("操作人员名称") + private String operatorName; + + @ApiParam("工厂名称") + private String organizeName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java new file mode 100644 index 0000000..ae0de27 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 条码解绑实体 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class PackageSnModel { + + @ApiParam("包装条码") + private String packageNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("批次") + private String lotNo; + + @ApiParam("创建人") + private String createUser; + + @ApiParam("创建时间") + private String createDateTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java new file mode 100644 index 0000000..b3e649b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Author: siliter.yuan + * @CreateDate: 2020/6/28 8:06 PM + * @Description: + **/ +@Data +@Api("涂装检测MODEL") +public class PaintCheckModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色") + private String color; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("界面编号") + private String windowNo; + + @ApiParam("缺陷标识值") + private String defectFlagValue; + + @ApiParam("不良品处理类型") + private Integer defectActionType; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("缺陷列表") + private List defectList; + + @ApiParam("界面组件参数数据") + List windowModuleParamList; + + private String defectType; + private String defectDesc; +} 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 new file mode 100644 index 0000000..9ab41c8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Author: siliter.yuan + * @CreateDate: 2020/6/21 8:06 PM + * @Description: + **/ +@Data +@Api("涂装上线MODEL") +public class PaintOnLineModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色") + private String color; + + @ApiParam("工单数量") + private Double orderNum; + + @ApiParam("包装数量") + private Double packageNum; + + @ApiParam("项目名称") + private String productName; + + @ApiParam("创建时间") + private String createDateTime; + + @ApiParam("圈数") + private Integer rounds; + + @ApiParam("过程条码") + private String serialNumber; +} 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 new file mode 100644 index 0000000..2265b41 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -0,0 +1,69 @@ +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.NoArgsConstructor; + +import java.util.List; + +/** + * @Description : 涂装工单条码-展示组件model + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-06-21 11:02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("涂装工单条码展示组件model") +public class PaintWorkOrderSnModel extends BaseBean { + + @ApiParam("工单号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("颜色名称") + private String colorName; + + @ApiParam("工单数量") + private Double workOrderQty; + + @ApiParam("包装数量") + private Double packageQty; + + @ApiParam("项目名称") + private String prodCfgTypeName; + + @ApiParam("圈数") + private Integer groupNum; + + @ApiParam("工单状态") + private Integer workOrderStatus; + + // 父阶物料号 -- 涂装客户标签打印 + @ApiParam("父阶物料号") + private String parentPartNo; + + // 父阶物料名称 -- 涂装二次条码打印 + @ApiParam("父阶物料名称") + private String parentPartName; + + @ApiParam("实际包装数量") + private Integer compQty; + + private List prodPackageList; + + private String partNameRdd; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java new file mode 100644 index 0000000..86d0dd4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class PartDismantleModel { + + @ApiParam("子物料编码") + private String itemPartNo; + + @ApiParam("子物料名称") + private String itemPartName; + + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @ApiParam("合格数") + private BigDecimal okQty; + + @ApiParam("缺失数") + private BigDecimal missQty; + + @ApiParam("报废数") + private BigDecimal scrapQty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java new file mode 100644 index 0000000..efc1571 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/18 5:10 下午 + * @Modify: + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PartStockScheduleModel { + + private String partNo; + + private Integer boxQty; + + private Double qty; +} 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 new file mode 100644 index 0000000..6891043 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PlcEquStatusModel implements Serializable { + + // 主站/从站 + @ApiParam("站位") + private String stationPosition; + + // 站位IP + @ApiParam("IP地址") + private String ipAddress; + + // IP状态 -- 连接/断开 + @ApiParam("IP状态") + private Integer ipStatus; + + // 电检设备名称 + @ApiParam("电检设备名称") + private String electricalEqu; + + // 电检设备状态哦 -- 连接/断开 + @ApiParam("电检设备状态") + private Integer electricalEquStatus; + + // 产线状态 + @ApiParam("产线状态") + private Integer workCenterStatus; + + @ApiParam("停机类型") + private Integer stopType; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("停机开始时间") + private String stopStartTime; + + @ApiParam("停机结束时间") + private String stopEndTime; + + @ApiParam("停机原因") + private String stopReason; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java new file mode 100644 index 0000000..21671e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : PojoField模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + * @Modify: + **/ +@Data +public class PojoFieldModel implements Serializable { + private static final long serialVersionUID = 6761788924707802928L; + + @ApiParam(value ="属性名") + private String fieldName; + + @ApiParam(value ="属性类型") + private String fieldType; + + @ApiParam(value ="属性描述") + private String fieldDesc; + + @ApiParam(value ="字段名称") + private String fieldColumnName; + + @ApiParam(value = "数据来源") + private String dataSrc; + + @ApiParam(value = "开窗列表显示列名称") + private String listColumnName; + + @ApiParam(value = "开窗搜索列名称") + private String searchColumnName; + + @ApiParam(value = "回显列名") + private String explicitColumnName; + + @ApiParam(value = "下拉框规则") + private Integer selectRule; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java new file mode 100644 index 0000000..230c8a2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Pojo模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + **/ +@Data +public class PojoModel implements Serializable { + private static final long serialVersionUID = -3617516560880011259L; + @ApiParam(value ="包名") + private String packageName; + + @ApiParam(value ="POJO类名") + private String simpleName; + + @ApiParam(value ="POJO类全名") + private String fullName; + + @ApiParam(value ="表名称名") + private String tableName; + + @ApiParam(value ="POJO类描述") + private String pojoDesc; + + @ApiParam(value ="属性集合") + private List fieldList; +} 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 new file mode 100644 index 0000000..15c9efe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 涂装工单条码-展示组件(产品包装)model + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-06-21 11:02 + * @Modify: + **/ +@Data +@Api("产品包装model") +public class ProdPackModel implements Serializable { + + // 产品条码表--产品条码 + @ApiParam("产品条码") + public String productSn; + + @ApiParam("过程条码") + private String serialNumber; + + // 包装主表--包装编号 + @ApiParam("一检箱条码") + public String packageNo; + + // 包装明细表--创建时间 + @ApiParam("一检校验时间") + public String createDatetime; + + // 包装主表--打印状态(10：未打印 20：已打印) + @ApiParam("箱条码状态") + public Integer printStatus; + + @ApiParam("打印状态") + public String printStatusDesc; + + // 涂装客户标签打印 + @ApiParam("客户标签") + public String custSn; + + // 涂装客户标签打印 + @ApiParam("当前工序") + public String processCode; + + // 涂装客户标签打印 + @ApiParam("更新时间") + public String modifyDatetime; + + @ApiParam("工单号") + public String workOrderNo; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("物料号") + public String parentPartNo; + + @ApiParam("是否封箱") + public Integer isSealed; + + public ProdPackModel() { + } + + public ProdPackModel(String serialNumber, String packageNo, String createDatetime, Integer printStatus) { + this.serialNumber = serialNumber; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.printStatus = printStatus; + } + + public ProdPackModel(String serialNumber, String packageNo, String custSn, Integer printStatus, String modifyDatetime) { + this.serialNumber = serialNumber; + this.packageNo = packageNo; + this.custSn = custSn; + this.printStatus = printStatus; + this.modifyDatetime = modifyDatetime; + } + + public ProdPackModel(Integer isSealed,String serialNumber, String packageNo, String createDatetime) { + this.isSealed = isSealed; + this.serialNumber = serialNumber; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java new file mode 100644 index 0000000..f16fc84 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 生产计划批量编制明细model + * @Author: wangjie + * @Date: 2020/4/21 6:55 下午 + * @Modify: + */ +@Data +public class ProdPlanBatchCompileDetailModel { + + @ApiParam("日期") + private String date; + + @ApiParam("日期对应到数量") + private Double qty; + + @ApiParam("是否只读") + private Boolean readonly; + + @ApiParam("完成数量") + private Double completeQty; + + @ApiParam("完成数量的颜色") + private String color; + + @ApiParam("工单号") + private String orderNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java new file mode 100644 index 0000000..1a6ff37 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java @@ -0,0 +1,123 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 生产计划批量编制model + * @Author: wangjie + * @Date: 2020/4/21 6:55 下午 + * @Modify: + */ +@Data +public class ProdPlanBatchCompileModel { + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("预留字段1") + private String reserved1; + + @ApiParam("预留字段2") + private String reserved2; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam(value = "班组名称") + public String shiftGroupName; + + @ApiParam(value = "班次名称") + public String shiftName; + + @ApiParam("班组") + private String shiftGroup; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户订单号") + private String custOrderNo; + + @ApiParam("预留字段3") + private String reserved3; + + @ApiParam("预留字段4") + private String reserved4; + + @ApiParam("单位") + private String unit; + + @ApiParam("日期数量集合") + private List detailList; + + @ApiParam("合计") + private Double amount; + + @ApiParam("完成合计") + private Double completeAmount; + + @ApiParam("计划类型") + private Integer planType; + + @ApiParam("计划类型名称") + private String planTypeName; + + @ApiParam("数量1") + private String qty1; + + @ApiParam("完成数量1") + private String completeQty1; + + @ApiParam("数量2") + private String qty2; + + @ApiParam("完成数量2") + private String completeQty2; + + @ApiParam("数量3") + private String qty3; + + @ApiParam("完成数量3") + private String completeQty3; + + @ApiParam("数量4") + private String qty4; + + @ApiParam("完成数量4") + private String completeQty4; + + @ApiParam("数量5") + private String qty5; + + @ApiParam("完成数量5") + private String completeQty5; + + @ApiParam("数量6") + private String qty6; + + @ApiParam("完成数量6") + private String completeQty6; + + @ApiParam("数量7") + private String qty7; + + @ApiParam("完成数量7") + private String completeQty7; + + @ApiParam("合计") + private String amountStr; + + @ApiParam("完成合计") + private String completeAmountStr; + +} 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 new file mode 100644 index 0000000..81e32c2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + + +/** + * @Description: + * @Author: adair.song + * @Date: 2020/05/22 14:24 + * @Modify: + */ +@Data +public class ProductInfoManageModel { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("VIN号") + private String vinCode; + + @ApiParam("车型") + private String prodCfgTypeCode; + + @ApiParam("等级代码") + private String gradeCode; + + @ApiParam("产品颜色") + private String produceColor; + + @ApiParam("产品位置") + private String produceCategoryCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("队列明细序号") + private Double seq; + + @ApiParam("条码状态") + private Integer snStatus; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("下线时间") + private String outWorkCenterTime; + + @ApiParam("切换时间") + private String switchTime; + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("队列类型") + private Integer queueType; + + @ApiParam("工单类型") + private String workType; + + @ApiParam("待生产序列") + private Integer prodNum; + + @ApiParam("主队列序列") + private Double queueSeq; + + @ApiParam("明细队列序列") + private Double queDetailSeq; + + @ApiParam("总队列类型") + private List queueTypeList; + + public ProductInfoManageModel() { + } + + public ProductInfoManageModel(String vinCode, String prodCfgTypeCode, String gradeCode, String produceColor, Double queDetailSeq) { + this.vinCode = vinCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.gradeCode = gradeCode; + this.produceColor = produceColor; + this.queDetailSeq = queDetailSeq; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java index 1d8e6e8..b4f282e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -88,6 +88,15 @@ public class QcCheckDataModel { @ApiParam(value = "修改日期") private String modifyDatetime; + @ApiParam(value = "工单开始时间") + private String startTime; + + @ApiParam(value = "工单结束时间") + private String endTime; + + @ApiParam(value = "检测时间") + private String checkTime; + public QcCheckDataModel() { } @@ -121,4 +130,45 @@ public class QcCheckDataModel { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; } + + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String partNo, String workCenterCode + , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime, String orderNo) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.partName = partName; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.startTime = startTime; + this.endTime = endTime; + this.orderNo = orderNo; + } + + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.checkType = checkType; + } + + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType, String checkItem, String checkStandard, String checkGuide + , String checkFrequency, String checkValue, String checkResult, String sn) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.checkValue = checkValue; + this.checkResult = checkResult; + this.sn = sn; + } } 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 new file mode 100644 index 0000000..405f089 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/4/9 18:00 + * @desc + */ +@Data +public class QcCheckDataResultModel { + + @ApiParam("是否完成首检") + private Integer isFirstCheck; + + @ApiParam("首检结果") + private List firstCheckResult; + + @ApiParam("是否完成巡检") + private Integer isOnSiteCheck; + + @ApiParam("巡检结果") + private List onSiteCheckResult; + + @ApiParam("是否完成尾检") + private Integer isEndCheck; + + @ApiParam("尾检结果") + private List endCheckResult; + + public QcCheckDataResultModel() { + } + + public QcCheckDataResultModel(Integer isFirstCheck, Integer isOnSiteCheck, Integer isEndCheck) { + this.isFirstCheck = isFirstCheck; + this.isOnSiteCheck = isOnSiteCheck; + this.isEndCheck = isEndCheck; + } +} 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 index 5ae7b20..4cfc59e 100644 --- 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 @@ -21,17 +21,20 @@ public class QueueJitActualModule { 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) { + 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/QueueJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java new file mode 100644 index 0000000..83fd71f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 17:17 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class QueueJitPlanModel { + + private MesQueueJitPlan jitPlan; + + private List jitPlanDetails; + + private List jitPlanBoms; +} 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 a624677..5f310b4 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 @@ -79,6 +79,18 @@ public class QueueOrderModel implements Serializable { @ApiParam("产品类型名称") private String pptCode; + @ApiParam("JIT队列批次") + private String jitLotNo; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("客户JIT队列编号") + private String jitActualNo; + + @ApiParam("产品位置") + private String produceCategoryCode; + public QueueOrderModel() { } @@ -162,7 +174,7 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) { + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -170,6 +182,7 @@ public class QueueOrderModel implements Serializable { this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; this.isGroupPrinted = isGroupPrinted; + this.jitActualNo = jitActualNo; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -190,7 +203,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 partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -204,10 +217,12 @@ public class QueueOrderModel implements Serializable { this.finsihQty = finsihQty; this.qty = qty; this.orderNo = orderNo; - this.pptCode=pptCode; + this.pptCode = pptCode; + this.produceCategoryCode = produceCategoryCode; } + //getAlreadyQueueOrderModelNoSn - public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -219,12 +234,12 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.workType = workType; this.orderNo = orderNo; - this.serialNumber=serialNumber; + this.serialNumber = serialNumber; } - //料架分组队列展示组件 + //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { + Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) { this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.orderNo = orderNo; @@ -233,5 +248,18 @@ public class QueueOrderModel implements Serializable { this.partNo = partNo; this.partNameRdd = partNameRdd; this.organizeCode = organizeCode; + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; + } + + // getQueueOrderBySerialNumber + public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) { + this.id = id; + this.queueGroupNo = queueGroupNo; + this.jitLotNo = jitLotNo; + this.vinCode = vinCode; + this.organizeCode = organizeCode; + this.produceCategoryCode = produceCategoryCode; + this.workType = workType; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java index 47b326f..8ef6696 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java @@ -16,27 +16,27 @@ import java.io.Serializable; @Data @Api("JIT发运队列列表Model") public class QueueShippingModel implements Serializable { - private Long id; + private Long id; - @ApiParam("显示颜色") - private String color; + @ApiParam("显示颜色") + private String color; - @ApiParam("队列编号") - private String jisActualNo; + @ApiParam("队列编号") + private String jisActualNo; - @ApiParam("产品位置代码") - private String produceCtgyCode; + @ApiParam("产品位置代码") + private String produceCtgyCode; - @ApiParam("产品位置") - private String prodCfgName; + @ApiParam("产品位置") + private String prodCfgName; - @ApiParam("起始vin") - private String vin; + @ApiParam("起始vin") + private String vin; - @ApiParam("结束vin") - private String endVin; + @ApiParam("结束vin") + private String endVin; - @ApiParam("料架号") - private String queueGroupNo; + @ApiParam("料架号") + private String queueGroupNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RefreshInitModuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RefreshInitModuleModel.java new file mode 100644 index 0000000..0d58bbc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RefreshInitModuleModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class RefreshInitModuleModel implements Serializable { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("用户信息") + private String userInfo; + + @ApiParam("队列展示类型（有序/无序）") + private Object resultObj; + + @ApiParam("展示组件定时刷新频率") + private Integer timer; + + @ApiParam("List字段集") + private List DataAttrList; + + @ApiParam("List结果集") + private List resultList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java new file mode 100644 index 0000000..247288e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RepairAndDefectModel implements Serializable { + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("面位") + private String sideLocation; + + @ApiParam("维修状态") + private Integer repairStatus; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("维修代码") + private String repairCode; + + @ApiParam("维修名称") + private String repairName; + + @ApiParam("缺陷原因代码") + private String dcCode; + + @ApiParam("缺陷原因描述") + private String dcName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java index 73200ff..34d947e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java @@ -41,6 +41,8 @@ public class RequestModel { private ActionRequestModel actionRequestBean;//工单状态 + private String serialNumber;//过程条码 + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { this.queueOrderList = queueOrderList; this.currentSeq = currentSeq; @@ -166,4 +168,8 @@ public class RequestModel { public void setDestStatus(Integer destStatus) { this.destStatus = destStatus; } + + public String getSerialNumber() { return serialNumber; } + + public void setSerialNumber(String serialNumber) { this.serialNumber = serialNumber; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ReworkResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ReworkResultModel.java new file mode 100644 index 0000000..8a0c940 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ReworkResultModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/4/9 19:40 + * @desc + */ +@Data +public class ReworkResultModel { + + @ApiParam("已维修数量") + private Integer alreadyRepairCount; + + @ApiParam("未维修数量") + private Integer notRepairCount; + + @ApiParam("拆解数量") + private Integer dismantleCount; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java new file mode 100644 index 0000000..6fe1eaf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ScatterBomModel implements Serializable { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("个数") + private Double qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java new file mode 100644 index 0000000..e1cb609 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/8 1:22 下午 + * @Modify: + */ +@Data +public class ScatterPartProdCfgModel { + + private Long id; + + private String organizeCode; + + @ApiParam("配置编号") + private String cfgId; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("车型标志值") + private String modelFalgValue; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("等级代码") + private String gradeCode; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("标志位") + private Integer partFlagLocation; + + @ApiParam("标志值") + private String partFlagValue; + + @ApiParam("防错码") + private String pokeYokeFix; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("确认扫描次数") + private Integer checkScanCount; + + @ApiParam("组合码发送顺序") + private Integer sendSeq; + + @ApiParam("黄枪规则") + private Integer yellowGunRule; + + @ApiParam("是否截至顺序号") + private Integer isEndSeq; + + @ApiParam("多媒体插头数量") + private Double multimediaPlusQty; + + public ScatterPartProdCfgModel() {} + + public ScatterPartProdCfgModel(Long id, String workCenterCode, String workCellCode, String partNo, String partName + , String gradeCode, String colorCode, String prodCfgTypeCode, String produceCtgyCode, Double multimediaPlusQty) { + this.id = id; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.partNo = partNo; + this.partName = partName; + this.gradeCode = gradeCode; + this.colorCode = colorCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.produceCtgyCode = produceCtgyCode; + this.multimediaPlusQty = multimediaPlusQty; + } +} 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 new file mode 100644 index 0000000..c6aa422 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesUserSkill; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Description : 人员技能-获取用户信息 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-10-11 11:02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("用户信息model") +public class SkillsUserModel { + + @ApiParam(value ="姓名") + private String userName; + + @ApiParam(value ="工号") + private String userEmpNo; + + @ApiParam("技能矩阵信息") + private List mesUserSkillList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java new file mode 100644 index 0000000..1f6afc7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class SkinCheckModel implements Serializable { + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("生产号") + private String vinCode; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("车型") + private String prodCfgTypeCode; + + @ApiParam("等级") + private String gradeCode; + + @ApiParam("面位") + private String sideLocation; + + // 产品位置图片 + private List produceCtgyPictureList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java new file mode 100644 index 0000000..e16935b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 条码打印模版model + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("条码打印模版model") +public class SnPrintLabelTemplateModel { + + @ApiParam("模版信息") + private MesLabelTemplate labelTemplate; + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("条码类型 10-过程条码，20-产品条码，30-包装条码") + private Integer snType; + + @ApiParam("包装条码层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + + public SnPrintLabelTemplateModel() { + } + + public SnPrintLabelTemplateModel(String organizeCode, String partNo, String custCode, Integer snType, Integer packLevel, MesLabelTemplate labelTemplate) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.custCode = custCode; + this.snType = snType; + this.packLevel = packLevel; + this.labelTemplate = labelTemplate; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.java new file mode 100644 index 0000000..dd94176 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/15 1:35 下午 + * @Modify: + */ +@Data +public class SoapModel { + + private String soapJson; + + private List> soapList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java new file mode 100644 index 0000000..88da5e1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueShippingDetail; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/5/26 18:59 + * @desc + */ +@Data +@Api("散件队列发运model") +public class SpQueueShippingModel { + + @ApiParam("队列编号") + private String jitNo; + + @ApiParam("vin") + private String vin; + + @ApiParam("车号") + private String carNo; + + @ApiParam("等级代码") + private String gradeCode; + + @ApiParam("产品颜色") + private String produceColor; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateDispatchModel.java new file mode 100644 index 0000000..84c3ce7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateDispatchModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/3/13 17:55 + * @desc + */ +@Data +@NoArgsConstructor +public class StateDispatchModel { + + private String statesKey; + + private String firstScanKey; + + private String cellParamKey; + + private String requestBeanKey; + + private String moduleDataMapKey; + + private String scanInfo; + + public StateDispatchModel(String statesKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) { + this.statesKey = statesKey; + this.firstScanKey = firstScanKey; + this.cellParamKey = cellParamKey; + this.requestBeanKey = requestBeanKey; + this.moduleDataMapKey = moduleDataMapKey; + this.scanInfo = scanInfo; + } +} 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 new file mode 100644 index 0000000..41bf108 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/4/14 15:18 + * @desc + */ +@Data +@Deprecated +public class StateModel { + + private String stateCode; + + private String stateName; + + private String routeCode; + + private String smCode; +} 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 21d65dd..62c4058 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 @@ -1,10 +1,9 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +33,9 @@ public class StationRequestBean implements Serializable { @ApiParam("物料号") private String partNo; + @ApiParam("生产类型") + private String pptCode; + @ApiParam("组织代码") private String organizeCode; @@ -58,6 +60,9 @@ public class StationRequestBean implements Serializable { @ApiParam("客户端信息") private String clientInfo; + @ApiParam("websocket session连接id") + private String sessionId; + @ApiParam("用户信息") private String userInfo; @@ -84,6 +89,9 @@ public class StationRequestBean implements Serializable { @ApiParam("业务类型") private String busiType; + @ApiParam("界面类型") + private String interfaceType; + @ApiParam("工位监听类型") private String monitorType; @@ -105,6 +113,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步列表") private List stepList; + @ApiParam("工位参数") + private Map wcpcMap; + @ApiParam("生产主队列编号") private String orderNo; @@ -120,9 +131,55 @@ public class StationRequestBean implements Serializable { @ApiParam("当前流程状态") private MesStateMachineStatus curFsmState; + @JsonIgnore @ApiParam("展示组件") private Object moduleService; + @ApiParam("客户工厂代码") + private String customerFactoryCode; + + @ApiParam("工步弹框参数") + private String stepDialogParam; + + @ApiParam("工步弹框状态") + private Boolean stepDialogStatus = false; + + @ApiParam("是否按时完成") + private Integer isOnTimeComplete = 1; + + @ApiParam("是否是调度程序调用") + private boolean isDispatcherInvoke; + + @ApiParam("工位剩余时间") + private Long remainWorkTime; + + @ApiParam("停机类型") + private MesPcnEnumUtil.STOP_MACHINE_TYPE stopMachineType; + + @ApiParam("提醒时间点") + private Integer remindTime; + + @ApiParam("是否操作超时") + private Integer isTimeOut = 2; + + @ApiParam("特殊展示数据") + private Map specialDisplayMap = new HashMap<>(); + + @ApiParam("物料名称") + private String partName; + + @ApiParam("状态机代码") + private String smCode; + + @ApiParam("区域代码") + private String areaCode; + + @ApiParam("数量") + private Integer qty; + + @ApiParam("班次名称") + private String shiftName; + @Override public String toString() { return "StationRequestBean{" + 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 bf849fe..4ce479b 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 @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -52,4 +53,16 @@ public class StationResultBean implements Serializable { @ApiParam("多个数据集") private List> stationResultBeans; + + @ApiParam("定制页面名称") + private String customPageName; + + @ApiParam("特殊展示数据") + private Object specialDisplayData; + + @ApiParam("工位参数") + private Map wcpcMap = new HashMap<>(); + + @ApiParam("定时秒数") + private Integer timer; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index ec019ee..a3e7ec9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -22,6 +22,10 @@ public class StepDispatchModel { private String moduleDataMapKey; + private String pfKey; + + private String dlKey; + private String scanInfo; public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) { 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 8adee52..4d37f07 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 @@ -73,6 +73,9 @@ public class StepModel implements Serializable { @ApiParam("参数代码") private String paramCode; + @ApiParam("工步展示名称") + private String stepDisplayName; + /** * 工作单元代码 */ @@ -83,7 +86,7 @@ public class StepModel implements Serializable { } public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) { + String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) { this.stepCode = stepCode; this.stepName = stepName; this.stepText = stepText; @@ -93,6 +96,7 @@ public class StepModel implements Serializable { this.processCode = processCode; this.stepSeq = stepSeq; this.paramCode = paramCode; + this.stepDisplayName = stepDisplayName; this.workCellCode = workCellCode; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java index a2464b7..509e085 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java @@ -16,8 +16,8 @@ import java.util.Map; @Data @Api("下拉工步参数对象") public class StepParamsModel implements Serializable { - private static final long serialVersionUID = -6361645141217616499L; + private static final long serialVersionUID = -4418226170535844209L; @ApiParam("参数代码") private String paramCode; 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 0bc1675..2ac3a02 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 @@ -97,8 +97,15 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("车型代码") private String carModuleCode; @ApiParam("上一个序列号") - private Double lastQueDetailSeq; + private String lastQueDetailSeq; @ApiParam("包装数量") private Integer pgCodeNum; + @ApiParam("批次") + private String lotNo; + @ApiParam("备注") + private String memo; + @ApiParam("产品配置名称") + private String prodCfgCodeName; + } 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 77c8985..ffe3af7 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import io.swagger.annotations.Api; import lombok.Data; @@ -18,12 +19,20 @@ public class StepResult { private String msg; + private boolean needStop; + private StationRequestBean stationRequestBean; public static StepResult getNonComplete() { return new StepResult(false, ""); } + public static StepResult getNonCompleteStop() { + StepResult result = new StepResult(false, ""); + result.setNeedStop(true); + return result; + } + public static StepResult getNonComplete(StationRequestBean requestBean) { return new StepResult(false, ""); } @@ -36,6 +45,12 @@ public class StepResult { return new StepResult(false, reqBean); } + public static StepResult getNonCompleteReqBeanStop(StationRequestBean reqBean) { + StepResult stepResult = new StepResult(false, reqBean); + stepResult.setNeedStop(true); + return stepResult; + } + public static StepResult getNonCompleteData(T data) { return new StepResult(false, data, ""); } @@ -44,6 +59,12 @@ public class StepResult { return new StepResult(false, msg); } + public static StepResult getNonCompleteStop(String msg) { + StepResult stepResult = new StepResult(false, msg); + stepResult.setNeedStop(true); + return stepResult; + } + public static StepResult getSuccessComplete(String msg) { return new StepResult(true, msg); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeModuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeModuleModel.java new file mode 100644 index 0000000..2e6258f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeModuleModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesPlc; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/7/21 00:33 + * @desc + */ +@Data +public class TimeModuleModel { + + private MesPcnEnumUtil timeWay; + + private Integer startTime; + + private Integer endTime; + + private Integer remindTime; + + private String remindContent; + + private String needTimeOutRecord; + + private MesPlc agvRunningPlc; + + private MesPlc mesWriteFlagPlc; + + private MesPlc plcReadFlagPlc; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java index e7c08e8..af5d0be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesWcCheckRecord; import io.swagger.annotations.Api; @@ -36,6 +37,9 @@ public class WcCheckModel { @ApiParam("是否通过") private Integer isPass; + @ApiParam("输入框是否可以重选") + private Integer isEnable; + @ApiParam("开线信号") private Integer onlineSignal; @@ -53,6 +57,7 @@ public class WcCheckModel { public WcCheckModel initialWcCheckModel() { WcCheckModel wcCheckModel = new WcCheckModel(); + wcCheckModel.setIsEnable(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); onlineSignalEqu = new MesWcCheckRecord(); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkCellPointInfoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkCellPointInfoModel.java new file mode 100644 index 0000000..a809539 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkCellPointInfoModel.java @@ -0,0 +1,34 @@ +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 + * @CreateDate: 2020/07/25 14:21 + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工位队列信息model") +public class WorkCellPointInfoModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("Vin") + private String vinCode; + + @ApiParam("组织代码") + private String organizeCode; +} 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 new file mode 100644 index 0000000..fb93d98 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java @@ -0,0 +1,65 @@ +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 : 总装生产工单导入模板 +* @Reference : +* @author: jessica.chen +* @date: 2020/6/12 17:10 +* @Modify: +*/ + +@Data +@Api(value="总装生产工单导入模板",description = "总装生产工单导入模板") +public class ZzMesWorkOrderModel extends BaseBean { + + private static final long serialVersionUID = 5790342327875846646L; + @ApiParam(value = "日期") + @AnnoOutputColumn + private String workDate; + + @ApiParam(value = "班次") + @AnnoOutputColumn + private String shiftName; + + @ApiParam(value = "项目名称") + @AnnoOutputColumn(required = false) + private String prodCfgTypeName; + + @ApiParam(value = "SAP物料号") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "产品名称") + @AnnoOutputColumn(required = false) + private String partName; + + @ApiParam(value = "产线代码") + private String workCenterCode; + + @ApiParam(value = "计划数") + @AnnoOutputColumn + private String qty; + + @ApiParam(value = "标包") + @AnnoOutputColumn(required = false) + private String snp; + + @ApiParam(value = "包装规格") + @AnnoOutputColumn + private String packageSpec; + + @ApiParam(value = "备注") + @AnnoOutputColumn(required = false) + private String memo; + + @ApiParam(value = "行数") + @AnnoOutputColumn(required = false) + private Integer rows; + +} 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/mgnbj/CodeRule.java new file mode 100644 index 0000000..50601e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:36 + * @desc + */ +@Data +@XStreamAlias("coderule") +public class CodeRule implements Serializable { + private static final long serialVersionUID = 6090471998165282835L; + + @XStreamAlias("code") + private String code; + + @XStreamAlias("type") + private String type; +} 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/mgnbj/Document.java new file mode 100644 index 0000000..cfe4ed4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:32 + * @desc + */ +@Data +@XStreamAlias("document") +public class Document implements Serializable { + private static final long serialVersionUID = 2814403876905527454L; + + @XStreamAlias("head") + private Head head; + + @XStreamAlias("message") + private Message message; +} 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/mgnbj/Head.java new file mode 100644 index 0000000..4d2528a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:32 + * @desc + */ +@Data +@XStreamAlias("head") +public class Head implements Serializable { + private static final long serialVersionUID = 7799977037966652535L; + + @XStreamAlias("customerno") + private String customerno; + + @XStreamAlias("customername") + private String customername; + + @XStreamAlias("plantcode") + private String plantcode; + + @XStreamAlias("plantname") + private String plantname; + + @XStreamAlias("suppliernumber") + private String suppliernumber; + + @XStreamAlias("suppliername") + private String suppliername; + + @XStreamAlias("status") + private String status; + +} 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/mgnbj/Message.java new file mode 100644 index 0000000..ef61c84 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamImplicit; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:33 + * @desc + */ +@Data +@XStreamAlias("message") +public class Message implements Serializable { + private static final long serialVersionUID = 8628748312808962449L; + + @XStreamImplicit + private List pns; + + @XStreamAlias("customerno") + private String customerNo; + + @XStreamAlias("customername") + private String customerName; + + @XStreamAlias("plantcode") + private String plantCode; + + @XStreamAlias("plantname") + private String plantName; + + @XStreamAlias("suppliernumber") + private String supplierNumber; + + @XStreamAlias("suppliername") + private String supplierName; + + @XStreamAlias("status") + private String status; + + @XStreamAlias("sequenceno") + private String sequenceNo; + + @XStreamAlias("vin") + private String vin; + + @XStreamAlias("date") + private String date; + + +} 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/mgnbj/MgnBjJitPlanModel.java new file mode 100644 index 0000000..a493487 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author Wynne.Lu + * @date 2020/6/27 15:39 + * @desc + */ +@Data +@NoArgsConstructor +public class MgnBjJitPlanModel { + + private String org; + + private String userInfo; + + private List flPnParts; + + private String flPnRecipe; + + private List frPnParts; + + private String frPnRecipe; + + private List rlPnParts; + + private String rlPnRecipe; + + private List rrPnParts; + + private String rrPnRecipe; + + private Map> groupPartsMap = new HashMap<>(); + + public void setFlPnParts(List flPnParts) { + this.groupPartsMap.put("FL", flPnParts); + this.flPnRecipe = getGroupRecipe(flPnParts); + this.flPnParts = flPnParts; + } + + public void setFrPnParts(List frPnParts) { + this.groupPartsMap.put("FR", frPnParts); + this.frPnRecipe = getGroupRecipe(frPnParts); + this.frPnParts = frPnParts; + } + + public void setRlPnParts(List rlPnParts) { + this.groupPartsMap.put("RL", rlPnParts); + this.rlPnRecipe = getGroupRecipe(rlPnParts); + this.rlPnParts = rlPnParts; + } + + public void setRrPnParts(List rrPnParts) { + this.groupPartsMap.put("RR", rrPnParts); + this.rrPnRecipe = getGroupRecipe(rrPnParts); + this.rrPnParts = rrPnParts; + } + + public MgnBjJitPlanModel(String org, String userInfo) { + this.org = org; + this.userInfo = userInfo; + } + + private String getGroupRecipe(List groupParts) { + List groupPartsRecipe = groupParts.stream().filter(d -> StringUtils.isNotBlank(d.getRecipeSeq())) + .sorted(Comparator.comparing(Part::getRecipeSeq)) + .map(Part::getRecipeItem) + .collect(Collectors.toList()); + return String.join("", groupPartsRecipe); + } +} 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/mgnbj/MgnBjRecipePartsModel.java new file mode 100644 index 0000000..e61fa14 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/30 15:24 + * @desc + */ +@Data +public class MgnBjRecipePartsModel { + + private String location; + + private String recipe; + + private List parts; +} 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/mgnbj/OptionCode.java new file mode 100644 index 0000000..8a7070f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:36 + * @desc + */ +@Data +@XStreamAlias("optioncode") +public class OptionCode implements Serializable { + private static final long serialVersionUID = -4790746701135990728L; + + @XStreamAlias("coderule") + private List codeRules; + +} 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/mgnbj/Part.java new file mode 100644 index 0000000..f6024e5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:35 + * @desc + */ +@Data +@XStreamAlias("part") +public class Part implements Serializable { + private static final long serialVersionUID = -8947770816754458901L; + + @XStreamAlias("item") + private String item; + + @XStreamAlias("dock") + private String dock; + + @XStreamAlias("qty") + private String qty; + + @ApiParam("是否是baseModule") + private boolean isBaseModule; + + @ApiParam("前左数量") + private String flQty; + + @ApiParam("前右数量") + private String frQty; + + @ApiParam("后左数量") + private String rlQty; + + @ApiParam("后右数量") + private String rrQty; + + @ApiParam("产品位置") + private String produceCtgyCode; + + @ApiParam("配方") + private String recipeItem; + + @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/mgnbj/Parts.java new file mode 100644 index 0000000..740b5a0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:35 + * @desc + */ +@Data +@XStreamAlias("parts") +public class Parts implements Serializable { + private static final long serialVersionUID = -7294906162624860932L; + + @XStreamAlias("parts") + private List parts; +} 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/mgnbj/Pn.java new file mode 100644 index 0000000..c1d74b6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:33 + * @desc + */ +@Data +@XStreamAlias("PN") +public class Pn implements Serializable { + private static final long serialVersionUID = 194164925380216505L; + + @XStreamAlias("vin") + private String vin; + + @XStreamAlias("seqno") + private String seqno; + + @XStreamAlias("date") + private String date; + + @XStreamAlias("vehicleCode") + private String vehicleCode; + + @XStreamAlias("version") + private String version; + + @XStreamAlias("parts") + private List parts; + + @XStreamAlias("optioncode") + private List codeRules; + + @ApiParam("新vin号") + private String newVin; + + @ApiParam("新vin号") + private Boolean result; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateDetailsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateDetailsRepository.java new file mode 100644 index 0000000..164974a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateDetailsRepository.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.template.BasImportTemplateDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板明细数据操作仓库 + * @Reference : + * @Author : adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Repository +public interface BasImportTemplateDetailsRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateRepository.java new file mode 100644 index 0000000..e5d8957 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateRepository.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.template.BasImportTemplate; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板数据操作仓库 + * @Reference : + * @Author : adair.song --复用--> siliter.yuan + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Repository +public interface BasImportTemplateRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.java new file mode 100644 index 0000000..3da78a6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.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.MesEquipment; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface EquOperationStatusMonitorRepository 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 new file mode 100644 index 0000000..db00b1d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java @@ -0,0 +1,38 @@ +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 java.util.List; + +/** + * @Description : 脚本引擎持久化类 + * @Reference : + * @Author : Rock.Yu + * @CreateDate : 2019-04-16 09:53 + * @Modify: + **/ +public interface IEngineScriptPersistenceRepository extends BaseRepository { + /** + * 按照工厂代码和脚本编号查询脚本实体对象 + * @param organizeCode 工厂代码 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo); + + /** + * 按照脚本编号查询脚本实体对象 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByScriptNo(String scriptNo); + + /** + * 查找所有的脚本语言类型 + * @return 数据库中已经存在的脚本语言类型 + */ + @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType") + List findGroupByLanguageType(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java new file mode 100644 index 0000000..6e3b966 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.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.IfDefectData; +import org.springframework.stereotype.Repository; + +/** + * @Description : if不良信息接口 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 16:49 + * @Modify: + **/ +@Repository +public interface IfDefectDataRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java new file mode 100644 index 0000000..63e234d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.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.IfEdiInitialData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface IfEdiInitialDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java new file mode 100644 index 0000000..64fe700 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.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.IfPackageDetail; +import cn.estsh.i3plus.pojo.mes.bean.IfQcOrder; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfQcOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java new file mode 100644 index 0000000..1b3b78f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.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.IfQcResult; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfQcResultRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfRawPartDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfRawPartDataRepository.java new file mode 100644 index 0000000..a7e492a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfRawPartDataRepository.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.IfRawPartData; + +/** + * @Description : + * @Reference : + * @CreateDate : 2020-04-21 09:53 + * @Modify: + **/ +public interface IfRawPartDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java new file mode 100644 index 0000000..4acb5ea --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.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.MesAgvStopRecord; + +/** + * @Description: 停机记录数据操作层 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020\06\03 10:34 + * @Modify: + **/ +public interface MesAgvStopRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindHistoryRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindHistoryRepository.java new file mode 100644 index 0000000..a0f9e77 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindHistoryRepository.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.MesBlindHistory; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesBlindHistoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindRuleRepository.java new file mode 100644 index 0000000..6961ec5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindRuleRepository.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.MesBlindRule; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesBlindRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindTopicSettingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindTopicSettingRepository.java new file mode 100644 index 0000000..3c97e0f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindTopicSettingRepository.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.MesBlindHistory; +import cn.estsh.i3plus.pojo.mes.bean.MesBlindTopicSetting; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesBlindTopicSettingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.java new file mode 100644 index 0000000..41b78cb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.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.MesBoardEquDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:49 上午 + * @Modify: + */ +@Repository +public interface MesBoardEquDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.java new file mode 100644 index 0000000..e3d77fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.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.MesBoardEquStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:50 上午 + * @Modify: + */ +@Repository +public interface MesBoardEquStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.java new file mode 100644 index 0000000..5e85eb7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.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.MesBoardMonitorObject; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:51 上午 + * @Modify: + */ +@Repository +public interface MesBoardMonitorObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.java new file mode 100644 index 0000000..1241b79 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.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.MesBoardPicture; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:52 上午 + * @Modify: + */ +@Repository +public interface MesBoardPictureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.java new file mode 100644 index 0000000..01bd1f8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.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.MesBoardPlanCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:53 上午 + * @Modify: + */ +@Repository +public interface MesBoardPlanCapacityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardRepository.java new file mode 100644 index 0000000..8c1822d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardRepository.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.MesBoard; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.java new file mode 100644 index 0000000..854cf62 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.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.MesBoardShift; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:59 上午 + * @Modify: + */ +@Repository +public interface MesBoardShiftRepository 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/MesBoardShiftSectionCapacityRepository.java new file mode 100644 index 0000000..209e270 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.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.MesBoardShiftSectionCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 11:07 上午 + * @Modify: + */ +@Repository +public interface MesBoardShiftSectionCapacityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.java new file mode 100644 index 0000000..ab6817b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.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.MesBoardShiftSection; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 11:00 上午 + * @Modify: + */ +@Repository +public interface MesBoardShiftSectionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.java new file mode 100644 index 0000000..573f19b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.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.MesBoardTypeBaseCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 9:55 下午 + * @Modify: + */ +@Repository +public interface MesBoardTypeBaseCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.java new file mode 100644 index 0000000..2217998 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.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.MesBoardType; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 11:11 上午 + * @Modify: + */ +@Repository +public interface MesBoardTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java new file mode 100644 index 0000000..f403ceb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.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.MesBoardWorkCell; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: adair.song + * @Date: 2020/06/04 13:23 + * @Modify: + */ +@Repository +public interface MesBoardWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java new file mode 100644 index 0000000..5cb4185 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.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.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/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java new file mode 100644 index 0000000..9553592 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.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.IfDismantleRecord; +import cn.estsh.i3plus.pojo.mes.bean.MesContainer; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:33 + * @Modify: + **/ +@Repository +public interface MesContainerRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.java new file mode 100644 index 0000000..a3792ea --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.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.MesContainerType; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/24 3:34 下午 + * @Modify: + */ +@Repository +public interface MesContainerTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java new file mode 100644 index 0000000..73d98eb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.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.MesBom; +import cn.estsh.i3plus.pojo.mes.bean.MesDataAuth; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesDataAuthRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java new file mode 100644 index 0000000..031775b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.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.MesEdiParserConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesEdiParserConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java new file mode 100644 index 0000000..550230a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.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.MesEquFaultCause; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:08 + * @Modify: + **/ +public interface MesEquFaultCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java new file mode 100644 index 0000000..9c61d73 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.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.MesEquFaultMethod; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:07 + * @Modify: + **/ +public interface MesEquFaultMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java new file mode 100644 index 0000000..dd0473e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.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.MesEquFaultPhenomenon; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:05 + * @Modify: + **/ +public interface MesEquFaultPhenomenonRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.java new file mode 100644 index 0000000..2f6f967 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.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.MesExtendObjectCfg; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesExtendObjectCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGunCalibrationRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGunCalibrationRecordRepository.java new file mode 100644 index 0000000..e711363 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGunCalibrationRecordRepository.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.MesGunCalibrationRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/27 2:39 下午 + * @Modify: + */ +public interface MesGunCalibrationRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.java new file mode 100644 index 0000000..c426600 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.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.dbinterface.MesInterfaceDataMapper; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface MesInterfaceDataMapperRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java new file mode 100644 index 0000000..7b01dcf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.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.MesJitIssueCfg; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:21 下午 + * @Modify: + */ +public interface MesJitIssueCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java new file mode 100644 index 0000000..afc65a8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.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.MesJitLockCache; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:23 下午 + * @Modify: + */ +public interface MesJitLockCacheRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java new file mode 100644 index 0000000..57d8fcf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.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.MesJitOrderCache; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:22 下午 + * @Modify: + */ +public interface MesJitOrderCacheRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.java new file mode 100644 index 0000000..adc7e25 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.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.IfPackageDetail; +import cn.estsh.i3plus.pojo.mes.bean.MesLoopQcGenerateDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesLoopQcGenerateDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesModelGradeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesModelGradeRepository.java new file mode 100644 index 0000000..4ec9c67 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesModelGradeRepository.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.MesModelGrade; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesModelGradeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.java new file mode 100644 index 0000000..0d17747 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.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.MesMouldPart; +import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesMouldPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.java new file mode 100644 index 0000000..427d72e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.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.MesOee; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:04 下午 + * @Modify: + */ +@Repository +public interface MesOeeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java new file mode 100644 index 0000000..80e3159 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.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.MesOffLineRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/22 11:10 上午 + * @Modify: + */ +@Repository +public interface MesOffLineRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.java new file mode 100644 index 0000000..e8add57 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.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.MesOperateObjectAttribute; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:05 下午 + * @Modify: + */ +@Repository +public interface MesOperateObjectAttributeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.java new file mode 100644 index 0000000..70241ae --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.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.MesOperateObjectCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:04 下午 + * @Modify: + */ +@Repository +public interface MesOperateObjectCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.java new file mode 100644 index 0000000..1d904cf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.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.MesOperateObject; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:05 下午 + * @Modify: + */ +@Repository +public interface MesOperateObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartColorRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartColorRepository.java new file mode 100644 index 0000000..2f62bb1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartColorRepository.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.MesPartColor; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesPartColorRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.java new file mode 100644 index 0000000..9d81a01 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.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.MesPartProdCfgType; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate: 2020\06\17 14:01 + */ +@Repository +public interface MesPartProdCfgTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java new file mode 100644 index 0000000..881d274 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.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.MesPartSample; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartSampleRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java new file mode 100644 index 0000000..fc15bd5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.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.MesPartStockSchedule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/12 5:57 下午 + * @Modify: + */ +@Repository +public interface MesPartStockScheduleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.java new file mode 100644 index 0000000..4f17599 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.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.MesPart; +import cn.estsh.i3plus.pojo.mes.bean.MesPartTakt; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartTaktRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdModelCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdModelCfgRepository.java new file mode 100644 index 0000000..0fc9989 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdModelCfgRepository.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.MesProdModelCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesProdModelCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.java new file mode 100644 index 0000000..80e0299 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.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.MesProdWorkCenter; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesProdWorkCenterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceErrorRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceErrorRecordRepository.java new file mode 100644 index 0000000..b9d5ba2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceErrorRecordRepository.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.MesProduceErrorRecord; + +/** + * @Description :IF_JIT发运数据 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesProduceErrorRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java new file mode 100644 index 0000000..d9c9157 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.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.MesQcOrderAccessory; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderAccessoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java new file mode 100644 index 0000000..794d6ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.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.MesQcOrderDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesQcOrderDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java new file mode 100644 index 0000000..f503196 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.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.MesQcOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesQcOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualBomRepository.java new file mode 100644 index 0000000..5f8dc01 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualBomRepository.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.MesQueueJitActualBom; +import org.springframework.stereotype.Repository; + +/** + * @author Wynne.Lu + * @date 2020/5/21 20:17 + * @desc + */ +@Repository +public interface MesQueueJitActualBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderBomRepository.java new file mode 100644 index 0000000..4abfb12 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderBomRepository.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.MesQueueOrderBom; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQueueOrderBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.java new file mode 100644 index 0000000..9aeef83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.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.MesQueueShippingDetail; + +/** + * @Description :发运队列明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueShippingDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.java new file mode 100644 index 0000000..a5ffa65 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.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.MesQueueShipping; + +/** + * @Description : + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueShippingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.java new file mode 100644 index 0000000..2ffeac0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.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.MesScatterBomCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate: 2020\06\17 14:01 + */ +@Repository +public interface MesScatterBomCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartCfgBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartCfgBomRepository.java new file mode 100644 index 0000000..179a7b7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartCfgBomRepository.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.MesScatterPartCfgBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesScatterPartCfgBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartProdCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartProdCfgRepository.java new file mode 100644 index 0000000..ee231bf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartProdCfgRepository.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.MesScatterPartProdCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-05-15 + * @Modify: + **/ +@Repository +public interface MesScatterPartProdCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.java new file mode 100644 index 0000000..d5ca681 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.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.MesScriptPersistence; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:03 下午 + * @Modify: + */ +@Repository +public interface MesScriptPersistenceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassDetailRepository.java new file mode 100644 index 0000000..e45dafa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassDetailRepository.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.MesShiftClassDetail; + +/** + * @Description:班制维护 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesShiftClassDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassRepository.java new file mode 100644 index 0000000..0f4fc24 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassRepository.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.MesShiftClass; + +/** + * @Description:班制维护 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesShiftClassRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSkillsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSkillsRepository.java new file mode 100644 index 0000000..c7bd02e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSkillsRepository.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.MesSkills; + +/** + * @Description:人员技能管理 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesSkillsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepGroupRepository.java new file mode 100644 index 0000000..ee5c3a3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStepGroupRepository.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.MesStepGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java new file mode 100644 index 0000000..5a4ca58 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.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.MesSubPart; +import org.springframework.stereotype.Repository; + +/** + * @author Wynne.Lu + * @date 2020/6/7 15:23 + * @desc + */ +@Repository +public interface MesSubPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUserSkillRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUserSkillRepository.java new file mode 100644 index 0000000..3e78cb8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUserSkillRepository.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.MesUserSkill; + +/** + * @Description:人员技能管理 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesUserSkillRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.java new file mode 100644 index 0000000..6ac1635 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.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.MesWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/26 11:48 上午 + * @Modify: + */ +@Repository +public interface MesWindowRepository 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 new file mode 100644 index 0000000..43b09f2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.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.template.MesWorkCellDefect; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/17 8:46 下午 + * @Modify: + */ +@Repository +public interface MesWorkCellDefectRepository extends BaseRepository { +} 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 new file mode 100644 index 0000000..be056c0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.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.template.MesWorkCellDefect; +import org.springframework.stereotype.Repository; +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/17 8:46 下午 + * @Modify: + */ +@Repository +public interface MesWorkCellDefectsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellSkillRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellSkillRepository.java new file mode 100644 index 0000000..e8f783f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellSkillRepository.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.MesWorkCellSkill; + +/** + * @Description:人员技能管理 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesWorkCellSkillRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkDayRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkDayRepository.java new file mode 100644 index 0000000..abc6bf9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkDayRepository.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.MesWorkDay; + +/** + * @Description:人员技能管理 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesWorkDayRepository 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 b408ff1..cae893e 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 @@ -7,8 +7,15 @@ 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 org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import java.util.List; + /** * @Description: * @Reference: Mes 条件封装 @@ -289,8 +296,15 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); + } + if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + } return packBean; } @@ -303,13 +317,13 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); } if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCell.getAreaCode(), "areaCode", packBean); } if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); } return packBean; @@ -926,6 +940,68 @@ public class MesHqlPack { } /** + * MES 检验单查询条件封装 + * + * @param qcOrder + * @return + */ + public static DdlPackBean getMesQcOrder(MesQcOrder qcOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrder, organizeCode); + if (!StringUtils.isEmpty(qcOrder.getOrderNo())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(qcOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getPartName())) { + DdlPreparedPack.getStringLikerPack(qcOrder.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getSupplierCode())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getSupplierCode(), "supplierCode", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getCheckType())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean); + } + // 时间段查询 + if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrder.getCreateDateTimeStart(), + qcOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(qcOrder.getModifyDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getModifyDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrder.getModifyDateTimeStart(), + qcOrder.getModifyDateTimeEnd(), + "modifyDatetime", packBean, true); + } + return packBean; + } + + /** + * MES 检验单查询条件封装 + * + * @param qcOrderDetail + * @return + */ + 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.getCheckType())) { + DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean); + } + return packBean; + } + + /** * MES 物料信息查询条件封装 * * @param part @@ -1163,7 +1239,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean); } if (!StringUtils.isEmpty(numberRule.getPrefix())) { - DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean); + DdlPreparedPack.getStringLikerPack(numberRule.getPrefix(), "prefix", packBean); } if (null != numberRule.getIsCycle()) { DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean); @@ -1276,7 +1352,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean); } if (!StringUtils.isEmpty(mesPlc.getTagAddress())) { - DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean); + DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean); } if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean); @@ -1284,6 +1360,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPlc.getPlcCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean); } + if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getEquipmentCode(), "equipmentCode", packBean); + } + if (!StringUtils.isEmpty(mesPlc.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getObjectCode(), "objectCode", packBean); + } return packBean; } @@ -1323,8 +1405,50 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmName(), "fmName", packBean); } - if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); + if (!StringUtils.isEmpty(mesFaultMethod.getFmType())) { + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmType(), "fmType", packBean); + } + return packBean; + } + + /** + * MES 设备故障处理措施查询条件封装 + * + * @param mesEquFaultMethod + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultMethod(MesEquFaultMethod mesEquFaultMethod, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultMethod, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultMethod.getFmCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmCode(), "fmCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultMethod.getFmName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmName(), "fmName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultMethod.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getEquipmentCode(), "equipmentCode", packBean); + } + return packBean; + } + + /** + * MES 设备故障原因查询条件封装 + * + * @param mesEquFaultCause + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultCause(MesEquFaultCause mesEquFaultCause, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultCause, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultCause.getFcCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcCode(), "fcCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultCause.getFcName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcName(), "fcName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultCause.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getEquipmentCode(), "equipmentCode", packBean); } return packBean; } @@ -1344,8 +1468,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcName(), "fcName", packBean); } - if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); + if (!StringUtils.isEmpty(mesFaultCause.getFcType())) { + DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcType(), "fcType", packBean); } return packBean; } @@ -1365,8 +1489,29 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); } - if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); + if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpType())) { + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpType(), "fpType", packBean); + } + return packBean; + } + + /** + * MES 设备故障现象查询条件封装 + * + * @param mesEquFaultPhenomenon + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultPhenomenon(MesEquFaultPhenomenon mesEquFaultPhenomenon, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultPhenomenon, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpCode(), "fpCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpName(), "fpName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getEquipmentCode(), "equipmentCode", packBean); } return packBean; } @@ -1390,7 +1535,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); } if (mesQcCheckStandard.getCheckType() != null) { - DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); + DdlPreparedPack.getNumEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); } if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) { DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean); @@ -1402,7 +1547,6 @@ public class MesHqlPack { } /** - * <<<<<<< Updated upstream * MES 缺陷查询条件封装 * * @param mesDefect @@ -1881,11 +2025,14 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) { + public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode, List serialNumbers) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode); if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) { DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean); } + if (!CollectionUtils.isEmpty(serialNumbers)) { + DdlPreparedPack.getInPackList(serialNumbers, "serialNumber", packBean); + } if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) { DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean); } @@ -1910,7 +2057,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean); } - if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesProdBindRecord.getCreateDateTimeStart(), mesProdBindRecord.getCreateDateTimeEnd(), @@ -2249,19 +2396,20 @@ public class MesHqlPack { /** * 界面组件配置 + * * @param windowModule * @param organizeCode * @return */ public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode); - if(!StringUtils.isEmpty(windowModule.getWindowNo())){ + if (!StringUtils.isEmpty(windowModule.getWindowNo())) { DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean); } - if(!StringUtils.isEmpty(windowModule.getModuleCode())){ + if (!StringUtils.isEmpty(windowModule.getModuleCode())) { DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean); } - if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){ + if (!StringUtils.isEmpty(windowModule.getWindowModuleBack())) { DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean); } return packBean; @@ -2269,22 +2417,23 @@ public class MesHqlPack { /** * 界面组件参数配置 + * * @param windowModuleParam * @param organizeCode * @return */ public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode); - if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){ + if (!StringUtils.isEmpty(windowModuleParam.getWindowNo())) { DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean); } - if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){ + if (!StringUtils.isEmpty(windowModuleParam.getModuleCode())) { DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean); } - if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){ + if (!StringUtils.isEmpty(windowModuleParam.getParamCode())) { DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean); } - if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){ + if (!StringUtils.isEmpty(windowModuleParam.getParamValue())) { DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean); } return packBean; @@ -2292,24 +2441,811 @@ public class MesHqlPack { /** * 数据预警配置 + * * @param dataWarning * @param organizeCode * @return */ public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode); - if(!StringUtils.isEmpty(dataWarning.getObjectCode())){ + if (!StringUtils.isEmpty(dataWarning.getObjectCode())) { DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean); } - if(!StringUtils.isEmpty(dataWarning.getWarningRule())){ + if (!StringUtils.isEmpty(dataWarning.getWarningRule())) { DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean); } - if(!StringUtils.isEmpty(dataWarning.getWarningItem())){ + if (!StringUtils.isEmpty(dataWarning.getWarningItem())) { DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean); } - if(!StringUtils.isEmpty(dataWarning.getInformMode())){ + if (!StringUtils.isEmpty(dataWarning.getInformMode())) { DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean); } return packBean; } + + /** + * 接口映射分页查询条件 + * + * @param mesInterfaceDataMapper + * @return + */ + public static DdlPackBean packHqlMesInterfaceDataMapper(MesInterfaceDataMapper mesInterfaceDataMapper) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getSrcTableName(), "srcTableName", result); + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getDestBeanName(), "destBeanName", result); + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getBusiRoute(), "busiRoute", result); + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getGroupName(), "groupName", result); + + getStringBuilderPack(mesInterfaceDataMapper, result); + + return result; + } + + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (org.apache.commons.lang3.StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + + DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); + if (org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); + } + // 封装有效状态、删除状态、创建人和创建时间 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + + /** + * 按条件分页查询产品条码补打印数据 + * + * @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); + } + DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintStatus(), "printStatus", packBean); + DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", 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; + } + + public static DdlPackBean getMesPartFormula(MesPartFormula mesPartFormula) { + DdlPackBean packBean = getAllBaseData(mesPartFormula.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesPartFormula.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(mesPartFormula.getFormulaType(), "formulaType", packBean); + DdlPreparedPack.getStringLikerPack(mesPartFormula.getFormulaContent(), "formulaContent", packBean); + DdlPreparedPack.getNumEqualPack(mesPartFormula.getIsValid(), "isValid", packBean); + return packBean; + } + + /** + * 看板 + * + * @param board + * @param organizeCode + * @return + */ + public static DdlPackBean getMesBoard(MesBoard board, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(board, organizeCode); + if (!StringUtils.isEmpty(board.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(board.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(board.getBoardName())) { + DdlPreparedPack.getStringLikerPack(board.getBoardName(), "boardName", packBean); + } + if (!StringUtils.isEmpty(board.getBoardType())) { + DdlPreparedPack.getStringLikerPack(board.getBoardType(), "boardType", packBean); + } + return packBean; + } + + /** + * 散件产品组配置 + * + * @param mesProdScatterDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesScatterDetail(MesProdScatterDetail mesProdScatterDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdScatterDetail, organizeCode); + if (!StringUtils.isEmpty(mesProdScatterDetail.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getProduceCtgyCode())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getSpCfgCode())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getSpCfgCode(), "spCfgCode", packBean); + } + return packBean; + } + + public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { + DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); + DdlPreparedPack.getNumEqualPack(mesBoardEquDetail.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesBoardEquStatus(MesBoardEquStatus mesBoardEquStatus) { + DdlPackBean packBean = getAllBaseData(mesBoardEquStatus.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesBoardEquStatus.getBoardCode(), "boardCode", packBean); + DdlPreparedPack.getNumEqualPack(mesBoardEquStatus.getIsValid(), "isValid", packBean); + return packBean; + } + + /** + * MES 人员技能 + * + * @param mesSkills + * @param organizeCode + * @return + */ + public static DdlPackBean getMesSkills(MesSkills mesSkills, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesSkills, organizeCode); + if (!StringUtils.isEmpty(mesSkills.getSkillCode())) { + DdlPreparedPack.getStringLikerPack(mesSkills.getSkillCode(), "skillCode", packBean); + } + if (!StringUtils.isEmpty(mesSkills.getSkillName())) { + DdlPreparedPack.getStringLikerPack(mesSkills.getSkillName(), "skillName", packBean); + } + return packBean; + } + + /** + * MES 工位技能 + * + * @param mesWorkCellSkill + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCellSkill, organizeCode); + if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillName(), "skillName", packBean); + } + if (!StringUtils.isEmpty(mesWorkCellSkill.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCellSkill.getWorkCellCode())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCellSkill.getWorkCellName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getWorkCellName(), "workCellName", packBean); + } + return packBean; + } + + /** + * MES 人员技能 + * + * @param mesUserSkill + * @param organizeCode + * @return + */ + public static DdlPackBean getMesUserSkill(MesUserSkill mesUserSkill, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesUserSkill, organizeCode); + if (!StringUtils.isEmpty(mesUserSkill.getSkillCode())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillCode(), "skillCode", packBean); + } + if (!StringUtils.isEmpty(mesUserSkill.getSkillName())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillName(), "skillName", packBean); + } + if (!StringUtils.isEmpty(mesUserSkill.getSkillLevel())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillLevel(), "skillLevel", packBean); + } + if (!StringUtils.isEmpty(mesUserSkill.getUserEmpNo())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getUserEmpNo(), "userEmpNo", packBean); + } + if (!StringUtils.isEmpty(mesUserSkill.getUserName())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getUserName(), "userName", packBean); + } + return packBean; + } + + /** + * MES 班制维护 + * + * @param mesShiftClass + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftClass(MesShiftClass mesShiftClass, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesShiftClass, organizeCode); + if (!StringUtils.isEmpty(mesShiftClass.getShiftClassCode())) { + DdlPreparedPack.getStringLikerPack(mesShiftClass.getShiftClassCode(), "shiftClassCode", packBean); + } + if (!StringUtils.isEmpty(mesShiftClass.getShiftClassName())) { + DdlPreparedPack.getStringLikerPack(mesShiftClass.getShiftClassName(), "shiftClassName", packBean); + } + return packBean; + } + + /** + * MES 班制班次维护 + * + * @param mesShiftClassDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftDetailClass(MesShiftClassDetail mesShiftClassDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesShiftClassDetail, organizeCode); + if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftClassCode())) { + DdlPreparedPack.getStringEqualPack(mesShiftClassDetail.getShiftClassCode(), "shiftClassCode", packBean); + } + if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftClassName())) { + DdlPreparedPack.getStringLikerPack(mesShiftClassDetail.getShiftClassName(), "shiftClassName", packBean); + } + if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftCode())) { + DdlPreparedPack.getStringEqualPack(mesShiftClassDetail.getShiftCode(), "shiftCode", packBean); + } + if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftName())) { + DdlPreparedPack.getStringLikerPack(mesShiftClassDetail.getShiftName(), "shiftName", packBean); + } + if (!StringUtils.isEmpty(mesShiftClassDetail.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesShiftClassDetail.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + + public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) { + DdlPackBean packBean; + if (dataAuth.getIsValidVal() == 0) { + packBean = DdlPackBean.getDdlPackBean(organizeCode); + } else { + packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal()); + } + if (!StringUtils.isEmpty(dataAuth.getDataObject())) { + DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean); + } + if (dataAuth.getRoleIdVal() > 0) { + DdlPreparedPack.getNumEqualPack(dataAuth.getRoleIdVal(), "roleId", packBean); + } + return packBean; + } + + /** + * MES 车型等级查询条件封装 + * + * @param modelGrade + * @return + */ + public static DdlPackBean getMesModelGrade(MesModelGrade modelGrade, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(modelGrade, organizeCode); + if (!StringUtils.isEmpty(modelGrade.getGradeCode())) { + DdlPreparedPack.getStringEqualPack(modelGrade.getGradeCode(), "gradeCode", packBean); + } + if (!StringUtils.isEmpty(modelGrade.getGradeName())) { + DdlPreparedPack.getStringLikerPack(modelGrade.getGradeName(), "gradeName", packBean); + } + if (!StringUtils.isEmpty(modelGrade.getGradeFlagValue())) { + DdlPreparedPack.getStringLikerPack(modelGrade.getGradeFlagValue(), "gradeFlagValue", packBean); + } + if (!StringUtils.isEmpty(modelGrade.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(modelGrade.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + return packBean; + } + + /** + * MES 产品颜色查询条件封装 + * + * @param partColor + * @return + */ + public static DdlPackBean getMesPartColor(MesPartColor partColor, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partColor, organizeCode); + if (!StringUtils.isEmpty(partColor.getColorCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getColorCode(), "colorCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getColorName())) { + DdlPreparedPack.getStringLikerPack(partColor.getColorName(), "colorName", packBean); + } + if (!StringUtils.isEmpty(partColor.getIfColorCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getIfColorCode(), "ifColorCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(partColor.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(partColor.getModelYear())) { + DdlPreparedPack.getStringEqualPack(partColor.getModelYear(), "modelYear", packBean); + } + return packBean; + } + + /** + * MES 产品车型配置 + * + * @param prodModelCfg + * @return + */ + public static DdlPackBean getMesProdModelCfg(MesProdModelCfg prodModelCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodModelCfg, organizeCode); + if (!StringUtils.isEmpty(prodModelCfg.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getModelYear())) { + DdlPreparedPack.getStringLikerPack(prodModelCfg.getModelYear(), "modelYear", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(prodModelCfg.getGradeCode())) { + DdlPreparedPack.getStringEqualPack(prodModelCfg.getGradeCode(), "gradeCode", packBean); + } + return packBean; + } + + /** + * MES 车型散件配置清单 + * + * @param scatterPartCfgBom + * @return + */ + public static DdlPackBean getMesScatterPartCfgBom(MesScatterPartCfgBom scatterPartCfgBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartCfgBom, organizeCode); + if (!StringUtils.isEmpty(scatterPartCfgBom.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartCfgBom.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartCfgBom.getModelYear())) { + DdlPreparedPack.getStringLikerPack(scatterPartCfgBom.getModelYear(), "modelYear", packBean); + } + if (!StringUtils.isEmpty(scatterPartCfgBom.getPartNo())) { + DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getPartNo(), "partNo", packBean); + } + return packBean; + } + + /** + * MES 散件零件生产配置 + * + * @param scatterPartProdCfg + * @return + */ + public static DdlPackBean getMesScatterPartProdCfg(MesScatterPartProdCfg scatterPartProdCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartProdCfg, organizeCode); + if (!StringUtils.isEmpty(scatterPartProdCfg.getCfgId())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getCfgId(), "cfgId", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getPartName())) { + DdlPreparedPack.getStringLikerPack(scatterPartProdCfg.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getGradeCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getGradeCode(), "gradeCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getColorCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getColorCode(), "colorCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getProdCfgTypeCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (!StringUtils.isEmpty(scatterPartProdCfg.getProduceCtgyCode())) { + DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + return packBean; + } + + /** + * 导入模板信息分页查询条件 + * + * @param template + * @return + */ + public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result); + DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result); + DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result); + getStringBuilderPack(template, result); + return result; + } + + /** + * 导入模板明细信息分页查询条件 + * + * @param details + * @return + */ + public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result); + getStringBuilderPack(details, result); + return result; + } + + public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) { + DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean); + DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) { + DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getTopicType(), "topicType", packBean); + DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean); + return packBean; + } + + /** + * MES 校枪记录 + * + * @param gunCalibrationRecord + * @return + */ + public static DdlPackBean getMesGunCalibrationRecord(MesGunCalibrationRecord gunCalibrationRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(gunCalibrationRecord, organizeCode); + if (!StringUtils.isEmpty(gunCalibrationRecord.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(gunCalibrationRecord.getGunCode())) { + DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getGunCode(), "gunCode", packBean); + } + if (gunCalibrationRecord.getCalibrationStatus() != null) { + DdlPreparedPack.getNumEqualPack(gunCalibrationRecord.getCalibrationStatus(), "calibrationStatus", packBean); + } + if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) { + DdlPreparedPack.getStringBiggerPack(gunCalibrationRecord.getStartTime(), "startTime", packBean); + } + if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) { + DdlPreparedPack.getStringSmallerPack(gunCalibrationRecord.getEndTime(), "endTime", packBean); + } + return packBean; + } + + /** + * 物料校验项 + * + * @param partCheck + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPartCheck(MesPartCheck partCheck, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partCheck, organizeCode); + if (!StringUtils.isEmpty(partCheck.getPartNo())) { + DdlPreparedPack.getStringEqualPack(partCheck.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(partCheck.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(partCheck.getObjectCode(), "objectCode", packBean); + } + return packBean; + } + + + /** + * 过程质量检测数据 + * + * @param qcOrderDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQcOrderDetailData(MesQcOrderDetail qcOrderDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode); + if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { + DdlPreparedPack.getStringRightLikerPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); + } + if (qcOrderDetail.getCheckType() != null) { + DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean); + } + if (!StringUtils.isEmpty(qcOrderDetail.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(qcOrderDetail.getSerialNumber(), "serialNumber", packBean); + } + if (!StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrderDetail.getCreateDateTimeStart(), + qcOrderDetail.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } + + /** + * MES AGV停机记录信息条件查询 + * + * @param stopRecord + * @return + */ + public static DdlPackBean getMesAgvRecoredData(MesAgvStopRecord stopRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getNumEqualPack(stopRecord.getStopType(), "stopType", packBean); + DdlPreparedPack.getStringLikerPack(stopRecord.getProductSn(), "productSn", packBean); + DdlPreparedPack.getStringEqualPack(stopRecord.getPartNo(), "partNo", packBean); + if (!StringUtils.isEmpty(stopRecord.getStopStartTime()) || !StringUtils.isEmpty(stopRecord.getStopEndTime())) { + DdlPreparedPack.timeBuilder(stopRecord.getCreateDateTimeStart(), stopRecord.getCreateDateTimeEnd(), + "stopStartTime", packBean, true); + } + return packBean; + } + + /** + * MES 工位缺陷查询条件封装 + * + * @param workCellDefect + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWorkCellDefect(MesWorkCellDefect workCellDefect, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(workCellDefect, organizeCode); + if (!StringUtils.isEmpty(workCellDefect.getDefectCode())) { + DdlPreparedPack.getStringLikerPack(workCellDefect.getDefectCode(), "defectCode", packBean); + } + if (!StringUtils.isEmpty(workCellDefect.getWorkCellCode())) { + DdlPreparedPack.getStringLikerPack(workCellDefect.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(workCellDefect.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(workCellDefect.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + + /** + * 散件BOM + * + * @param scatterBomCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesScatterBomCfg(MesScatterBomCfg scatterBomCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(scatterBomCfg, organizeCode); + if (!StringUtils.isEmpty(scatterBomCfg.getPartNo())) { + DdlPreparedPack.getStringLikerPack(scatterBomCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(scatterBomCfg.getCustomerPartNo())) { + DdlPreparedPack.getStringLikerPack(scatterBomCfg.getCustomerPartNo(), "customerPartNo", packBean); + } + if (!StringUtils.isEmpty(scatterBomCfg.getWorkCellCode())) { + DdlPreparedPack.getStringLikerPack(scatterBomCfg.getWorkCellCode(), "workCellCode", packBean); + } + return packBean; + } + + /** + * 物料项目关系 + * + * @param partProdCfgType + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPartProdCfgType(MesPartProdCfgType partProdCfgType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partProdCfgType, organizeCode); + if (!StringUtils.isEmpty(partProdCfgType.getPartNo())) { + DdlPreparedPack.getStringLikerPack(partProdCfgType.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(partProdCfgType.getCustCode())) { + DdlPreparedPack.getStringLikerPack(partProdCfgType.getCustCode(), "custCode", packBean); + } + if (!StringUtils.isEmpty(partProdCfgType.getProdCfgTypeCode())) { + DdlPreparedPack.getStringLikerPack(partProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + return packBean; + } + + /** + * 编码规则映射表 + * + * @param encodeRuleMap + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEncodeRuleMap(MesEncodeRuleMap encodeRuleMap, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(encodeRuleMap, organizeCode); + if (!StringUtils.isEmpty(encodeRuleMap.getTypeCode())) { + DdlPreparedPack.getStringLikerPack(encodeRuleMap.getTypeCode(), "typeCode", packBean); + } + if (!StringUtils.isEmpty(encodeRuleMap.getTypeName())) { + DdlPreparedPack.getStringLikerPack(encodeRuleMap.getTypeName(), "typeName", packBean); + } + if (!StringUtils.isEmpty(encodeRuleMap.getBusinessCode())) { + DdlPreparedPack.getStringLikerPack(encodeRuleMap.getBusinessCode(), "businessCode", packBean); + } + return packBean; + } + + /** + * 扩展对象配置 + * + * @param extendObjectCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesExtendObjectCfg(MesExtendObjectCfg extendObjectCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(extendObjectCfg, organizeCode); + if (!StringUtils.isEmpty(extendObjectCfg.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(extendObjectCfg.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(extendObjectCfg.getFieldCode())) { + DdlPreparedPack.getStringLikerPack(extendObjectCfg.getFieldCode(), "fieldCode", packBean); + } + if (!StringUtils.isEmpty(extendObjectCfg.getFieldName())) { + DdlPreparedPack.getStringLikerPack(extendObjectCfg.getFieldName(), "fieldName", packBean); + } + if (!StringUtils.isEmpty(extendObjectCfg.getFieldType())) { + DdlPreparedPack.getNumEqualPack(extendObjectCfg.getFieldType(), "fieldType", packBean); + } + 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.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + + /** + * 客户JIT预装队列 + * + * @param queueJitPlan + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitPlan(MesQueueJitPlan queueJitPlan, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlan, organizeCode); + if (!StringUtils.isEmpty(queueJitPlan.getJisPlanNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getJisPlanNo(), "jisPlanNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getCustPlantCode())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustPlantCode(), "custPlantCode", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getCustFlagNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustFlagNo(), "custFlagNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getVinCode(), "vinCode", packBean); + } + 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.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } + + /** + * 客户JIT预装队列明细 + * + * @param queueJitPlanDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitPlanDetail(MesQueueJitPlanDetail queueJitPlanDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanDetail, organizeCode); + if (!StringUtils.isEmpty(queueJitPlanDetail.getJisPlanNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getJisPlanNo(), "jisPlanNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlanDetail.getPartNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getPartNo(), "partNo", packBean); + } + return packBean; + } + + /** + * 客户JIT预装队列BOM + * + * @param queueJitPlanBom + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitPlanBom(MesQueueJitPlanBom queueJitPlanBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanBom, organizeCode); + if (!StringUtils.isEmpty(queueJitPlanBom.getJisPlanNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getJisPlanNo(), "jisPlanNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlanBom.getPartNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getPartNo(), "partNo", packBean); + } + return packBean; + } + + /** + * 客户JIT队列下达配置 + * @param jitIssueCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesJitIssueCfg(MesJitIssueCfg jitIssueCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(jitIssueCfg, organizeCode); + if (!StringUtils.isEmpty(jitIssueCfg.getCustPlantCode())) { + DdlPreparedPack.getStringLikerPack(jitIssueCfg.getCustPlantCode(), "custPlantCode", packBean); + } + if (jitIssueCfg.getCfgType() != null) { + DdlPreparedPack.getNumEqualPack(jitIssueCfg.getCfgType(), "cfgType", 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 da8091d..04924a2 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 @@ -9,6 +9,9 @@ import cn.estsh.i3plus.pojo.mes.bean.*; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * @Description: * @Reference: Mes 条件封装 @@ -87,7 +90,7 @@ public class MesPcnHqlPack { * @param mesLabelTemplate * @return */ - public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) { + public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); return packBean; @@ -107,25 +110,41 @@ public class MesPcnHqlPack { return packBean; } + /** + * 获取工作中心下所有的投料履历数据 + * + * @param mesCellFeedRecord + * @param org + * @return + */ + public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + return packBean; + } + /** * 获取原材料扫描信息的对应工序BOM * * @param stationBom - * @param rawPartSn + * @param rawPartNo * @return */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) { 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); + DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean); return packBean; } - public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) { + public static DdlPackBean getStationBom(String org, String workCenter, String workCell, String partNo) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean); @@ -179,7 +198,7 @@ public class MesPcnHqlPack { } // 工单管理，查询下达，启动，暂停状态 - if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){ + if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())) { DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean); } @@ -315,6 +334,7 @@ public class MesPcnHqlPack { /** * 按条件分页查询产品条码补打印数据 + * * @param mesProduceSn * @return */ @@ -336,6 +356,10 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); } + if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) { + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + } + // 时间段查询 if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( @@ -354,6 +378,7 @@ public class MesPcnHqlPack { /** * 按条件分页查询包装条码补打印数据 + * * @param mesPackage * @return */ @@ -416,9 +441,9 @@ public class MesPcnHqlPack { } - /** * 按条件分页查询类型信息数据 + * * @param typeCfg * @return */ @@ -437,4 +462,209 @@ public class MesPcnHqlPack { return packBean; } + + /** + * 获取工作中心下所有的投料数据 + * + * @param mesQcOrderDetail + * @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); + } + return packBean; + } + + /** + * 数据对象 + * + * @param mesDataObject + * @param organizeCode + * @return + */ + public static DdlPackBean getMesDataObject(MesDataObject mesDataObject, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesDataObject, organizeCode); + if (!StringUtils.isEmpty(mesDataObject.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(mesDataObject.getObjectName())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "objectName", packBean); + } + if (mesDataObject.getOperateType() != null) { + DdlPreparedPack.getNumEqualPack(mesDataObject.getOperateType(), "operateType", packBean); + } + if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean); + } + return packBean; + } + + public static DdlPackBean getProdBindRecord(MesProdBindRecord prodBindRecord) { + DdlPackBean packBean = getAllBaseData(prodBindRecord.getOrganizeCode()); + if (!StringUtils.isEmpty(prodBindRecord.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(prodBindRecord.getSerialNumber(), "serialNumber", packBean); + } + return packBean; + } + + public static DdlPackBean getProductData(MesProductData productData) { + DdlPackBean packBean = getAllBaseData(productData.getOrganizeCode()); + if (!StringUtils.isEmpty(productData.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(productData.getSerialNumber(), "serialNumber", packBean); + } + return packBean; + } + + /** + * MES工作中心信息查询条件封装 + * + * @param mesWorkCenter + * @return + */ + public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); + if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); + } + if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + } + return packBean; + } + + /** + * MES工作单元信息查询条件封装 + * + * @param mesWorkCell + * @return + */ + public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); + if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCell.getWorkCellName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellName(), "workCellName", packBean); + } + + return packBean; + } + + /** + * 得到分页后的数据 + * + * @return 分页数据 + */ + public static List getPage(List totalList, int currentPage, int pageSize, int totalPage) { + if (currentPage <= 0) { + currentPage = 1; + } + + if (currentPage >= totalPage) { + currentPage = totalPage; + } + + List subList = new ArrayList<>(); + if (null != totalList) { + subList.addAll(totalList.subList(getStartIndex(totalList, currentPage, pageSize, totalPage), + getEndIndex(totalList, currentPage, pageSize, totalPage))); + } + + return subList; + } + + private static int getStartIndex(List totalList, int currentPage, int pageSize, int totalRecord) { + if (null == totalList) { + return 0; + } + int startIndex = (currentPage - 1) * pageSize; + if (startIndex > totalRecord) { + startIndex = totalRecord; + } + if (startIndex < 0) { + startIndex = 0; + } + return startIndex; + } + + private static int getEndIndex(List totalList, int currentPage, int pageSize, int totalRecord) { + if (null == totalList) { + return 0; + } + int endIndex = getStartIndex(totalList, currentPage, pageSize, totalRecord) + pageSize; + if (endIndex < 0) { + endIndex = 0; + } + if (endIndex < getStartIndex(totalList, currentPage, pageSize, totalRecord)) { + endIndex = getStartIndex(totalList, currentPage, pageSize, totalRecord); + } + if (endIndex > totalRecord) { + endIndex = totalRecord; + } + return endIndex; + } + + /** + * 涂装一次箱条码打印获取工单 查询条件封装 + * + * @param mesWorkOrder + * @return + */ + public static DdlPackBean getWorkOrderList(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkOrder, organizeCode); + 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); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", 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; + } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d65e031..190efa7 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 @@ -59,6 +59,19 @@ i3plus-pojo-lac + + + org.optaplanner + optaplanner-core + 7.36.0.Final + + + + org.optaplanner + optaplanner-persistence-jpa + 7.36.0.Final + + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java index 907b15a..e375044 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java @@ -18,6 +18,7 @@ import java.io.Serializable; @Data public class ClassFieldModel implements Serializable { + private static final long serialVersionUID = -8873901724079105728L; @ApiParam(value ="包名") private String packageName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java index e601f37..976368d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java @@ -21,6 +21,7 @@ import java.util.List; @Data public class ClassModel implements Serializable { + private static final long serialVersionUID = -8024274383480419754L; @ApiParam(value ="服务ID") private int serverId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java index 29a4dbf..39f66b1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class CloudPagerModel { +public class CloudPagerModel implements Serializable { + private static final long serialVersionUID = 3091924006138375461L; @ApiParam("查询对象") private T obj; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java index 23a5718..16c6a0f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.model.common; import lombok.Data; -import java.util.LinkedHashMap; /** * @Description : @@ -19,4 +18,8 @@ public class ExportDataModel { private String exportCol; + private String title; + + private Integer module; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppMessage.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppMessage.java new file mode 100644 index 0000000..d6ed87b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppMessage.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.common; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-22 下午7:46 + * @Modify: + **/ +@Data +public class ImppMessage implements Serializable { + + private static final long serialVersionUID = 6840525365653629445L; + @ApiParam(value ="产品") + private Integer softType; + + @ApiParam(value ="消息组") + private Integer messageGroup; + + @ApiParam(value ="消息内容") + private String messageParam; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + public CommonEnumUtil.SOFT_TYPE getSoftTypeEnum() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOf(softType); + } + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java new file mode 100644 index 0000000..2244887 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-29 下午3:40 + * @Modify: + **/ +@Data +public class ThreadModel implements Serializable { + + @ApiParam(value ="自定义调用ID") + private Long requestId; + @ApiParam(value ="当前用户ID") + private Long userId; + @ApiParam(value ="当前用户名称") + private String userName; + @ApiParam(value ="用户登录IP") + private String userHost; + @ApiParam(value ="用户登录浏览器") + private String userBrowser; + @ApiParam(value ="用户登录操作系统") + private String userOs; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java index 282c308..e6cc61a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java @@ -2,19 +2,19 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; -import java.util.Date; +import java.io.Serializable; /** * @Description : * @Reference : * @Author : Adair Peng * @CreateDate : 2018-12-11 15:37 - * @Modify: - * 动态 Table 单元格 + * @Modify: 动态 Table 单元格 **/ @Data -public class DynTableCell { +public class DynTableCell implements Serializable { + private static final long serialVersionUID = 3798664031371975269L; // 单元格名称 private String cellKey; // 排序 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 29b1b17..56e1cb7 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 @@ -2,6 +2,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; @@ -12,12 +13,12 @@ import java.util.Map; * @Reference : * @Author : Adair Peng * @CreateDate : 2018-12-11 15:37 - * @Modify: - * 动态Table Row + * @Modify: 动态Table Row **/ @Data -public class DynTableRow { +public class DynTableRow implements Serializable { + private static final long serialVersionUID = 2012638500620164166L; // 是否选中 private boolean isChecked; @@ -31,11 +32,11 @@ public class DynTableRow { private Integer cellSize = 0; // 行数据 - private Map cellMap = new HashMap<>(); + private Map cellMap = new HashMap<>(); - public DynTableRow putCell(DynTableCell cell){ - this.cellMap.put(cell.getCellKey(),cell); + public DynTableRow putCell(DynTableCell cell) { + this.cellMap.put(cell.getCellKey(), cell); return this; } @@ -45,8 +46,10 @@ public class DynTableRow { /** * 禁止外部给 Size 赋值 + * * @param cellSize */ - private void setCellSize(Integer cellSize) { } + private void setCellSize(Integer cellSize) { + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java index 047823a..91b5885 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java @@ -2,9 +2,8 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; -import java.util.ArrayList; +import java.io.Serializable; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -12,14 +11,14 @@ import java.util.Map; * @Reference : * @Author : Adair Peng * @CreateDate : 2018-12-11 15:37 - * @Modify: - * 动态Table Row + * @Modify: 动态Table Row **/ @Data -public class ImppDynTable { +public class ImppDynTable implements Serializable { + private static final long serialVersionUID = 6634878862426951453L; // 行数据 - private Map table = new HashMap<>(); + private Map table = new HashMap<>(); // 表单标题 private String tableTitle; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java new file mode 100644 index 0000000..86eba82 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.form.bean.BfButton; +import cn.estsh.i3plus.pojo.form.bean.BfElement; +import cn.estsh.i3plus.pojo.form.bean.BfRefButtonMethod; +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; + +/** + * @Description : 按钮操作数据模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-13 19:45 + * @Modify: + **/ +@Data +@ApiModel("按钮操作数据模型") +public class BfButtonOperateDataModel implements Serializable { + + private static final long serialVersionUID = 5592739471208814372L; + @ApiModelProperty("按钮id") + private Long buttonId; + + @ApiModelProperty("元素id") + private Long elementId; + + @ApiModelProperty("操作数据") + private List> operateData; + + @ApiModelProperty("按钮功能关系信息") + private BfRefButtonMethod bfRefButtonMethod; + + @ApiModelProperty("元素信息") + private BfElement bfElement; + + @ApiModelProperty("按钮信息") + private BfButton bfButton; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java index 57198b7..74edf0d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java @@ -3,10 +3,9 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.form.bean.BfDataObject; import cn.estsh.i3plus.pojo.form.bean.BfDataObjectProperty; -import io.swagger.annotations.ApiParam; import lombok.Data; -import org.apache.commons.lang3.StringUtils; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -18,8 +17,9 @@ import java.util.Map; * @Modify: **/ @Data -public class CloudFormModel { +public class CloudFormModel implements Serializable { + private static final long serialVersionUID = -4880909594223592633L; private BfDataObject dataObject; // 数据源编码 @@ -28,38 +28,38 @@ public class CloudFormModel { private String dataObjectCode; // 任何操作必填 必须真实 // 单条插入 - private Map insert; + private Map insert; // 单条修改 - private Map update; + private Map update; // 新增数据 - private List> insertList; + private List> insertList; // 修改条件 // private List updateConditionList; // 修改数据 - private List> updateList; + private List> updateList; // 查询数据 private List selectList; // 删除数据 - private List> deleteList; + private List> deleteList; - private Map delete; + private Map delete; public String orderByParam; public Integer ascOrDesc = 1; - public String orderBy(){ + public String orderBy() { String result = ""; - if (orderByParam!=null&&orderByParam.trim().length()>0) { + if (orderByParam != null && orderByParam.trim().length() > 0) { result = " order by " + orderByParam; - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; - }else{ + } else { result += " desc"; } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java index d39de03..05ca62a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : 数据操作Model * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; * @Modify: **/ @Data -public class ElementFormModel { +public class ElementFormModel implements Serializable { + private static final long serialVersionUID = 3215723235918474591L; //外键关联数据对象主键 @ApiParam(value = "元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java index 9954438..b1d2b85 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.form.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -8,8 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -20,8 +18,9 @@ import java.util.List; * @Modify: **/ @Data -public class ElementModel{ +public class ElementModel implements Serializable { + private static final long serialVersionUID = -8009888251366822835L; //外键关联数据对象主键 @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -64,7 +63,7 @@ public class ElementModel{ public String orderByParam; //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc - @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1") public Integer ascOrDesc = 1; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java index e8cc46b..eb23800 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java @@ -4,16 +4,17 @@ import cn.estsh.i3plus.pojo.form.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** * @Description : 表单模型 * - * 表单功能
- * 布局 功能明细
- * 自定义按钮
- * 元素
- * 元素按钮
+ * 表单功能
+ * 布局 功能明细
+ * 自定义按钮
+ * 元素
+ * 元素按钮
* * @Reference : * @Author : Adair Peng @@ -21,8 +22,9 @@ import java.util.List; * @Modify: **/ @Data -public class FormModel { +public class FormModel implements Serializable { + private static final long serialVersionUID = 146034689646326300L; // 表单功能 @ApiParam(value = "表单功能") private BfMethod method; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java index edd899b..d215bb5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -20,12 +21,13 @@ import java.util.Map; @Data @ApiModel("表单操作数据模型") @NoArgsConstructor -public class FormOperateDataModel { +public class FormOperateDataModel implements Serializable { - @ApiModelProperty("元素代码") - private Long refId; + private static final long serialVersionUID = 7674678844523192310L; + @ApiModelProperty("关联标识") + private String refId; - @ApiModelProperty("元素名称") + @ApiModelProperty("关联名称") private String refName; @ApiModelProperty("操作来源") @@ -36,6 +38,6 @@ public class FormOperateDataModel { private String sourceName; @ApiModelProperty("操作数据集合") - private List> operateDataList; + private List> operateDataList; } 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 ae774f8..bc5daaf 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,10 +1,11 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -13,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class SqlColumnModel { -// 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 +public class SqlColumnModel 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 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java index a518608..5f03036 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java @@ -1,12 +1,9 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.form.bean.BfDataObject; -import io.swagger.annotations.ApiParam; import lombok.Data; -import org.apache.commons.lang3.StringUtils; +import java.io.Serializable; import java.util.List; -import java.util.Objects; /** * @Description : @@ -16,8 +13,9 @@ import java.util.Objects; * @Modify: **/ @Data -public class SqlCreateDllModel { +public class SqlCreateDllModel implements Serializable { + private static final long serialVersionUID = -1294648161172538340L; private String tableCat; private String tableSchem; private String tableName; @@ -29,6 +27,6 @@ public class SqlCreateDllModel { private String selfReferencingColName; private String refGeneration; - List columnlist ; + List columnlist; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java index 90d9313..b3dd987 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -16,14 +17,15 @@ import java.util.List; * @Modify: **/ @Data -public class SqlScriptModel { +public class SqlScriptModel implements Serializable { + private static final long serialVersionUID = 512077813851983749L; @ApiParam(value = "对象元素ID") @JsonSerialize(using = ToStringSerializer.class) private Long elementId; @ApiParam(value = "元素内容") - private String elementContent ; + private String elementContent; @ApiParam(value = "动态对象Class") private Class dynClass; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java index c9c9845..9cb7ac3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.wms.bean.WmsPackage; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -13,8 +14,9 @@ import java.util.List; * @Modify: **/ @Data -public class WmsPackageModel { +public class WmsPackageModel implements Serializable { + private static final long serialVersionUID = -6308064202329492679L; List wmsPackageList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index ddcfd44..1911043 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; import lombok.Data; import org.slf4j.LoggerFactory; +import java.io.Serializable; + /** * @Description : lac指令集model * @Reference : @@ -13,8 +15,9 @@ import org.slf4j.LoggerFactory; * @Modify: **/ @Data -public class LacCommandStackModel { +public class LacCommandStackModel implements Serializable { + private static final long serialVersionUID = -8453748548383071954L; /** * 指令集记录id */ @@ -46,17 +49,17 @@ public class LacCommandStackModel { private Exception exception; - public void setException(Exception exception){ - LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception); + public void setException(Exception exception) { + LoggerFactory.getLogger("YYYY").error("异常信息：{}", exception); this.exception = exception; } - public void setCommandStackRecord(LacCommandStackRecord commandStackRecord){ + public void setCommandStackRecord(LacCommandStackRecord commandStackRecord) { this.commandStackRecord = commandStackRecord; this.recordId = commandStackRecord.getId(); } - public Object getTaskRequestParam(LacCommandStackStepTask stepTask){ + public Object getTaskRequestParam(LacCommandStackStepTask stepTask) { for (Task task : this.getRequest().getTaskList()) { // 步骤代码为空时匹配所有任务参数 if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) { @@ -69,8 +72,8 @@ public class LacCommandStackModel { return null; } - public Long getRecordId(){ - if(recordId == null &&this.commandStackRecord !=null){ + public Long getRecordId() { + if (recordId == null && this.commandStackRecord != null) { this.recordId = this.commandStackRecord.getId(); } return recordId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java index 005846b..574b9cd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java @@ -1,8 +1,9 @@ package cn.estsh.i3plus.pojo.model.lac; -import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; + +import java.io.Serializable; import java.util.List; /** @@ -14,8 +15,9 @@ import java.util.List; **/ @Data @XStreamAlias("request") -public class LacSuitRequest { +public class LacSuitRequest implements Serializable { + private static final long serialVersionUID = 9078681515190902399L; /** * 指令集代码 */ @@ -26,10 +28,4 @@ public class LacSuitRequest { */ private List taskList; - /** - * 指令集代码 - */ - @XStreamCDATA - private String paramList; - } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java index 46a58d5..0a22ea5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; +import java.io.Serializable; + /** * @Description : lac 适配响应信息 * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @XStreamAlias("response") -public class LacSuitResponse { +public class LacSuitResponse implements Serializable { + private static final long serialVersionUID = -4119301611637726729L; /** * 是否成功 */ @@ -35,7 +38,7 @@ public class LacSuitResponse { */ private Object result; - public LacSuitResponse(){ + public LacSuitResponse() { this.success = true; this.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); this.message = ResourceEnumUtil.MESSAGE.SUCCESS.getDescription(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java index ce9d8c2..143d11d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @XStreamAlias("task") -public class Task { +public class Task implements Serializable { + private static final long serialVersionUID = 1504165068471696209L; private String code; private String stepCode; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java index 40bc9c6..2007630 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java @@ -5,6 +5,8 @@ import com.thoughtworks.xstream.annotations.XStreamConverter; import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -14,9 +16,10 @@ import lombok.Data; **/ @Data @XStreamAlias("param") -@XStreamConverter(value= ToAttributedValueConverter.class, strings={"value"}) -public class TaskParam { +@XStreamConverter(value = ToAttributedValueConverter.class, strings = {"value"}) +public class TaskParam implements Serializable { + private static final long serialVersionUID = 749532390986966416L; private String name; private String value; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java new file mode 100644 index 0000000..32281e5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java @@ -0,0 +1,142 @@ +package cn.estsh.i3plus.pojo.model.license; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; + +import java.io.Serializable; +import java.util.Date; +import java.util.Objects; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-2-10 下午5:10 + * @Modify: + **/ +@Data +public class ImppLicense implements Serializable { + + private static final long serialVersionUID = 2365830603839063328L; + + private static final String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss"; + /** + * + * 授权人名称 + * 授权开始时间 + * 授权结束时间 + * + * 授权工厂 + * 仓库 + * 产线 + * 用户 + * 授权描述 + * 同时最大在线数量 + * + */ + + /* 基础信息 */ + @ApiParam(value ="授权ID") + private Long id; // ID + @ApiParam(value ="授权应用ID") + private Long appId; // APP_ID + @ApiParam(value ="授权读取授权数据ID") + private Integer licenseSourceId; // 授权数据来源 + public String getLicenseSourceTxt() { + return licenseSourceId == null ? null : CommonEnumUtil.LICENSE_SOURCE.valueOf(licenseSourceId); + } + + /* 授权信息 */ + @ApiParam(value ="授权开始时间") + private String licenseStartDateTime; // 授权开始时间 + @ApiParam(value ="授权结束时间") + private String licenseEndDateTime; // 授权结束时间 + @ApiParam(value ="授权组织数量") + private Integer licenseMaxOrganize; // 授权组织数量 + @ApiParam(value ="授权仓库数量") + private Integer licenseMaxWarehouse; // 授权仓库数量 + @ApiParam(value ="授权产线数量") + private Integer licenseMaxProductionLine; // 授权产线数量 + @ApiParam(value ="授权用户数量") + private Integer licenseMaxUser; // 授权用户数量 + @ApiParam(value ="授权同时在线数量") + private Integer licenseMaxUserSession; // 授权在线用户数量 + @ApiParam(value ="授权描述信息") + private String licenseDescription; // 授权描述信息 + @ApiParam(value ="深思授权信息") + private ImppLicenseSenseshield senseshield; + + /* 备用预留字段 */ + @ApiParam(value ="备用字段") + private String licenseSpare01; + @ApiParam(value ="备用字段") + private String licenseSpare02; + @ApiParam(value ="备用字段") + private String licenseSpare03; + @ApiParam(value ="备用字段") + private String licenseSpare04; + @ApiParam(value ="备用字段") + private String licenseSpare05; + @ApiParam(value ="备用字段") + private String licenseSpare06; + @ApiParam(value ="备用字段") + private String licenseSpare07; + @ApiParam(value ="备用字段") + private String licenseSpare08; + @ApiParam(value ="备用字段") + private String licenseSpare09; + @ApiParam(value ="备用字段") + private String licenseSpare10; + + /* 业务人员信息 */ + @ApiParam(value ="授权创建时间") + private Date licenseCreateDateTime; // 授权时间 + @ApiParam(value ="授权创建人员ID") + private Long licenseCreateUserId; // 授权用户ID + @ApiParam(value ="授权创建人员名称") + private String licenseCreateUserName; // 授权人名称 + @ApiParam(value ="授权更新人员ID") + private Long licenseUpdateUserId; // 授权更新人员ID + @ApiParam(value ="授权更新人员名称") + private String licenseUpdateUserName; // 授权人名称 + @ApiParam(value ="授权更新人员时间") + private Date licenseUpdateDateTime; // 授权更新时间 + + /* 授权锁信息(软锁,usb锁) */ + @ApiParam(value ="授权使用开始时间") + private String lockStartTime; + @ApiParam(value ="授权使用结束时间") + private String lockEndTime; + @ApiParam(value ="锁类型") + private String lockType; + + + /* 基础业务逻辑 */ + @ApiParam(value ="到期时间") + private String maturityDateTime; + + public String getMaturityDateTime() { + if(StringUtils.isBlank(maturityDateTime)){ + return StringUtils.isNotBlank(lockEndTime) ? lockEndTime : licenseEndDateTime; + } + return maturityDateTime; + } + + public void setSenseshield(ImppLicenseSenseshield senseshield) { + if(Objects.nonNull(senseshield)){ + try { + Date lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L); + Date licenseEndDateTime = new Date(this.licenseEndDateTime); + + this.lockType = senseshield.getType(); + this.maturityDateTime = DateFormatUtils.format(lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime,TIME_FORMAT); + }catch (Exception e){ + } + } + this.senseshield = senseshield; + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java new file mode 100644 index 0000000..d011da9 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.model.license; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-16 下午7:54 + * @Modify: + **/ +@Data +public class ImppLicenseSenseshield implements Serializable { + + + private static final long serialVersionUID = 3227502901235303725L; + /** + * license_id : 170817 + * enable : true + * guid : 6cece6946234ed4292617306ccd1191a + * first_use_time : 1587029768 + * span_time : 315360000 + * concurrent_type : win_user_session + * concurrent : 1000 + * version : 0 + * module : 0000000000000000 + * last_update_timestamp : 1587029200 + * last_update_timesn : 0 + * rom_size : 1184 + * raw_size : 1184 + * pub_size : 0 + * developer_id : 0800000000001005 + * type : local + * sn : 9733c801000702075ed2000200270021 + */ + + private int license_id; + private boolean enable; + private String guid; + private int first_use_time; + private int span_time; + private String concurrent_type; + private int concurrent; + private int version; + private String module; + private int last_update_timestamp; + private int last_update_timesn; + private int rom_size; + private int raw_size; + private int pub_size; + private String developer_id; + private String type; + private String sn; + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanFieldInfoModel.java new file mode 100644 index 0000000..2155452 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanFieldInfoModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanFieldInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448895L; + + @ApiParam(value = "表名称") + public String tableName; + + @ApiParam(value = "表字段名称") + private String fieldName; + + @ApiParam(value = "表字段描述") + private String fieldDesc; + + @ApiParam(value = "表字段类型") + private String fieldType; + + @ApiParam(value = "主键") + private String isFieldPrimaryKey; + + @ApiParam(value = "非空") + private String isFieldNull; + + @ApiParam(value = "外键") + private String isFieldForeignKey; + + @ApiParam(value = "唯一约束") + private String isFieldUnique; + + @ApiParam(value = "自增") + private String isFieldGeneric; +} 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 new file mode 100644 index 0000000..de64920 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import cn.estsh.i3plus.pojo.model.mes.BasBeanFieldInfoModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448495L; + + @ApiParam(value = "系统名称") + public String systemName; + + @ApiParam(value = "实体名称") + public String entityName; + + @ApiParam(value = "数据表名称") + private String tableName; + + @ApiParam(value = "数据表描述") + private String tableDesc; + + @ApiParam(value = "字段列表数据") + private List fieldInfoModelList; +} 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 new file mode 100644 index 0000000..a4d0580 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.model.mes; + + +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.List; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes导入结果model") +public class ExcelImportModel implements Serializable { + + private static final long serialVersionUID = 3075276018074690913L; + @ApiParam("结果") + private boolean result; + + @ApiParam("成功行数量") + private int successRowNum; + + @ApiParam("失败行数量") + private int failRowNum; + + @ApiParam("错误信息集合") + private List ImportErrorModels; + + @ApiParam("错误的行号") + private String errorRows; + + @ApiParam("导入数据集合") + private List excelList; + + @ApiParam("导入进度") + private String importSpeed; + + @ApiParam("Sheet名称") + private String sheetName; + +} 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 new file mode 100644 index 0000000..c644a49 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.model.mes; + + +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 ImportErrorModel implements Serializable { + + private static final long serialVersionUID = 1212013821950324792L; + @ApiParam("错误的行号") + private int rowNum; + + @ApiParam("错误数量") + private int errorNum; + + @ApiParam("错误列号") + private String cellNum; + + @ApiParam("错误描述") + private String errorInfo; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java new file mode 100644 index 0000000..79b60b3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Mes电检检测实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-01 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class MesElectricDataModel implements Serializable { + + private static final long serialVersionUID = -6376845639646546495L; + + @ApiParam(value = "车型") + public String carType; + + @ApiParam(value = "颜色代码") + public String colorCode; + + @ApiParam(value = "日期时间") + private String dateTime; + + @ApiParam(value = "生产序号") + private String productSeq; + + @ApiParam(value = "车型信息") + private String carTypeInfo; + + @ApiParam(value = "生产模式") + private String productModel; + + @ApiParam(value = "产品生产号") + private String productNumber; + + @ApiParam(value = "备用") + private String spare; + + @ApiParam(value = "所有零件信息包括所有选配信息") + private String other; + + @ApiParam(value = "电检结果") + private String electricResult; + + @ApiParam(value = "文件名称") + private String ftpFileName; + + @ApiParam(value = "FTP文件") + private Object ftpFile; + + @ApiParam(value = "过程条码") + private String serialNumber; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java new file mode 100644 index 0000000..70d7af5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : Mes电检检测补录数据实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-02 09:53 + * @Modify: + **/ +@Data +public class MesElectricMarkUpDataModel implements Serializable { + + private static final long serialVersionUID = -6376845779646546495L; + + @ApiParam(value = "工作中心代码") + public String workCenterCode; + + @ApiParam(value = "工作单元代码") + public String workCellCode; + + @ApiParam(value = "过程条码") + private String serialNumber; + + @ApiParam(value = "产品生产号") + private String productNumber; + + @ApiParam(value = "电检结果") + private String electricResult; + + @ApiParam(value = "测试时间") + private String testDateTime; + + @ApiParam(value = "是否补录") + private Integer isMarkUp; + + @ApiParam(value = "补录时间") + private String markUpDateTime; + + @ApiParam(value = "开始时间") + private String startDateTimeStr; + + @ApiParam(value = "结束时间") + private String endDateTimeStr; + + public MesElectricMarkUpDataModel(String workCenterCode, String workCellCode, String serialNumber, String productNumber, + String electricResult, String testDateTime, Integer isMarkUp, String markUpDateTime) { + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.serialNumber = serialNumber; + this.productNumber = productNumber; + this.electricResult = electricResult; + this.testDateTime = testDateTime; + this.isMarkUp = isMarkUp; + this.markUpDateTime = markUpDateTime; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java new file mode 100644 index 0000000..2ca1917 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/7/15 21:43 + * @desc + */ +@Data +@AllArgsConstructor +public class PsetModel { + + private String psetName; + + private Integer psetNum; + + private Integer psetCount; + + private Integer actualCount; + + private boolean torqueStatus; +} 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 new file mode 100644 index 0000000..02084bb --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -0,0 +1,238 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : MES扭矩采集模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-22 11:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class TorqueCollectionModel implements Serializable { + + private static final long serialVersionUID = -6376845639746448495L; + + @ApiParam("Vin") + private String vinCode; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("等级代码") + private String gradeCode; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("PEST编码1") + private Integer pset1; + + @ApiParam("PEST编码2") + private Integer pset2; + + @ApiParam("PEST编码3") + private Integer pset3; + + @ApiParam("PEST编码4") + private Integer pset4; + + @ApiParam("PEST编码5") + private Integer pset5; + + @ApiParam("PEST编码6") + private Integer pset6; + + @ApiParam("PEST编码7") + private Integer pset7; + + @ApiParam("PEST编码8") + private Integer pset8; + + @ApiParam("扭矩枪编号") + private Integer torqueNo; + + @ApiParam("PEST号") + private Integer psetNum; + + @ApiParam("PEST数量") + private Integer psetCount; + + /** + * 1-未采集， 2-已采集, 3-无需打扭矩 + */ + @ApiParam("扭矩采集状态") + private Integer torqueStatus; + + /** + * 1-未绑定，2-已绑定 + */ + @ApiParam("关键件绑定状态") + private Integer bindKeyPartStatus; + + @ApiParam("扭矩值") + private Integer torqueValue; + + @ApiParam("确认扫描次数") + private Integer checkScanCount; + + @ApiParam("实际确认扫描次数") + private Integer actualCheckScanCount; + + @ApiParam("组合码发送顺序") + private Integer sendSeq; + + @ApiParam("黄枪规则") + private Integer yellowGunRule; + + @ApiParam("是否截至顺序号") + private Integer isEndSeq; + + @ApiParam("组合码") + private String groupCode; + + @ApiParam("是否黄枪") + private Integer isYellowGun; + + @ApiParam("应收合格数") + private Double qualifiedCount; + + @ApiParam("实际合格数") + private Double actualQualifiedCount; + + @ApiParam("是否已经发送了新的组合码") + private boolean hasSendAsciiWhenYellow; + + @ApiParam("工步信息行颜色") + private String color; + + @ApiParam("扭矩显示信息") + private String torqueInfo; + @ApiParam("扭矩颜色") + private String torqueColor; + + @ApiParam("绑定关键件信息") + private String bindPartKeyInfo; + @ApiParam("绑定关键件颜色") + private String bindPartKeyColor; + + @ApiParam("是否大枪") + private Integer isPf; + + @ApiParam("psets总数") + private Integer psetSum; + + @ApiParam("防错码") + private String pokeYokeFix; + + private Map psets = new LinkedHashMap<>(); + + /** + * 大枪查询结果构造方法 + * + * @param vinCode + * @param prodCfgTypeCode + * @param gradeCode + * @param colorCode + * @param partNo + * @param partName + * @param torqueNo + * @param checkScanCount + * @param sendSeq + * @param yellowGunRule + * @param isEndSeq + * @param groupCode + */ + 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) { + this.vinCode = vinCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.gradeCode = gradeCode; + this.colorCode = colorCode; + this.partNo = partNo; + this.partName = partName; + this.torqueNo = torqueNo; + this.checkScanCount = checkScanCount; + this.sendSeq = sendSeq; + this.yellowGunRule = yellowGunRule; + this.isEndSeq = isEndSeq; + this.groupCode = groupCode; + this.isPf = isPf; + this.qualifiedCount = qualifiedCount; + this.pokeYokeFix = pokeYokeFix; + } + + /** + * 小枪结果数据构造方法 + * + * @param vinCode + * @param prodCfgTypeCode + * @param gradeCode + * @param colorCode + * @param partNo + * @param partName + * @param pset1 + * @param pset2 + * @param pset3 + * @param pset4 + * @param pset5 + * @param pset6 + * @param pset7 + * @param pset8 + * @param torqueNo + */ + 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) { + this.vinCode = vinCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.gradeCode = gradeCode; + this.colorCode = colorCode; + this.partNo = partNo; + this.partName = partName; + this.pset1 = pset1; + this.pset2 = pset2; + this.pset3 = pset3; + this.pset4 = pset4; + this.pset5 = pset5; + this.pset6 = pset6; + this.pset7 = pset7; + this.pset8 = pset8; + this.torqueNo = torqueNo; + this.sendSeq = sendSeq; + this.checkScanCount = checkScanCount; + this.pokeYokeFix = pokeYokeFix; + assemblePsets(); + } + + private void assemblePsets() { + psets.put("pset1", new PsetModel("pset1", 1, this.pset1, 0, false)); + psets.put("pset2", new PsetModel("pset2", 2, this.pset2, 0, false)); + psets.put("pset3", new PsetModel("pset3", 3, this.pset3, 0, false)); + psets.put("pset4", new PsetModel("pset4", 4, this.pset4, 0, false)); + psets.put("pset5", new PsetModel("pset5", 5, this.pset5, 0, false)); + psets.put("pset6", new PsetModel("pset6", 6, this.pset6, 0, false)); + psets.put("pset7", new PsetModel("pset7", 7, this.pset7, 0, false)); + psets.put("pset8", new PsetModel("pset8", 8, this.pset8, 0, false)); + } + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java index aa7c6a6..3d4c3fb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java @@ -31,6 +31,10 @@ public class MissResourceModel implements Serializable { @ApiParam(value = "资源类型", example = "1", access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") private Integer resourceType; + public String getResourceTypeTxt(){ + return resourceType == null ?"无": CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(resourceType); + } + @ApiParam(value = "语言编码", example = "浏览器语言编码") @AnnoOutputColumn private String languageCode; @@ -47,6 +51,10 @@ public class MissResourceModel implements Serializable { @AnnoOutputColumn(refClass = CommonEnumUtil.MiSS_RESOURCE_SOURCE.class) private Integer resourceSource; + public String getResourceSourceTxt(){ + return resourceSource == null ?"无": CommonEnumUtil.MiSS_RESOURCE_SOURCE.valueOfDescription(resourceSource); + } + @ApiParam(value = "数据来源") @AnnoOutputColumn(refClass = CommonEnumUtil.IS_VAILD.class) private Integer isValid; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java index e23b1ad..99af036 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java @@ -4,36 +4,39 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : - * 自定义报表数据源传输对象 ， 单纯数据传输使用并不做保存使用 + * 自定义报表数据源传输对象 ， 单纯数据传输使用并不做保存使用 * @Reference : * @Author : wei.peng * @CreateDate : 19-12-5 下午4:02 * @Modify: **/ @Data -public class BrDataSourceModel { +public class BrDataSourceModel implements Serializable { /** * 默认数据源信息 */ public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", CommonEnumUtil.DATA_SOURCE_TYPE.SOURCE_MARIA_DB.getValue(), null, "使用默认数据源"); + private static final long serialVersionUID = -5137576929473857749L; - @ApiParam(value ="数据源名称") + @ApiParam(value = "数据源名称") private String sourceName; - @ApiParam(value ="数据源编码") + @ApiParam(value = "数据源编码") private String sourceCode; - @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") + @ApiParam(value = "数据源类型", name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") private Integer sourceType; - @ApiParam(value ="数据库名称") + @ApiParam(value = "数据库名称") private String sourceDataBaseName; - @ApiParam(value ="数据源描述") + @ApiParam(value = "数据源描述") private String sourceDescription; public BrDataSourceModel() { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java index 9dc5df5..d0fdd09 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.report.bean.BrReport; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -17,21 +18,22 @@ import java.util.List; * @Modify: **/ @Data -public class BrDynamicPageModel { +public class BrDynamicPageModel implements Serializable { - @ApiParam(value ="报表信息") + private static final long serialVersionUID = -5054183081964783780L; + @ApiParam(value = "报表信息") private BrReport report; - @ApiParam(value ="布局信息") + @ApiParam(value = "布局信息") private BrLayout layout; @ApiParam(value = "报表排版关系") private List refReportList; - @ApiParam(value ="页面元素内容") + @ApiParam(value = "页面元素内容") private List elementList; - @ApiParam(value ="页面元素内容") + @ApiParam(value = "页面元素内容") private List templateModelList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index c29a77b..0df0e9c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -23,17 +23,17 @@ import java.util.Map; public class TemplateModel implements Serializable { private static final long serialVersionUID = -6385070202088819367L; - @ApiParam(value ="视图ID") + @ApiParam(value = "视图ID") @JsonSerialize(using = ToStringSerializer.class) private Long viewId; - @ApiParam(value ="视图类型") + @ApiParam(value = "视图类型") private Integer viewType; - @ApiParam(value ="视图名称") + @ApiParam(value = "视图名称") private String viewName; - @ApiParam(value ="返回信息") + @ApiParam(value = "返回信息") private String resultMessage; @ApiParam(value = "查询对象") @@ -76,7 +76,7 @@ public class TemplateModel implements Serializable { private Pager pager; @ApiParam(value = "页面查询条件") - private Map findParam; + private Map findParam; @ApiParam("执行 HQL ") private String selectSql; 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 0bb8f7c..4c5ea4f 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,12 +1,14 @@ 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; import lombok.Data; import java.io.Serializable; +import java.util.Objects; /** * @Description : 适配器model @@ -23,6 +25,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "适配器") private BsSuitCase bsSuitCase; + @ApiParam(value = "适配器同步处理Cloud微服务标识") + private Integer resultSoftType; + @ApiParam(value = "数据源适配套件") private BsSuitCaseDataSource bsSuitCaseDataSource; @@ -49,5 +54,8 @@ public class BsSuitCaseModel implements Serializable { public BsSuitCaseModel(BsSuitCase bsSuitCase) { this.bsSuitCase = bsSuitCase; + if(Objects.nonNull(bsSuitCase.getResultSoftType())){ + this.resultSoftType = bsSuitCase.getResultSoftType(); + } } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java index b5c8c0a..0be8fb7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.softswitch; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -10,7 +12,8 @@ import lombok.Data; * @Modify: **/ @Data -public class SoftswitchIocModel { +public class SoftswitchIocModel implements Serializable { + private static final long serialVersionUID = 8945557825392215914L; /* Spring Ioc Bean 名称 */ private String beanName; /* Spring Ioc 需要管理的Bean */ 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 806c17b..4c82b54 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 @@ -11,6 +11,8 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -20,8 +22,9 @@ import lombok.Data; **/ @Data @XStreamAlias("client") -public class SuitClientModel { +public class SuitClientModel implements Serializable { + private static final long serialVersionUID = -1073627855304303961L; /** * 适配套件代码 */ @@ -53,6 +56,12 @@ public class SuitClientModel { private String suitMessage; /** + * 适配发送报文信息 + */ + @XStreamCDATA + private String suitSendMessage; + + /** * 请求来源 */ private Integer requestSource; @@ -62,12 +71,13 @@ public class SuitClientModel { */ private Integer suitMethodId; - public int getSuitMethodIdVal(){ - if(suitMethodId == null){ + public int getSuitMethodIdVal() { + if (suitMethodId == null) { return -1; } return suitMethodId.intValue(); } + /** * 适配状态码 */ @@ -95,10 +105,12 @@ public class SuitClientModel { @XStreamCDATA private Object suitResultMessage; + private boolean isNeedRetry = false; + public SuitClientModel() { } - public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) { + public SuitClientModel(Integer requestSource, BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); @@ -114,7 +126,7 @@ public class SuitClientModel { this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } - public SuitClientModel(Integer requestSource,Integer suitMethodId,BsSuitCaseModel suitCaseModel) { + public SuitClientModel(Integer requestSource, Integer suitMethodId, BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; this.suitMethodId = suitMethodId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java new file mode 100644 index 0000000..28de3a4 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-18 上午10:26 + * @Modify: + **/ +@Data +public class SuitImppCloudModel implements Serializable { + + private static final long serialVersionUID = -8731173690394189107L; + @ApiParam(value = "适配器信息") + private BsSuitCaseModel model; + + @ApiParam(value = "请求参数信息") + private Object param; + + public SuitImppCloudModel() { + } + + public SuitImppCloudModel(SuitServerModel serverModel) { + this.model = serverModel.getBsSuitCaseModel(); + this.param = serverModel.getObj(); + this.param = serverModel.getObj(); + } + + public SuitImppCloudModel(BsSuitCaseModel model, Object param) { + this.model = model; + this.param = param; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java index ec7dd0a..9963d36 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.softswitch; import lombok.Data; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -13,8 +14,9 @@ import java.util.Map; * @Modify: **/ @Data -public class SuitParamModel { +public class SuitParamModel implements Serializable { + private static final long serialVersionUID = -1695550139368764444L; /* 标签名称 */ private String tagName; /* 标签 Class Path */ @@ -36,7 +38,7 @@ public class SuitParamModel { private String type; /* 标签属性 */ - private Map attr; + private Map attr; /* 父节点 */ private SuitParamModel parent; /* 标签子集 */ 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 3b2e47c..e859e21 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 @@ -8,6 +8,11 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -20,9 +25,13 @@ import java.util.Map; **/ @Data @XStreamAlias("server") -public class SuitServerModel { +@XmlRootElement(name = "server") +@XmlAccessorType(XmlAccessType.NONE) +public class SuitServerModel implements Serializable { + private static final long serialVersionUID = 3501193688956575386L; // 执行方法命令 + @XmlElement @ApiParam(value = "适配器code") private String suitCaseCode; /* 认证使用 以后使用 */ @@ -31,11 +40,12 @@ public class SuitServerModel { // 请求ID private String requestId; // 传输单对象 + @XmlElement(name = "data") private Object obj; // 传输集合 private List list; // 传输键值对 - private Map map; + private Map map; // 传输 JSON 数据 private String json; @@ -44,6 +54,7 @@ public class SuitServerModel { */ // @XStreamImplicit @XStreamCDATA + @XmlElement private String suitMessage; /** @@ -82,13 +93,13 @@ public class SuitServerModel { // @XStreamImplicit private Integer suitMethodId; - public int getSuitMethodIdVal(){ - if(suitMethodId == null){ + public int getSuitMethodIdVal() { + if (suitMethodId == null) { return -1; } return suitMethodId.intValue(); } -// @XStreamImplicit + // @XStreamImplicit private String analyzeMessage; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java index 8f48c15..6729915 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java @@ -4,8 +4,8 @@ import cn.estsh.i3plus.pojo.platform.bean.TestTransUser; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.aspectj.weaver.ast.Test; +import java.io.Serializable; import java.util.List; /** @@ -18,8 +18,9 @@ import java.util.List; @Getter @Setter @ToString -public class TestConstructModel { +public class TestConstructModel implements Serializable { + private static final long serialVersionUID = 3347578209875237950L; private long id; private TestTransUser user; 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 new file mode 100644 index 0000000..df22498 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanFieldInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448895L; + + @ApiParam(value = "表名称") + public String tableName; + + @ApiParam(value = "表字段名称") + private String fieldName; + + @ApiParam(value = "表字段描述") + private String fieldDesc; + + @ApiParam(value = "表字段类型") + private String fieldType; + + @ApiParam(value = "主键") + private String isFieldPrimaryKey; + + @ApiParam(value = "非空") + private String isFieldNull; + + @ApiParam(value = "外键") + private String isFieldForeignKey; + + @ApiParam(value = "唯一约束") + private String isFieldUnique; + + @ApiParam(value = "自增") + private String isFieldGeneric; +} 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 new file mode 100644 index 0000000..63e108f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448495L; + + @ApiParam(value = "系统名称") + public String systemName; + + @ApiParam(value = "实体名称") + public String entityName; + + @ApiParam(value = "数据表名称") + private String tableName; + + @ApiParam(value = "数据表描述") + private String tableDesc; + + @ApiParam(value = "字段列表数据") + private List fieldInfoModelList; +} 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 417c5f1..8055c00 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 @@ -73,6 +73,38 @@ public class PrintOrderDataModel implements Serializable { @Transient public String containerNo; + @ApiParam("道口") + @Transient + public String dock; + + @ApiParam("泊位") + @Transient + public String zdoc; + + @Transient + @ApiParam("计划交货日期") + private String planDate; + + @Transient + @ApiParam("计划交货时间") + private String planTime; + + @Transient + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient + public String createDateTime; + + @Transient + public String receiveDateTime; + 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 dae7847..f371330 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.wms.bean.WmsPart; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,4 +46,10 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam(value = "物料信息") public WmsPart wmsPart; + + @ApiParam(value = "条码") + public WmsStockSn wmsStockSn; + + @ApiParam(value = "新条码") + public WmsStockSn NewWmsStockSn; } 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 a5a4d10..6ef6c90 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 @@ -116,6 +116,15 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "分组KEY") public String groupKey; + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam(value = "提交模式") + private Integer commitMode; + + @ApiParam(value = "是否允许重置") + private Integer isResetAble; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; 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 5940720..e4212d3 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 @@ -7,6 +7,7 @@ import java.io.Serializable; @Data public class WmsCSOrderDetailsModel implements Serializable { + private static final long serialVersionUID = 1035157716685531017L; @ApiParam("工厂代码") public String organizeCode; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java new file mode 100644 index 0000000..ef929bb --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicator; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms健康指标模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-14 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthIndicatorModel implements Serializable { + + private static final long serialVersionUID = -6376849949646448495L; + + @ApiParam(value = "模块名称") + public String groupName; + + @ApiParam(value = "指标代码") + public String indicatorCode; + + @ApiParam(value = "指标名称") + public String indicatorName; + + @ApiParam(value = "开始时间") + public String startDateTime; + + @ApiParam(value = "结束时间") + public String endDateTime; + + @ApiParam(value = "健康指标集合") + public List healthIndicatorList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java new file mode 100644 index 0000000..e940e8e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * @Description : Wms健康指标报表模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-15 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthIndicatorReportModel implements Serializable { + + private static final long serialVersionUID = -6376850049646448495L; + + @ApiParam(value = "图表标题名称") + public String titleName; + + @ApiParam(value = "图例集合") + public Set legendList; + + @ApiParam(value = "X轴数据集合") + public List xAxisList; + + @ApiParam(value = "图表数据集合") + public List> seriesDataList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java new file mode 100644 index 0000000..d4cff64 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms健康变量参数 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-14 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthVariableParamsModel implements Serializable { + + private static final long serialVersionUID = -6376849939646448495L; + + @ApiParam(value = "开始时间") + public String startDateTime; + + @ApiParam(value = "结束时间") + public String endDateTime; + + @ApiParam(value = "适应存储区") + private String applyArea; + + @ApiParam(value = "适应物料组") + private String applyPartGroup; + + @ApiParam(value = "变量参数") + private String variableParam; + + @ApiParam(value = "工厂代码") + private String organizeCode; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java new file mode 100644 index 0000000..c64a611 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms健康变量参数 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-14 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthVariableResultModel implements Serializable { + + private static final long serialVersionUID = -6376849949646448495L; + + @ApiParam(value = "订单号") + public String orderNo; + + @ApiParam(value = "供应商名称") + public String vendorName; + + @ApiParam(value = "需求数量") + private Double qty; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partNameRdd; + + @ApiParam(value = "计划到货日期") + private String planDateTime; + + @ApiParam(value = "实际到货日期") + private String actDateTime; + + @ApiParam(value = "物料组编号") + private String partGroupNo; +} 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 index 6bfdd58..2c30912 100644 --- 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 @@ -17,6 +17,7 @@ public class WmsJobParamModel implements Serializable { private static final long serialVersionUID = 5784492509251527816L; private String organizeCode;//工厂代码 private List zonesNoList;//存储区编号 + private String src;//单据来源枚举 private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 private Integer minuteDiff;//处理周期(分钟) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 1ae6931..8dc8eed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -19,6 +19,7 @@ import java.util.List; @Api("WMS列表菜单model") public class WmsListElementModel extends BaseBean { + private static final long serialVersionUID = -4040701771244617270L; @ApiParam(value = "功能菜单ID") private Long functionId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java new file mode 100644 index 0000000..00439af --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.model.wms.engine.domain.WmsThreeDimenLocateModel; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 3D仓库-库位优化模型 + * @Reference + * @Author dragon + * @CreateDate 2020/6/1 14:22 + * @Modify + */ +@Data +public class WmsLocateListModel implements Serializable { + private static final long serialVersionUID = -2672721389336190491L; + + List unsolvedLocates; + + String organizeCode; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java new file mode 100644 index 0000000..d3c3112 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-02 9:27 + * @Modify: + **/ +@Data +public class WmsLocateModel implements Serializable { + + private static final long serialVersionUID = 2433931236774158401L; + + @ApiParam(value = "箱数") + public Long snBoxQty; + + @ApiParam(value = "最大包装数量") + public Integer maxPackageQty; + + @ApiParam(value = "库位利用率值") + public Double proportionValue; + + @ApiParam(value = "库位代码") + public String locateNo; + + @ApiParam(value = "库位名称") + public String locateName; + + @ApiParam(value = "存储区代码") + public String zoneNo; + + @ApiParam(value = "存储区名称") + public String zoneName; + + @ApiParam(value = "仓库代码") + public String whNo; + + @ApiParam(value = "仓库名称") + public String whNoName; + + @ApiParam(value = "组织代码") + public String organizeCode; + + @ApiParam(value = "库位利用率查询") + public Integer proportion; + + @ApiParam(value = "库位利用率") + public String proportionValueStr; + + public WmsLocateModel() { + } + + public WmsLocateModel(Long snBoxQty, Integer maxPackageQty, Double proportionValue, + String locateNo, String locateName, String zoneNo, + String zoneName, String whNo, String whNoName, String organizeCode) { + this.snBoxQty = snBoxQty; + this.maxPackageQty = maxPackageQty; + this.proportionValue = proportionValue; + this.locateNo = locateNo; + this.locateName = locateName; + this.zoneNo = zoneNo; + this.zoneName = zoneName; + this.whNo = whNo; + this.whNoName = whNoName; + this.organizeCode = organizeCode; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java new file mode 100644 index 0000000..4d0778d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 19:46 + * @Modify: + **/ +@Data +public class WmsMoveDetailsBySnModel implements Serializable { + + private static final long serialVersionUID = -3023644672955363786L; + + @ApiParam("明细数据") + private List detailsList; + + @ApiParam("分页") + private Pager pager; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java index c198e17..44c8c9a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -22,4 +23,7 @@ public class WmsPoSnPrintModel implements Serializable { @ApiParam("打印条码") private List wmsStockSnList; + + @ApiParam("单据条码") + private List wmsPoSnList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 185bfe5..8183d1b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -19,6 +19,7 @@ import java.util.List; @Api("WMS列表搜索model") public class WmsSearchElementModel extends BaseBean { + private static final long serialVersionUID = -5429148439603308698L; @ApiParam(value = "功能菜单ID") private Long functionId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSuspenStockSyncModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSuspenStockSyncModel.java new file mode 100644 index 0000000..cc87941 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSuspenStockSyncModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 定时同步悬挂链库存数据JOB + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-15 14:47 + * @Modify: + **/ +@Data +public class WmsSuspenStockSyncModel implements Serializable { + + private static final long serialVersionUID = -6690672187776424774L; + + private String src;// 来源数据 + private String serverUrl;//地址 + private Integer namespaceIndex;//命名空间索引，默认为2 + private String userName;//用户名 + private String password;//密码 + private Double requestInterval;//请求间隔,默认为500 + private String readTagName;//读的地址 + private String partTagNameA;//物料号A + private String partTagNameB;//物料号B + private String qtyTagNameA;//数量A + private String qtyTagNameB;//数量B + private String lotNoTagNameA;//批次A + private String lotNoTagNameB;//批次B + private String locateTagName;//库位代码 + private Integer plcExeOutTime;//超时时间 + private String ackTagName;//修改的地址 + private Integer tagValueType;//数据类型 +} 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 e55cf6c..025d045 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 @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description : 任务单模型 @@ -35,6 +36,9 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "关联单据业务类型代码") private String busiTypeCode; + @ApiParam(value = "关联单据业务类型代码集合") + private List busiTypeCodeLst; + @ApiParam(value = "计划日期") private String zdate; @@ -62,11 +66,36 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "关联单据类型") public String refType; + @ApiParam(value = "erp单号") + public String erpSrcNo; + + @ApiParam(value = "工厂代码") + public String organizeCode; + 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) { + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.opTypeName = opTypeName; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + this.busiTypeCode = busiTypeCode; + this.zdate = zdate; + this.ztime = ztime; + this.custNo = custNo; + this.vendorNo = vendorNo; + this.createDatetime = createDatetime; + this.srcZoneNo = srcZoneNo; + this.createUser = createUser; + this.organizeCode = organizeCode; + } + + 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) { this.orderNo = orderNo; this.taskStatus = taskStatus; @@ -82,4 +111,9 @@ public class WmsTaskInfoModel implements Serializable { this.srcZoneNo = srcZoneNo; this.createUser = createUser; } + + public WmsTaskInfoModel(String organizeCode, String busiTypeCode) { + this.organizeCode = organizeCode; + this.busiTypeCode = busiTypeCode; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java new file mode 100644 index 0000000..32d4268 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.model.wms.engine.domain; + +import lombok.Getter; +import org.optaplanner.core.api.domain.solution.PlanningEntityCollectionProperty; +import org.optaplanner.core.api.domain.solution.PlanningScore; +import org.optaplanner.core.api.domain.solution.PlanningSolution; +import org.optaplanner.core.api.domain.solution.drools.ProblemFactCollectionProperty; +import org.optaplanner.core.api.domain.valuerange.ValueRangeProvider; +import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore; + +import java.util.List; + +@PlanningSolution +public class LocateAssign { + + private List wmsThreeDimenLocateModelList; + private List locationList; + /** + * 平均进出库次数，用于分数计算 + */ + @Getter + private int avgLocateFrequence; + + private HardSoftScore score; + + @ValueRangeProvider(id = "locationRange") + @ProblemFactCollectionProperty + public List getLocationList() { + return this.locationList; + } + + public void setLocationList(List locationList) { + this.locationList = locationList; + } + + @PlanningEntityCollectionProperty + public List getWmsThreeDimenLocateModelList() { + return this.wmsThreeDimenLocateModelList; + } + + public void setWmsThreeDimenLocateModelList(List wmsThreeDimenLocateModelList) { + this.wmsThreeDimenLocateModelList = wmsThreeDimenLocateModelList; + + long totalFrequence = 0; + + for (WmsThreeDimenLocateModel wmsThreeDimenLocateModel : wmsThreeDimenLocateModelList) { + totalFrequence += wmsThreeDimenLocateModel.getFrequency(); + } + // 计算平均进出库次数 + this.avgLocateFrequence = (int)(totalFrequence / wmsThreeDimenLocateModelList.size()); + } + + @PlanningScore + public HardSoftScore getScore() { + return this.score; + } + + public void setScore(HardSoftScore score) { + this.score = score; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java new file mode 100644 index 0000000..c1d191f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.model.wms.engine.domain; + + +import java.util.Comparator; + +public class LocateStrengthComparator implements Comparator { + @Override + public int compare(WmsThreeDimenLocateModel o1, WmsThreeDimenLocateModel o2) { + return o1.getFrequency() - o2.getFrequency(); + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java new file mode 100644 index 0000000..d097975 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.model.wms.engine.domain; + + +import java.util.Comparator; + +public class LocationStrengthComparator implements Comparator { + @Override + public int compare(Integer seq1, Integer seq2) { + return seq1 - seq2; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java new file mode 100644 index 0000000..8167e1f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java @@ -0,0 +1,114 @@ +package cn.estsh.i3plus.pojo.model.wms.engine.domain; + +import lombok.Getter; +import lombok.Setter; +import org.optaplanner.core.api.domain.entity.PlanningEntity; +import org.optaplanner.core.api.domain.lookup.PlanningId; +import org.optaplanner.core.api.domain.variable.PlanningVariable; + + +/** + * 库位 + */ +@PlanningEntity(difficultyComparatorClass = LocateStrengthComparator.class) +public class WmsThreeDimenLocateModel { + /** + * 工厂代码 + */ + @Getter + @Setter + private String organizeCode; + /** + * 仓库编码 + */ + @Getter + @Setter + private String whNo; + /** + * 存储区编码 + */ + @Getter + @Setter + private String zoneNo; + /** + * 家具编码 + */ + @Getter + @Setter + private String furnitureNo; + /** + * 库位代码 + */ + @Getter + @Setter + @PlanningId + private String locateNo; + /** + * X + */ + @Getter + @Setter + private int x; + + /** + * X + */ + @Getter + @Setter + private int y; + + /** + * X + */ + @Getter + @Setter + private int z; + /* + 库位在指定时间内的移动频率 + */ + @Getter + @Setter + private int frequency; + /** + * 库位的原始坐标 + */ + @Getter + @Setter + private int originSeq; + /** + * 库位当前的坐标，此处只用了一纬坐标，二维坐标需要映射到一纬空间内 + */ + private int destSeq; + + + public WmsThreeDimenLocateModel() { + } + + //3D仓库-库位移动频率热力图 + public WmsThreeDimenLocateModel(String organizeCode, String whNo, String zoneNo, + String locateNo, Integer seq, Long frequency, String furnitureNo, + Integer x, Integer y, Integer z) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.originSeq = seq; + this.destSeq = seq; + this.frequency = Integer.parseInt(frequency.toString()); + this.furnitureNo = furnitureNo; + this.x = x; + this.y = y; + this.z = z; + } + + @PlanningVariable(valueRangeProviderRefs = {"locationRange"}, + strengthComparatorClass = LocationStrengthComparator.class) + public Integer getDestSeq() { + return this.destSeq; + } + + public void setDestSeq(Integer destSeq) { + this.destSeq = destSeq; + } + +} diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index a785f21..5896851 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/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index f0f7fb2..b372f78 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.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 cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -35,6 +36,14 @@ public class SysConfig extends BaseBean { @ApiParam(value ="名称") private String name; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + @Column(name="CONFIG_TYPE") @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") private Integer configType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java new file mode 100644 index 0000000..fce7b6f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java @@ -0,0 +1,88 @@ +package cn.estsh.i3plus.pojo.platform.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; + +/** + * @Description : 数据对象 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-02-27 10:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_DATA_SOURCE") +@Api(value="数据对象") +public class SysDataSource extends BaseBean { + + private static final long serialVersionUID = -3116421427693381484L; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="SOURCE_NAME") + @ApiParam(value ="数据源名称") + private String sourceName; + + @Column(name="SOURCE_CODE") + @ApiParam(value ="数据源编码") + private String sourceCode; + + @Column(name="SOURCE_STATUS") + @ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在") + private Integer sourceStatus; + public String getSourceStatusTxt() { + return softType == null ? null : CommonEnumUtil.DATA_SOURCE_STATUS.valueOfDescription(sourceStatus); + } + + @Column(name="SOURCE_TYPE") + @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") + private Integer sourceType; + public String getSourceTypeTxt() { + return softType == null ? null : CommonEnumUtil.DATA_SOURCE_TYPE.valueOfDescription(sourceType); + } + + + @Column(name="SOURCE_HOST") + @ApiParam(value ="数据源连接地址") + private String sourceHost; + + @Column(name="SOURCE_PORT") + @ApiParam(value ="数据源端口") + private Integer sourcePort; + + @Column(name="SOURCE_DATA_BASE_NAME") + @ApiParam(value ="数据库名称") + private String sourceDataBaseName; + + @Column(name="SOURCE_USER_NAME") + @ApiParam(value ="数据库用户名称") + private String sourceUserName; + + @Column(name="SOURCE_PASSWORD") + @ApiParam(value ="数据库用户密码") + private String sourcePassword; + + @Column(name="SOURCE_DESCRIPTION") + @ApiParam(value ="数据源描述") + private String sourceDescription; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java index 79daa0f..4121b94 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java @@ -68,4 +68,12 @@ public class SysDepartment extends BaseBean { @ApiParam(value ="子集列表") private List childList; + public SysDepartment() { + } + + public SysDepartment(String departmentCode, Long parentId, Long organizeId) { + this.departmentCode = departmentCode; + this.parentId = parentId; + this.organizeId = organizeId; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 8a47f38..59afede 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -113,4 +113,10 @@ public class SysMenu extends BaseBean { @ApiParam(value ="子集列表") private List childList = new ArrayList<>(); + public SysMenu() { + } + + public SysMenu(String menuCode) { + this.menuCode = menuCode; + } } 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 8eacda3..e41ee5c 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 @@ -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; @@ -10,7 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Subselect; import javax.persistence.*; import java.util.List; @@ -32,6 +32,7 @@ import java.util.List; public class SysMessage extends BaseBean { private static final long serialVersionUID = -6090909263221993356L; + @Column(name = "MESSAGE_TITLE") @ApiParam(value = "消息标题", access = "消息标题") private String messageTitle; @@ -45,7 +46,7 @@ public class SysMessage extends BaseBean { private Integer messageType; public int getMessageTypeValue() { - if(this.messageType == null){ + if (this.messageType == null) { return 0; } else { return this.messageType.intValue(); @@ -94,13 +95,22 @@ public class SysMessage extends BaseBean { @ApiParam(value = "是否系统邮件") private Integer isSystem; + @Column(name = "SEND_STATUS") + @ApiParam(value = "发送状态") + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_SEND_STATUS.class) + private Integer sendStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + private String errorMessage; + @Transient @ApiParam(value = "阅读统计") @JsonSerialize(using = ToStringSerializer.class) private Long readCount; - public long getReadCountVal(){ - if(readCount == null){ + public long getReadCountVal() { + if (readCount == null) { return 0; } else { return readCount.longValue(); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index 2bb58d7..e8162c5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -80,4 +80,13 @@ public class SysOrganize extends BaseBean { @ApiParam(value ="子集ID列表") private List childIdList; + public SysOrganize() { + } + + public SysOrganize(String organizeCode, Integer organizeType, Long parentId, Integer organizeStatus) { + this.organizeCode = organizeCode; + this.organizeType = organizeType; + this.parentId = parentId; + this.organizeStatus = organizeStatus; + } } 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 new file mode 100644 index 0000000..8c7a6cb --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java @@ -0,0 +1,91 @@ +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.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.*; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-20 上午9:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_POJO_VERSION",indexes = { + @Index(name="index_sys_pojo_version_ref_id",columnList = "REF_ID"), + @Index(name="index_sys_pojo_version_ref_class",columnList = "REF_CLASS"), +}) +@Api(value="对象历史") +public class SysPojoVersion extends BaseBean { + + private static final long serialVersionUID = -2265406135818649545L; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="PLAN_ID") + @ApiParam(value ="对象计划id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long planId; + + @Column(name="REF_ID") + @ApiParam(value ="对象id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long refId; + + @Column(name="REF_CLASS") + @ApiParam(value ="记录对象") + private String refClass; + + @Column(name="VERSION_NO") + @ApiParam(value ="记录对象版本号") + private Integer versionNo = 0; + + @Column(name="operateType") + @ApiParam(value ="操作类型") + private Integer operateType; + public String getOperateTypeTxt() { + return operateType == null ? null : CommonEnumUtil.DAO_OPERATE_TYPE.valueOf(operateType); + } + + @Column(name="VERSION_METHOD_NAME") + @ApiParam(value ="操作方法名称") + private String versionMethodName; + + @Column(name="POJO_DETAIL_ID") + @ApiParam(value ="对象明细id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoDetailId; + + @Lob + @Column(name="POJO_COMPARE") + @ApiParam(value ="记录对象对比差异") + private String pojoCompare; + + @Transient + @ApiParam(value ="用户部门信息") + private SysPojoVersionDetail versionDetail; + + @Transient + @ApiParam(value ="操作对象本身") + private String bean; +} 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 new file mode 100644 index 0000000..9831c18 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.platform.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-20 上午9:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_POJO_VERSION_DETAIL") +@Api(value="对象历史") +public class SysPojoVersionDetail extends BaseBean { + + private static final long serialVersionUID = 5385530381442176242L; + @Column(name="POJO_VERSION_ID") + @ApiParam(value ="对象id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoVersionId; + + @Lob + @Column(name="POJO_BEFORE",length = 5000) + @ApiParam(value ="原始对象信息") + private String pojoBefore; + + @Lob + @Column(name="POJO_AFTER",length = 5000) + @ApiParam(value ="修改之后对象信息") + private String pojoAfter; + + @Lob + @Column(name="POJO_COMPARE",length = 5000) + @ApiParam(value ="记录对象对比差异") + private String pojoCompare; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java new file mode 100644 index 0000000..8be2265 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.platform.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; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-20 上午9:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_POJO_VERSION_PLAN") +@Api(value="对象历史") +public class SysPojoVersionPlan extends BaseBean { + + private static final long serialVersionUID = -3125272220108497862L; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="REF_CLASS") + @ApiParam(value ="记录对象") + private String refClass; + + @Column(name="REF_CLASS_TITLE") + @ApiParam(value ="记录对象名称") + private String refClassTitle; + + @Column(name="PLAN_STATUS") + @ApiParam(value ="记录对象状态") + private Integer planStatus; + + @Column(name="PLAN_DESCRIPTION") + @ApiParam(value ="记录对象描述") + private String planDescription; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java index 1479652..9040b15 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java @@ -59,4 +59,11 @@ public class SysPosition extends BaseBean { @ApiParam(value ="子部门列表") private List childList; + public SysPosition() { + } + + public SysPosition(String positionCode, Long parentId) { + this.positionCode = positionCode; + this.parentId = parentId; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java index 68dabba..4743182 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java @@ -13,7 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import java.text.DecimalFormat; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 关系-角色菜单 @@ -32,6 +33,7 @@ import java.text.DecimalFormat; public class SysRefRoleMenu extends BaseBean { private static final long serialVersionUID = -2013469818246101184L; + @Column(name="MENU_ID") @ApiParam(value ="菜单ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -50,10 +52,18 @@ public class SysRefRoleMenu extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long roleId; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + @Column(name="ROLE_NAME_Rdd") @ApiParam(value ="角色名称" , access ="角色名称") private String roleNameRdd; + @Transient + @ApiParam(value ="权限ID列表" , access ="权限ID列表") + private List menuIdList; + public SysRefRoleMenu() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 9786250..788a76c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -11,10 +11,8 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; +import java.util.List; /** * @Description : 用户登陆表 @@ -53,4 +51,15 @@ public class SysRole extends BaseBean { @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1") private Integer roleStatus; + @Transient + @ApiParam(value ="角色拥有功能权限信息") + private transient List menuIdList; + + public SysRole() { + } + + public SysRole(String name, Integer roleStatus) { + this.name = name; + this.roleStatus = roleStatus; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index 5f54d24..641bee9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -1,6 +1,8 @@ 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; @@ -9,7 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; @@ -139,4 +140,14 @@ public class SysTaskPlan extends BaseBean { } return taskPlanStatus.intValue(); } + + // 枚举 ImppEnumUtil.MESSAGE_TYPE + @Column(name = "LOG_LEVEL") + @ApiParam(value = "日志等级") + @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class) + private Integer logLevel; + + public int getLogLevelVal() { + return logLevel == null ? ImppEnumUtil.LOG_LEVEL.ERROR.getValue() : logLevel; + } } 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 9afa74c..643cb74 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 @@ -54,10 +54,16 @@ public class SysUser extends BaseBean { @ApiParam(value ="工号") private String userEmpNo; + @Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用 @Column(name="USER_LOGIN_PASSWORD") @ApiParam(value ="登陆密码") private String userLoginPassword; + @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") private Integer userType; @@ -78,6 +84,7 @@ public class SysUser extends BaseBean { @ApiParam(value ="登录次数",example = "0") private Integer userLoginNum; + @Deprecated @Column(name="USER_LOGIN_LAST_DATE_TIME") @ApiParam(value ="账号最后登录时间") private String userLoginLastDateTime; 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 0a3735b..fded310 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 @@ -247,4 +247,9 @@ public class SysUserInfo extends BaseBean { @ApiParam(value = "岗位信息") @AnnoOutputColumn(hidden = true) private SysPosition position; + + @Transient + @ApiParam(value = "图像信息") + @AnnoOutputColumn(hidden = true) + private String imageFileUrl; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java new file mode 100644 index 0000000..bd94c41 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.platform.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 : wei.peng + * @CreateDate : 20-6-4 下午3:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_USER_PASSWORD") +@Api(value="账号密码") +public class SysUserPassword extends BaseBean { + private static final long serialVersionUID = 4536854582252378921L; + + @Column(name="USER_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="USER_PASSWORD") + @ApiParam(value ="用户密码") + private String userPassword; + + @Column(name="USER_LOGIN_LAST_DATE_TIME") + @ApiParam(value ="账号最后登录时间") + private String userLoginLastDateTime; + + public SysUserPassword() { + } + + public SysUserPassword(Long userId, String userPassword) { + this.userId = userId; + this.userPassword = userPassword; + } +} 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 new file mode 100644 index 0000000..d53eb6b --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -0,0 +1,138 @@ +package cn.estsh.i3plus.pojo.platform.platbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.mapping.Document; + +import javax.persistence.Column; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-9 下午8:41 + * @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 e4b46a1..90e1854 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 @@ -10,6 +10,7 @@ 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; @@ -23,7 +24,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -31,19 +32,15 @@ import javax.persistence.Table; @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { + private static final long serialVersionUID = -2844455884020022321L; //CommonEnumUtil.SOFT_TYPE @Indexed - @Column(name="EXC_MODULE_ID") + @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") - private Integer excModule; - - private String excModuleName; - public String getExcModuleName(){ - if(this.excModule != null){ - return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.excModule); - } - return excModuleName; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } @Column(name="EXC_CLASS_NAME") 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 c9d392c..f14accf 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 @@ -13,6 +13,7 @@ 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; @@ -26,7 +27,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -34,18 +35,14 @@ import javax.persistence.Table; @Api(value="操作日志表",description = "操作日志表") public class SysLogOperate extends BaseBean { + private static final long serialVersionUID = 1515035521283176727L; @Indexed - @Column(name="OPERATE_MODULE") + @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") - private Integer operateModule; - - private String operateModuleName; - public String getOperateModuleName(){ - if(this.operateModule != null){ - return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.operateModule); - } - return operateModuleName; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } @Indexed @@ -54,8 +51,8 @@ public class SysLogOperate extends BaseBean { @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") private Integer operateType; - public String getOperateTypeName(){ - return ImppEnumUtil.OPERATE_TYPE.valueOfCode(operateType); + public String getOperateTypeTxt(){ + return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType); } @Column(name="OPERATE_MESSAGE") @@ -74,9 +71,9 @@ public class SysLogOperate extends BaseBean { @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; - @Column(name="HTTP_METHOD") - @ApiParam(value ="http请求方法" , access ="http请求方法") - private String httpMethod; +// @Column(name="HTTP_METHOD") +// @ApiParam(value ="http请求方法" , access ="http请求方法") +// private String httpMethod; @Column(name="LOG_ARGS") @ApiParam(value ="方法入参" , access ="方法入参") 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 5d81ed5..c45cd05 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 @@ -13,6 +13,7 @@ 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; @@ -26,7 +27,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -34,17 +35,33 @@ import javax.persistence.Table; @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; + public String getLogLevelTxt() { + 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; + public String getSoftTypeTxt() { + 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; + public String getLogModuleId() { + return logModuleId == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(logModuleId); + } @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") 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 5268d83..1294aa0 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 @@ -12,9 +12,9 @@ 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; /** @@ -25,7 +25,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -33,6 +33,7 @@ import javax.persistence.Table; @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; @@ -43,7 +44,7 @@ public class SysLogTaskTime extends BaseBean { @Column(name="SCHEDULER_SERVER_PORT") @ApiParam(value ="调度服务器端口") - private String schedulerServerPort; + private Integer schedulerServerPort; @Column(name="TASK_THREAD_ID") @ApiParam(value ="任务线程id") @@ -63,9 +64,12 @@ public class SysLogTaskTime extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskPlanId; - @Column(name = "TASK_SOFT_TYPE_RDD") - @ApiParam(value = "任务所属模块") - private Integer taskSoftTypeRdd; + @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 ="任务周期名称") @@ -86,6 +90,10 @@ public class SysLogTaskTime extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer taskStatus; + public int getTaskStatusVal() { + return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus; + } + @Column(name="TASK_LOG_ERROR") @ApiParam(value ="任务异常日志") private String taskLogError; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java new file mode 100644 index 0000000..15c469b --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.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.SysDataSource; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-11 上午11:05 + * @Modify: + **/ +public interface SysDataSourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java new file mode 100644 index 0000000..33af517 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.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.SysPojoVersionDetail; + +/** + * @Description : 对象记录明细 + * @Reference : + * @Author : wei.peng + * @Date : 2020-04-21 14:19:34 + * @Modify : + **/ +public interface SysPojoVersionDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java new file mode 100644 index 0000000..feaa6da --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.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.SysPojoVersionPlan; + +/** + * @Description : 对象记录拦截 + * @Reference : + * @Author : wei.peng + * @Date : 2020-04-21 14:19:34 + * @Modify : + **/ +public interface SysPojoVersionPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.java new file mode 100644 index 0000000..78fbb6f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.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.SysPojoVersion; + +/** + * @Description : 对象记录 + * @Reference : + * @Author : wei.peng + * @Date : 2020-04-21 14:19:34 + * @Modify : + **/ +public interface SysPojoVersionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java deleted file mode 100644 index 749dd25..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; - -/** - * @Description : 定时任务执行记录 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:01.409 - * @Modify : - **/ -public interface SysTaskTimeRecordingRepository extends BaseRepository { -} 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/repository/SysUserPasswordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java new file mode 100644 index 0000000..dda7e76 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.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.SysUserPassword; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-6-4 下午3:46 + * @Modify: + **/ +public interface SysUserPasswordRepository 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 cc0e5e9..0da42ea 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 @@ -26,13 +26,14 @@ public class CoreHqlPack { /** * In 参数封装 + * * @param columnName * @return */ - public static String packHqlIds(String columnName, String[] params){ - StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + public static String packHqlIds(String columnName, String[] params) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getInPack(String.join(",", params), columnName, result); return result.toString(); } @@ -40,39 +41,71 @@ public class CoreHqlPack { /** * In 参数封装 + * * @param columnName * @return */ - public static String packHqlIds(String columnName, Long[] params){ - StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + public static String packHqlIds(String columnName, Long[] params) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(StringUtils.join(params,","),columnName,result); + HqlPack.getInPack(StringUtils.join(params, ","), columnName, result); return result.toString(); } + + /** + * In 参数封装 + * + * @param columnName + * @return + */ + public static DdlPackBean packHqlInStr(String columnName, String[] params) { + DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); + DdlPreparedPack.getInPack(params, columnName, ddlPackBean); + return ddlPackBean; + } + + /** + * In 参数封装 + * + * @param columnName + * @return + */ + public static DdlPackBean packHqlIn(String columnName, List params) { + DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); + DdlPreparedPack.getInPack(params, columnName, ddlPackBean); + return ddlPackBean; + } + + /** * 资源查询 + * * @param resource * @return */ - public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource){ + public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource) { DdlPackBean result = DdlPackBean.getDdlPackBean(); - if(resource != null){ - DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + if (resource != null) { + DdlPreparedPack.getNumEqualPack(resource.getResourceType(), "resourceType", result); // 是否多类型查询 - if(StringUtils.isNotBlank(resource.getResourceTypes())){ + if (StringUtils.isNotBlank(resource.getResourceTypes())) { DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); } - DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result); - DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); - DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); - DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result); - DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result); + DdlPreparedPack.getNumEqualPack(resource.getSoftType(), "softType", result); + DdlPreparedPack.getNumEqualPack(resource.getIsSystem(), "isSystem", result); + DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(), "languageCode", result); + DdlPreparedPack.getStringLikerPack(resource.getResourceKey(), "resourceKey", result); + DdlPreparedPack.getStringLikerPack(resource.getResourceValue(), "resourceValue", result); } return result; @@ -80,6 +113,7 @@ public class CoreHqlPack { /** * 语言 + * * @param localeLanguage * @return */ @@ -90,9 +124,9 @@ public class CoreHqlPack { // HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(), // "createDateTime", result, false); //字符串类型封装 - HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(),"languageCode",result); + HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(), "languageCode", result); //字符串类型封装 - HqlPack.getStringLikerPack(localeLanguage.getLanguageName(),"languageName",result); + HqlPack.getStringLikerPack(localeLanguage.getLanguageName(), "languageName", result); // 添加默认排序 HqlPack.getOrderDefault(localeLanguage); @@ -102,37 +136,55 @@ public class CoreHqlPack { /** * 岗位复杂查询 + * * @param position * @return */ - public static DdlPackBean packHqlSysPosition(SysPosition position){ - return packHqlSysPosition(position,null); + public static DdlPackBean packHqlSysPosition(SysPosition position) { + return packHqlSysPosition(position, null); } - public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ + public static DdlPackBean packHqlSysPosition(SysPosition position, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode()); // 查询参数封装 -// DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(position.getParentId(), "parentId", result); // String Like - DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); + DdlPreparedPack.getStringLikerPack(position.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(position.getPositionCode(), "positionCode", result); // In - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); return result; } /** * 岗位复杂查询 + * * @param position * @return */ - public static DdlPackBean packHqlSysPositionList(SysPosition position){ + public static DdlPackBean packHqlSysPositionList(SysPosition position) { DdlPackBean result = DdlPackBean.getDdlPackBean(position); // 查询参数封装 - DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(), "organizeCode", result); + + return result; + } + + + /** + * 岗位复杂查询 + * + * @param bean + * @return + */ + public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean) { + DdlPackBean result = DdlPackBean.getDdlPackBean(bean); + + // 查询参数封装 + DdlPreparedPack.getNumEqualPack(bean.getUserId(), "userId", result); return result; } @@ -140,19 +192,20 @@ public class CoreHqlPack { /** * 组织复杂查询 + * * @param organize * @return */ - public static String packHqlSysOrganize(SysOrganize organize){ + public static String packHqlSysOrganize(SysOrganize organize) { StringBuffer result = new StringBuffer(); // 查询参数封装 - if(organize.getChildIdList() != null){ - HqlPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result); + if (organize.getChildIdList() != null) { + HqlPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result); } - HqlPack.getStringLikerPack(organize.getName(),"name",result); - HqlPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringLikerPack(organize.getName(), "name", result); + HqlPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result); // 添加默认排序 HqlPack.getOrderDefault(organize); @@ -160,43 +213,54 @@ public class CoreHqlPack { return result.toString(); } - public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ + public static DdlPackBean packHqlSysOrganize(SysOrganize organize, List idList) { + HqlPack.getOrderDefault(organize); + DdlPackBean result = DdlPackBean.getDdlPackBean(organize); - // String Like - DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringLikerPack(organize.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(organize.getParentId(), "parentId", result); + + // 查询参数封装 + if (organize.getChildIdList() != null) { + DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result); + } + // Number In - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); + return result; } - public static String packHqlSysOrganize(Long[] ids, Integer typeId){ + public static String packHqlSysOrganize(Long[] ids, Integer typeId) { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getInPack(StringUtils.join(ids,","),"id",result); - HqlPack.getNumEqualPack(typeId,"organizeType",result); + HqlPack.getInPack(StringUtils.join(ids, ","), "id", result); + HqlPack.getNumEqualPack(typeId, "organizeType", result); return result.toString(); } /** * 部门复杂查询 + * * @param department * @return */ - public static String packHqlSysDepartment(SysDepartment department){ + @Deprecated + public static String packHqlSysDepartment(SysDepartment department) { StringBuffer result = new StringBuffer(); // if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ // department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); // } - HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(department.getParentId(), "parentId", result); // HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); - HqlPack.getStringLikerPack(department.getName(),"name",result); - HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); + HqlPack.getStringLikerPack(department.getName(), "name", result); + HqlPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result); // 添加默认排序 HqlPack.getOrderDefault(department); @@ -204,55 +268,36 @@ public class CoreHqlPack { return result.toString(); } - public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){ + public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(department); - DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getStringLikerPack(department.getName(), "name", result); + DdlPreparedPack.getNumEqualPack(department.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(department.getOrganizeId(), "organizeId", result); + DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result); + DdlPreparedPack.getInPackList(idList, "id", result); result.setOrderByStr(department.orderBy()); return result; } - /** - * 系统权限复杂查询 - * @param menu - * @return - */ - public static String packHqlSysMenu(SysMenu menu){ - StringBuffer result = new StringBuffer(); - - // 查询参数封装 - HqlPack.getNumEqualPack(menu.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(menu.getMenuType(),"menuType",result); - HqlPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - HqlPack.getStringLikerPack(menu.getName(),"name",result); - HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); - - // 添加默认排序 - HqlPack.getOrderDefault(menu); - - return result.toString(); - } - - public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ + public static DdlPackBean packDdlBeanSysMenu(SysMenu menu, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(menu); - DdlPreparedPack.getInPackList(idList,"id",result); - if(menu != null){ - DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + DdlPreparedPack.getInPackList(idList, "id", result); + if (menu != null) { + DdlPreparedPack.getNumEqualPack(menu.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(menu.getMenuType(), "menuType", result); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(), "menuStatus", result); + DdlPreparedPack.getStringLikerPack(menu.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(menu.getMenuCode(), "menuCode", result); result.setOrderByStr(menu.orderBy()); - }else { + } else { menu = new SysMenu(); } - if(!StringUtils.isNotBlank(menu.getOrderByParam())){ + if (!StringUtils.isNotBlank(menu.getOrderByParam())) { menu.setOrderByParam("menuSort"); menu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); result.setOrderByStr(menu.orderBy()); @@ -263,16 +308,17 @@ public class CoreHqlPack { /** * 系统角色复杂查询 + * * @param role * @return */ @Deprecated - public static String packHqlSysRole(SysRole role){ + public static String packHqlSysRole(SysRole role) { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); - HqlPack.getStringLikerPack(role.getName(),"name",result); + HqlPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result); + HqlPack.getStringLikerPack(role.getName(), "name", result); // 添加默认排序 HqlPack.getOrderDefault(role); @@ -282,37 +328,53 @@ public class CoreHqlPack { /** * 系统角色复杂查询 + * + * @param role + * @return + */ + public static DdlPackBean packDdlBeanSysRole(SysRole role) { + return packDdlBeanSysRole(role, null); + } + + /** + * 唯一校验 + * * @param role * @return */ - public static DdlPackBean packDdlBeanSysRole(SysRole role){ - return packDdlBeanSysRole(role,null); + public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(role.getId(), "id", result); + DdlPreparedPack.getStringEqualPack(role.getName(), "name", result); + return result; } - public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){ + public static DdlPackBean packDdlBeanSysRole(SysRole role, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(role); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); - DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); - DdlPreparedPack.getStringLikerPack(role.getName(),"name",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result); + DdlPreparedPack.getStringLikerPack(role.getName(), "name", result); + DdlPreparedPack.getInPackList(idList, "id", result); - return result; + return result; } /** * 系统参数复杂查询 + * * @param config * @return */ - public static DdlPackBean packHqlSysConfig(SysConfig config) { + public static DdlPackBean packHqlSysConfig(SysConfig config) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getStringLikerPack(config.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result); - DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result); + DdlPreparedPack.getStringLikerPack(config.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", result); + DdlPreparedPack.getNumEqualPack(config.getConfigType(), "configType", result); DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result); // 添加默认排序 @@ -323,6 +385,7 @@ public class CoreHqlPack { /** * 字典信息复杂查询 + * * @param dictionary * @return */ @@ -334,11 +397,13 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 默认查询非顶级字典 - if (dictionary.getParentId() == null || dictionary.getParentId() < 1){ + if (dictionary.getParentId() == null || dictionary.getParentId() < 1) { DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result); + DdlPreparedPack.getStringLikerPack(dictionary.getParentNameRdd(), "parentNameRdd", result); + DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryValue(), "dictionaryValue", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 添加默认排序 @@ -349,6 +414,7 @@ public class CoreHqlPack { /** * 硬件类型复杂查询 + * * @param toolType * @return */ @@ -356,7 +422,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(toolType.getName(),"name", result); + HqlPack.getStringLikerPack(toolType.getName(), "name", result); // 添加默认排序 HqlPack.getOrderDefault(toolType); @@ -366,6 +432,7 @@ public class CoreHqlPack { /** * 硬件复杂查询 + * * @param tool * @return */ @@ -373,13 +440,13 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(tool.getName(),"name",result); - HqlPack.getNumEqualPack(tool.getToolTypeId(),"toolTypeId",result); - HqlPack.getNumEqualPack(tool.getToolStatus(),"toolStatus",result); - HqlPack.getNumEqualPack(tool.getToolDataType(),"toolDataType",result); - HqlPack.getNumEqualPack(tool.getToolConnType(),"toolConnType",result); - HqlPack.getStringLikerPack(tool.getToolIp(),"toolIp",result); - HqlPack.getNumLikerPack(tool.getToolPort(),"toolPort",result); + HqlPack.getStringLikerPack(tool.getName(), "name", result); + HqlPack.getNumEqualPack(tool.getToolTypeId(), "toolTypeId", result); + HqlPack.getNumEqualPack(tool.getToolStatus(), "toolStatus", result); + HqlPack.getNumEqualPack(tool.getToolDataType(), "toolDataType", result); + HqlPack.getNumEqualPack(tool.getToolConnType(), "toolConnType", result); + HqlPack.getStringLikerPack(tool.getToolIp(), "toolIp", result); + HqlPack.getNumLikerPack(tool.getToolPort(), "toolPort", result); // 添加默认排序 HqlPack.getOrderDefault(tool); @@ -389,38 +456,38 @@ public class CoreHqlPack { /** * 消息复杂查询 + * * @param message * @return */ - public static DdlPackBean packHqlSysMessage(SysMessage message){ + public static DdlPackBean packHqlSysMessage(SysMessage message) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(message); // hql拼接 DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean); DdlPreparedPack.getStringLikerPack(message.getMessageContent(), "messageContent", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getMessageType(), "messageType", ddlPackBean); - DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd", - ddlPackBean); - DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd", - ddlPackBean); - DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean, - false, false); + DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd", ddlPackBean); + DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd", ddlPackBean); + DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean, false, false); DdlPreparedPack.getNumEqualPack(message.getMessageSenderId(), "messageSenderId", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean); DdlPreparedPack.getOrderDefault(message); - return ddlPackBean; + return ddlPackBean; } /** * 文件资源复杂查询 + * * @param file * @return */ public static DdlPackBean packHqlSysFile(SysFile file) { - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(file); // hql拼接 DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result); @@ -430,43 +497,39 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result); DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false); - // 添加默认排序 - DdlPreparedPack.getOrderDefault(file); - - return result; + return result; } /** * 任务周期复杂查询 + * * @param sysTaskCycle * @return */ - public static String packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) { + DdlPackBean result = DdlPackBean.getDdlPackBean(sysTaskCycle); // hql拼接 - HqlPack.getStringLikerPack(sysTaskCycle.getName(), "name", result); - HqlPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result); - - // 添加默认排序 - HqlPack.getOrderDefault(sysTaskCycle); + DdlPreparedPack.getStringLikerPack(sysTaskCycle.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result); - return result.toString(); + return result; } /** * 定时任务复杂查询 + * * @param sysTaskPlan * @return */ - public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ + public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(), "groupName", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(), "taskPlanStatus", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(), "taskCycleId", result); DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result); DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true); @@ -474,57 +537,59 @@ public class CoreHqlPack { // 添加默认排序 DdlPreparedPack.getOrderDefault(sysTaskPlan); - return result; + return result; } /** * 账号复杂查询 + * * @param user * @return */ - public static String packHqlSysUser(SysUser user){ + public static String packHqlSysUser(SysUser user) { StringBuffer result = new StringBuffer(); // And X = X - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); - - if(user.getRoleIdList() != null){ - HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(user.getDepartmentId(), "departmentId", result); + HqlPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); + HqlPack.getStringEqualPack(user.getOrganizeCode(), "organizeCode", result); + + if (user.getRoleIdList() != null) { + HqlPack.getInPack(StringUtils.join(user.getRoleIdList(), ","), "id", result); } - if(user.getDepartmentIdList() != null){ - HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(),","),"id",result); + if (user.getDepartmentIdList() != null) { + HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(), ","), "id", result); } // And Like % % - HqlPack.getStringLikerPack(user.getUserName(),"userName",result); - HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + HqlPack.getStringLikerPack(user.getUserName(), "userName", result); + HqlPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + HqlPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + HqlPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); // 添加默认排序 HqlPack.getOrderDefault(user); - return result.toString(); + return result.toString(); } - public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){ + public static DdlPackBean packDdlBeanSysUser(SysUser user, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(user); - DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + 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.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); result.setOrderByStr(user.orderBy()); return result; @@ -532,52 +597,54 @@ public class CoreHqlPack { /** * 账号复杂查询 + * * @param user * @return */ - public static DdlPackBean packDdlSysUser(SysUser user){ + public static DdlPackBean packDdlSysUser(SysUser user) { DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(user); // And X = X - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack); - DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",ddlPack); - DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",ddlPack); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPack); + DdlPreparedPack.getNumEqualPack(user.getDepartmentId(), "departmentId", ddlPack); + DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", ddlPack); - if(user.getRoleIdList() != null){ - DdlPreparedPack.getInPack(user.getRoleIdList(),"id",ddlPack); + if (user.getRoleIdList() != null) { + DdlPreparedPack.getInPack(user.getRoleIdList(), "id", ddlPack); } - if(user.getDepartmentIdList() != null){ - DdlPreparedPack.getInPack(user.getDepartmentIdList(),"id",ddlPack); + if (user.getDepartmentIdList() != null) { + DdlPreparedPack.getInPack(user.getDepartmentIdList(), "id", ddlPack); } // And Like % % - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", ddlPack); // 添加默认排序 DdlPreparedPack.getOrderDefault(user); DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, ddlPack); - return ddlPack; + return ddlPack; } /** * 查询字典代码是否重复 + * * @param dictionary * @return */ - public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary){ + public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary) { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); - DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(), "dictionaryCode", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not - DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -587,18 +654,19 @@ public class CoreHqlPack { /** * 查询字典值是否重复 + * * @param dictionary * @return */ - public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary){ + public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary) { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); - DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not - DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -608,92 +676,95 @@ public class CoreHqlPack { /** * 用户信息 复杂查询拼接 + * * @param userInfo * @return */ - public static String packHqlSysUserInfo(SysUserInfo userInfo){ + public static String packHqlSysUserInfo(SysUserInfo userInfo) { StringBuffer result = new StringBuffer(); // And - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result); // HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); - HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); + HqlPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result); + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + HqlPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result); - if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){ + if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) { HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result); } // Like - HqlPack.getStringLikerPack(userInfo.getName(),"name",result); - HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + HqlPack.getStringLikerPack(userInfo.getName(), "name", result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 HqlPack.getOrderDefault(userInfo); - return result.toString(); + return result.toString(); } - public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){ + public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(userInfo); // And - DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); - DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result); + DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getInPackList(idList, "id", result); - if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){ - DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); + if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) { + DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(), "departmentId", result); } // Like - DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + DdlPreparedPack.getStringLikerPack(userInfo.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 result.setOrderByStr(userInfo.orderBy()); - return result; + return result; } /** * 用户信息 复杂查询拼接 + * * @param userInfo * @return */ - public static String packHqlSysUserInfo(SysUserInfo userInfo,List idList){ + public static String packHqlSysUserInfo(SysUserInfo userInfo, List idList) { StringBuffer result = new StringBuffer(); // And - HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - if(idList != null && !idList.isEmpty()){ + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + if (idList != null && !idList.isEmpty()) { HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); } // Like - HqlPack.getStringLikerPack(userInfo.getName(),"name",result); - HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + HqlPack.getStringLikerPack(userInfo.getName(), "name", result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 HqlPack.getOrderDefault(userInfo); - return result.toString(); + return result.toString(); } /** * 查询语言代码是否重复 + * * @param localeLanguage * @return */ - public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage){ + public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(),"languageCode",result); - HqlPack.getNumNOEqualPack(localeLanguage.getId(),"id",result); + HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(), "languageCode", result); + HqlPack.getNumNOEqualPack(localeLanguage.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(localeLanguage); @@ -703,16 +774,17 @@ public class CoreHqlPack { /** * 检查系统资源是否重复 + * * @param localeResource * @return */ - public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource){ + public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result); - HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result); - HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result); - HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result); + HqlPack.getStringEqualPack(localeResource.getLanguageCode(), "languageCode", result); + HqlPack.getStringEqualPack(localeResource.getResourceKey(), "resourceKey", result); + HqlPack.getNumEqualPack(localeResource.getSoftType(), "softType", result); + HqlPack.getNumNOEqualPack(localeResource.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(localeResource); @@ -722,16 +794,17 @@ public class CoreHqlPack { /** * 查询规则代码是否重复 + * * @param orderNoRule * @return */ - public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule){ + public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule) { StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); // not - HqlPack.getNumNOEqualPack(orderNoRule.getId(),"id",result); + HqlPack.getNumNOEqualPack(orderNoRule.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(orderNoRule); @@ -740,21 +813,22 @@ public class CoreHqlPack { } /** - * 单号规则复杂查询，分页，排序 + * 单号规则复杂查询，分页，排序 + * * @param orderNoRule * @return */ - public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ + public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule) { DdlPackBean result = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); - DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(), "orderNoRuleStatus", result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(), "orderNo", result); if (orderNoRule.getSerialNo() != null) { - DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result); + DdlPreparedPack.getNumEqualPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result); } // 添加默认排序 @@ -765,19 +839,20 @@ public class CoreHqlPack { /** * 用户消息关系表负责查询 + * * @param sysRefUserMessage * @return */ - public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage) { + StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(),"messageSoftType",result); - HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); - HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); - HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(), "messageTypeRdd", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(), "messageSoftType", result); + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(), "messageTitleRdd", result); + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(), "messageSenderNameRdd", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(), "messageStatus", result); + HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(), "receiverTime", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(), "receiverId", result); // 添加默认排序 HqlPack.getOrderDefault(sysRefUserMessage); @@ -787,44 +862,63 @@ public class CoreHqlPack { /** * 任务复杂查询 + * * @param sysTask * @return */ - public static DdlPackBean packHqlSysTask(SysTask sysTask){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + public static DdlPackBean packHqlSysTask(SysTask sysTask) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result); - DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result); - DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result); - DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result); + DdlPreparedPack.getStringLikerPack(sysTask.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(), "taskSoftType", result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(), "taskPackage", result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(), "taskClass", result); DdlPreparedPack.getOrderDefault(sysTask); return result; } - public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){ - StringBuffer result = new StringBuffer(); - HqlPack.getInPack(StringUtils.join(ids,","),"id",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + /** + * 任务复杂查询 + * + * @param sysTask + * @return + */ + public static DdlPackBean packHqlCheckSysTaskOnly(SysTask sysTask) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(sysTask.getId(), "id", result); + DdlPreparedPack.getStringEqualPack(sysTask.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(sysTask.getTaskCode(), "taskCode", result); + + return result; + } + + public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids) { + StringBuffer result = new StringBuffer(); + + HqlPack.getInPack(StringUtils.join(ids, ","), "id", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result); return result.toString(); } /** * 大小区间比较 + * * @param columnName * @param min * @param max * @return */ - public static String packHqlByInterval(String columnName,Object min,Object max){ - StringBuffer result = new StringBuffer(); + public static String packHqlByInterval(String columnName, Object min, Object max) { + StringBuffer result = new StringBuffer(); - HqlPack.getNumSmallerPack(max,columnName,result); - HqlPack.getNumBiggerPack(min,columnName,result); + HqlPack.getNumSmallerPack(max, columnName, result); + HqlPack.getNumBiggerPack(min, columnName, result); return result.toString(); } @@ -832,6 +926,7 @@ public class CoreHqlPack { /** * 字典信息查询id集合中是否存在默认数据 + * * @param ids * @return */ @@ -839,44 +934,47 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + DdlPreparedPack.getInPack(StringUtils.join(ids, ","), "id", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result); return result; } /** * 条码规则代码是否存在 + * * @param sysBarcodeRule * @return */ - public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule) { + StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result); // not - HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(),"id",result); + HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(), "id", result); return result.toString(); } /** * 条码规则复杂查询 + * * @param sysBarcodeRule * @return */ - public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule) { + StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(sysBarcodeRule.getName(),"name",result); - HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + HqlPack.getStringLikerPack(sysBarcodeRule.getName(), "name", result); + HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result); return result.toString(); } /** * 打印模板复杂查询 + * * @param sysLabelTemplate * @return */ @@ -899,9 +997,9 @@ public class CoreHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate); // hql拼接 - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(),"templateName",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(),"organizeCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(), "organizeCode", ddlPackBean); DdlPreparedPack.timeBuilder(sysLabelTemplate.getModifyDateTimeStart(), sysLabelTemplate.getModifyDateTimeEnd(), "modifyDatetime", ddlPackBean, true); @@ -913,6 +1011,7 @@ public class CoreHqlPack { /** * 打印模板参数复杂查询 + * * @param sysLabelTemplateParam * @return */ @@ -932,74 +1031,142 @@ public class CoreHqlPack { } - /** * 文件代码是否存在 + * * @param sysFile 查询条件 * @return DdlPackBean */ - public static DdlPackBean packHqlSysFileCode(SysFile sysFile){ + public static DdlPackBean packHqlSysFileCode(SysFile sysFile) { DdlPackBean result = DdlPackBean.getDdlPackBean(sysFile); // and - DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",result); + DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(), "fileCode", result); // not - DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(sysFile.getId(), "id", result); return result; } - public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){ + public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref) { DdlPackBean result = DdlPackBean.getDdlPackBean(ref); // Number Eq - DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result); + DdlPreparedPack.getNumEqualPack(ref.getUserId(), "userId", result); // String Eq - DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(), "organizeCode", result); return result; } - public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){ + public static DdlPackBean packDdlBeanSysRefUserRole(Long userId, Long roleId, String organizeCode) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // Number Eq - DdlPreparedPack.getNumEqualPack(userId,"userId",result); - DdlPreparedPack.getNumEqualPack(roleId,"roleId",result); + DdlPreparedPack.getNumEqualPack(userId, "userId", result); + DdlPreparedPack.getNumEqualPack(roleId, "roleId", result); // String Eq - DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); return result; } /** * 查询当前用户所有组织数据 + * * @param sysRefUserDepartments * @return */ - public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ + public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean); + DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()), "id", packBean); return packBean; } /** * 按条件查询字典 + * * @param sysDictionary * @return */ - public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){ - DdlPackBean packBean = new DdlPackBean(); + public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysDictionary); DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); - DdlPreparedPack.getStringEqualPack(sysDictionary.getParentCodeRdd(), "parentCodeRdd", packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean); + DdlPreparedPack.getStringEqualPack(sysDictionary.getParentNameRdd(), "parentNameRdd", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(), "parentId", packBean); DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(), "dictionaryGroup", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(), "dictionaryValue", packBean); + + return packBean; + } + + /** + * 按条件查询字典 + * + * @param bean + * @return + */ + public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getNumEqualPack(bean.getRefId(), "refId", packBean); + DdlPreparedPack.getNumEqualPack(bean.getPlanId(), "planId", packBean); + DdlPreparedPack.getNumEqualPack(bean.getOperateType(), "operateType", packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(), "refClass", packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(), "versionMethodName", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(), "pojoCompare", packBean); + DdlPreparedPack.timeBuilder(bean.getModifyDatetime(), "modifyDatetime", packBean, false, true); return packBean; } + + + public static DdlPackBean packSysDataSource(SysDataSource bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getStringLikerPack(bean.getSourceHost(), "sourceHost", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSourceName(), "sourceName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSourceCode(), "sourceCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSourceType(), "sourceType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSourceStatus(), "sourceStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSoftType(), "softType", ddlPackBean); + + return ddlPackBean; + } + + 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); + + 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; + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d6d2f8e..aa3dd42 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 new file mode 100644 index 0000000..e3bf5e0 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -0,0 +1,62 @@ +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 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 = "IF_PICK_DATA") +@EqualsAndHashCode(callSuper = true) +@Api("IF_拣货数据") +public class IfPickData extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1057633269490937118L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "SECTION_NO") + @ApiParam("区段编号") + private String sectionNo; + + @Column(name = "SECTION_TASK_NO") + @ApiParam("区段任务编号") + private String sectionTaskNo; + + @Column(name = "PART_NO") + @ApiParam("物料编号") + private String partNo; + + @Column(name = "BIN_NO") + @ApiParam("BIN位代码") + private String binNo; + + @Column(name = "QTY") + @ApiParam("拣货数量") + private Integer qty; + + @Column(name = "SYNC_FLAG") + @ApiParam("同步标识") + private Integer syncFlag; + +} 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 41f39d8..258296d 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 @@ -29,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("作业组件") public class PtlActionModule extends BaseBean implements Serializable { - private static final long serialVersionUID = 4734809867665293289L; + + private static final long serialVersionUID = -4114157018012638259L; @Column(name = "AM_CODE") @ApiParam("组件代码") 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 44fb849..90e4cd7 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("组件集") public class PtlActionModuleGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = 5581772484177493182L; + + private static final long serialVersionUID = 1250324721395561455L; @Column(name = "AMG_ID") @ApiParam("组件集编号") 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 new file mode 100644 index 0000000..e3bd0f0 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java @@ -0,0 +1,54 @@ +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 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_ACTION_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("组件参数") +public class PtlActionModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4579868625998473374L; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_TYPE") + @ApiParam("参数类型") + private String paramType; + + @Column(name = "DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + +} 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 cbe7f0a..eac7e13 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -27,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("作业流程") public class PtlActionRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = 6246614708550175795L; + + private static final long serialVersionUID = -8864181068138221051L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") @@ -40,4 +42,9 @@ public class PtlActionRoute extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型") private Integer routeType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS位置") + private String position; } 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 43d20b5..d3bbefe 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("ACTOR信息") public class PtlActor extends BaseBean implements Serializable { - private static final long serialVersionUID = 5647053475810310357L; + + private static final long serialVersionUID = -7339437529064969381L; @Column(name = "ACTOR_CODE") @ApiParam("actor代码") 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 9324978..f8fa5fb 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("ACTOR消息获取规则") public class PtlActorRule extends BaseBean implements Serializable { - private static final long serialVersionUID = -1515292442151992142L; + + private static final long serialVersionUID = -963692719400754670L; @Column(name = "ACTOR_CODE") @ApiParam("actor代码") 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 25d55ab..05de822 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 @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -33,15 +31,14 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Api("区域") public class PtlArea extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443841199197995L; + + private static final long serialVersionUID = 2112712129904360675L; @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "AREA_NAME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("区域名称") private String areaName; 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 f6dc79a..ad66202 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 @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -14,6 +12,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; /** @@ -30,30 +29,30 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_区域观察者事件配置") public class PtlAreaActorAction extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596837642283797995L; + + private static final long serialVersionUID = -7531797997172228131L; @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "ACTOR_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("观察者编码") private String actorCode; @Column(name = "MT_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("消息类型代码") private String mtCode; @Column(name = "OTHER_WHERE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("特定条件") private String otherWhere; - @Column(name = "AMG_ID") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - @ApiParam("组件集编号") - private Long amgId; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Transient + @ApiParam("实现类") + private String callClass; } 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 b043598..c5a58e1 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -28,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区域作业流程") public class PtlAreaRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = -9139851888717990905L; + + private static final long serialVersionUID = 2190158227924727752L; @Column(name = "AREA_NO") @ApiParam("区域代码") @@ -41,4 +43,12 @@ public class PtlAreaRoute extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型") private Integer routeType; + + @Transient + @ApiParam("区域代码") + private String areaName; + + @Transient + @ApiParam("流程名称") + private String routeName; } 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 9eec664..34c5e42 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 @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -30,35 +28,30 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_区域流程组件调用参数") public class PtlAreaRouteModuleParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596829442283797995L; + + private static final long serialVersionUID = -3322697230578335377L; @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "ROUTE_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("流程代码") private String routeCode; @Column(name = "AMG_ID") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("组件集编号") private Long amgId; @Column(name = "AM_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("组件代码") private String amCode; @Column(name = "PARAM_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("参数代码") private String paramCode; @Column(name = "PARAM_VALUE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("参数值") private String paramValue; 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 eec1146..8bed06c 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 @@ -30,7 +30,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Api("区段亮灯任务") public class PtlAreaSectionTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 1453616567666404664L; + + private static final long serialVersionUID = 3594963385331020252L; @Column(name = "SECTION_TASK_NO") @ApiParam("区段任务编号") 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 1d04433..3e14e31 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区段亮灯任务明细") public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -7563431552643393714L; + + private static final long serialVersionUID = 2881889608152445629L; @Column(name = "SECTION_TASK_NO") @ApiParam("区段任务编号") 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 b07a2d9..2df3ce2 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 @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区域亮灯任务") public class PtlAreaTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 1188465976922660834L; + + private static final long serialVersionUID = -3984445969125341848L; @Column(name = "AREA_TASK_NO") @ApiParam("区域任务编号") 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 5570ddc..b8a8825 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 @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区域任务进度") public class PtlAreaTaskSeq extends BaseBean implements Serializable { - private static final long serialVersionUID = 7138688457410728493L; + + private static final long serialVersionUID = 8346059210789998285L; @Column(name = "AREA_NO") @ApiParam("区域代码") 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 55a0d3e..972e412 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 @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,7 +11,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.io.Serializable; -import java.util.Date; /** * @author Wynne.Lu @@ -28,65 +25,54 @@ import java.util.Date; @Table(name = "PTL_BOM") @EqualsAndHashCode(callSuper = true) public class PtlBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -4459081803170156825L; + + private static final long serialVersionUID = 2676195473413945030L; @Column(name = "PART_NO") @ApiParam("父物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME", columnDefinition = "varchar(255) default '1'", nullable = false) @ApiParam("父物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "UNIT") @ApiParam("计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String unit; @Column(name = "QTY") @ApiParam("数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private Double qty; @Column(name = "ITEM_PART_NO") @ApiParam("子物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String itemPartNo; @Column(name = "ITEM_PART_NAME") @ApiParam("子物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String itemPartName; @Column(name = "ITEM_UNIT") @ApiParam("子计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String itemUnit; @Column(name = "ITEM_QTY") @ApiParam("子用量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private Integer itemQty; @Column(name = "BOM_NUM") @ApiParam("BOM编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String bomNum; @Column(name = "BOM_VERSION") @ApiParam("BOM版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String bomVersion; @Column(name = "EFF_START_TIME") @ApiParam("有效起始日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam("有效截止日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String effEndTime; } 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 c1ca40c..fce2d11 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 @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -31,46 +29,39 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("控制器") public class PtlControl extends BaseBean implements Serializable { - private static final long serialVersionUID = -5371842196308816310L; + + private static final long serialVersionUID = 3118824964768156554L; @Column(name = "CONTROL_NO") @ApiParam("控制器编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String controlNo; @Column(name = "CONTROL_NAME") @ApiParam("控制器名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String controlName; @Column(name = "CONTROL_TYPE") @ApiParam("控制器类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE") private Integer controlType; @Column(name = "IP") @ApiParam("ip地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String ip; @Column(name = "PORT") @ApiParam("端口地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String port; @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "STATUS") @ApiParam("控制器状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS") private Integer status; @Column(name = "FREQUENCY") @ApiParam("监听频率") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer frequency; @Version 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 f11b596..de26af7 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("元素") public class PtlElement extends BaseBean implements Serializable { - private static final long serialVersionUID = 5562337056340313246L; + + private static final long serialVersionUID = 65129699912359054L; @Column(name = "ELEMENT_NO") @ApiParam("元素代码") 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 30025bc..5763636 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("元素属性") public class PtlElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = 4591354414381724731L; + + private static final long serialVersionUID = -4734327563828184066L; @Column(name = "ELEMENT_NO") @ApiParam("元素代码") 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 3471aee..ab70950 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 @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -30,30 +28,26 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_接口清单") public class PtlIf extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596882732758197995L; + + private static final long serialVersionUID = 8056691337038646866L; @Column(name = "IF_CODE") @ApiParam("接口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String ifCode; @Column(name = "IF_NAME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("接口名称") private String ifName; @Column(name = "IF_CONNECT_TYPE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam("交互方式") private String ifConnectType; @Column(name = "IF_CLASS") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam("接口实现类") private String ifClass; @Column(name = "IF_CALL_TYPE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam("接口调用方向") private String ifCallType; } 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 a74cab7..8bde78c 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("界面") public class PtlInterface extends BaseBean implements Serializable { - private static final long serialVersionUID = 5905965593463421411L; + + private static final long serialVersionUID = -380212716030440434L; @Column(name = "INTERFACE_NO") @ApiParam("界面代码") 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 56c2b50..6412bb4 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("界面元素") public class PtlInterfaceElement extends BaseBean implements Serializable { - private static final long serialVersionUID = -8436630151033411240L; + + private static final long serialVersionUID = 1583442966822428784L; @Column(name = "INTERFACE_NO") @ApiParam("界面代码") 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 445b8f2..8a7c756 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("界面元素属性") public class PtlInterfaceElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = 6603839514256277172L; + + private static final long serialVersionUID = -6093597374268730218L; @Column(name = "INTERFACE_NO") @ApiParam("界面代码") 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 a14a5a3..eb3e19d 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 @@ -29,6 +29,7 @@ import java.util.List; public class PtlLabelTemplate extends BaseBean implements Serializable { private static final long serialVersionUID = 8287307324960885418L; + @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; 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 08a100e..de2c8ac 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 @@ -30,6 +30,7 @@ import java.io.Serializable; public class PtlLabelTemplateParam extends BaseBean implements Serializable { private static final long serialVersionUID = 7292367173575992422L; + @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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 05b54f6..6733022 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 @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("主任务") public class PtlMainTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 7144785793974319891L; + + private static final long serialVersionUID = 8626414623799663395L; @Column(name = "TASK_NO") @ApiParam("主任务编号") 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 a0eb09b..d273e3e 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 @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("主任务明细") public class PtlMainTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 7144785793974319897L; + + private static final long serialVersionUID = -7380963913791704644L; @Column(name = "TASK_NO") @ApiParam("主任务编号") 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 70d99c0..cdf49e6 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("消息类型") public class PtlMessageType extends BaseBean implements Serializable { - private static final long serialVersionUID = -8899362292879155612L; + + private static final long serialVersionUID = -1202110531150781349L; @Column(name = "MT_CODE") @ApiParam("消息类型代码") 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 6339bca..3b9f24f 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("消息类型格式") public class PtlMessageTypeFormat extends BaseBean implements Serializable { - private static final long serialVersionUID = 3398977445081168030L; + + private static final long serialVersionUID = 1114241840945889678L; @Column(name = "MT_CODE") @ApiParam("消息类型代码") 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 new file mode 100644 index 0000000..cd2ba93 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java @@ -0,0 +1,49 @@ +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 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/2/14 11:18 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_METHOD") +@EqualsAndHashCode(callSuper = true) +@Api("方法清单") +public class PtlMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1208980343927922927L; + + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name = "METHOD_NAME") + @ApiParam("方法描述") + private String methodName; + + @Column(name = "CALL_CLASS") + @ApiParam("实现类") + private String callClass; + + @Column(name = "METHOD_TYPE") + @ApiParam("方法类型") + private Integer methodType; + + +} 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 d86d1b1..982dcef 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 @@ -29,7 +29,9 @@ import java.io.Serializable; @Table(name = "PTL_OBJECT_DAO") @Api("PTL_对象与dao对应关系") public class PtlObjectDao extends BaseBean implements Serializable { - private static final long serialVersionUID = 2286752328499060L; + + private static final long serialVersionUID = 3972627525439997959L; + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; 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 8d2a609..16331af 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 @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -29,26 +27,23 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("物料") public class PtlPart extends BaseBean implements Serializable { - private static final long serialVersionUID = -7451758045686558893L; + + private static final long serialVersionUID = -517621136983016210L; @Column(name = "PART_NO") @ApiParam("物料编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam("物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "PART_TYPE") @ApiParam("物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE") private String partType; @Column(name = "UNIT") @ApiParam("单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String unit; } 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 b9e661b..b822a40 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 @@ -28,7 +28,9 @@ import java.io.Serializable; @Table(name = "PTL_PCN") @Api("PCN节点") public class PtlPcn extends BaseBean implements Serializable { - private static final long serialVersionUID = -9140094723555406392L; + + private static final long serialVersionUID = -4320051898730968719L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; 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 360d748..f7001d4 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 @@ -29,7 +29,8 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Api("PTL_PCN数据清理") public class PtlPcnClear extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443273899197995L; + + private static final long serialVersionUID = 2581206839565766798L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") 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 05d5c88..e966b3e 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @Table(name = "PTL_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class PtlPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = 2756240593256441951L; + + private static final long serialVersionUID = 7670515108162521936L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") 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 060404d..18a7d10 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 @@ -31,7 +31,7 @@ import java.io.Serializable; @Api("PTL_PCN_同步配置") public class PtlPcnSyncCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7270948230576127126L; + private static final long serialVersionUID = -5459970792389134485L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") 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 110f4a8..486b07c 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 @@ -31,6 +31,7 @@ import java.io.Serializable; public class PtlPcnSyncErrorLog extends BaseBean implements Serializable { private static final long serialVersionUID = -8285936568677939604L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; 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 916a9ce..3f67269 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 @@ -29,7 +29,8 @@ import java.io.Serializable; @Table(name = "PTL_PCN_TASK") @Api("ptl-pcn定时任务工作清单") public class PtlPcnTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 4129714382965409395L; + + private static final long serialVersionUID = 2486815585819368941L; @Column(name = "TASK_CODE") @ApiParam("任务代码") 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 f10f0e0..58d21b7 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 @@ -29,7 +29,8 @@ import java.io.Serializable; @Table(name = "PTL_PCN_TASK_LOG") @Api("ptl-pcn定时任务工作清单同步记录") public class PtlPcnTaskLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -784806174962540310L; + + private static final long serialVersionUID = 932305261648065821L; @Column(name = "SYNC_TIME_START") @ApiParam("同步数据开始时间") 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 8d6bb6b..4bfd0b9 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 打印机配置表 @@ -26,9 +27,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="PTL_PRINTER_CONFIGURE") @Api("打印机配置表") -public class PtlPrinterConfigure extends BaseBean{ +public class PtlPrinterConfigure extends BaseBean implements Serializable { + + private static final long serialVersionUID = -226395857300082832L; - private static final long serialVersionUID = 1234639813072592779L; @Column(name="PRINTER_NO") @ApiParam("打印机编号") private String printerNo; 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 1d4cb38..22f7119 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 @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : 待打印队列表 @@ -27,9 +28,10 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="PTL_PRINTING_QUEUE") @Api("待打印队列表") -public class PtlPrintingQueue extends BaseBean{ +public class PtlPrintingQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 729384890593058720L; - private static final long serialVersionUID = 1111639813072592779L; @Column(name="PRINT_IDENTIFICATION") @ApiParam("打印标识") private String printIdentification; 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 9bf3380..6c57df7 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 @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -30,30 +28,26 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_RFID") public class PtlRfid extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596837642758197995L; + + private static final long serialVersionUID = 1322725195212837292L; @Column(name = "RFID_CONTROL_NO") @ApiParam("RFID读写器代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String rfidControlNo; @Column(name = "IP") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("IP") private String ip; @Column(name = "PORT") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("端口号") private String port; @Column(name = "AREA_NO") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam("区域代码") private String areaNo; @Column(name = "RFID_VALUE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("rfid内容") private String rfidValue; } 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 new file mode 100644 index 0000000..9d7dce2 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java @@ -0,0 +1,57 @@ +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 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_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_流程组件调用参数") +public class PtlRouteModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7330592964296954653L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; +} 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 6222e0a..319d501 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -28,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("流程状态") public class PtlRouteStatus extends BaseBean implements Serializable { - private static final long serialVersionUID = -2862693366302428501L; + + private static final long serialVersionUID = 5555766204635105977L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") @@ -74,5 +76,16 @@ public class PtlRouteStatus extends BaseBean implements Serializable { @ApiParam("状态类型") private Integer statusType; + @Transient + @ApiParam("触发组件集默认未执行") + private boolean actionAmgIdFalg = false; + + @Transient + @ApiParam("触发类型默认不需要外部触发") + private boolean checkTriggerTypeFalg = false; + + @Transient + @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent") + private String nextTriggerEvent; } 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 new file mode 100644 index 0000000..4e4d276 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -0,0 +1,60 @@ +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 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_ROUTE_STATUS_ERROR_RECORD") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态异常记录") +public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4507582337334278877L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "TASK_NO") + @ApiParam("主任务编号") + private String taskNo; + + @Column(name = "ERROR_DESC") + @ApiParam(value = "异常描述") + public String errorDesc; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "CACHE_KEY") + @ApiParam(value = "缓存KEY") + private String cacheKey; + + @Column(name = "HANDLE_STATUS") + @ApiParam(value = "处理状态") + private Integer handleStatus; + +} 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 ef380a9..0faefbd 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 @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -31,26 +29,23 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区段") public class PtlSection extends BaseBean implements Serializable { - private static final long serialVersionUID = -7451758045686558883L; + + private static final long serialVersionUID = -1155737119433934849L; @Column(name = "SECTION_NO") @ApiParam("区段编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String sectionNo; @Column(name = "SECTION_NAME") @ApiParam("区段名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String sectionName; @Column(name = "SECTION_SEQ") @ApiParam("区段顺序号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer sectionSeq; @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Transient 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 0de2878..b504674 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 @@ -28,7 +28,8 @@ import java.io.Serializable; }) @Api("数据同步死信") public class PtlSyncDeadLetter extends BaseBean implements Serializable { - private static final long serialVersionUID = 1151025992437433734L; + + private static final long serialVersionUID = -7435143562440979065L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") 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 48d3a70..a897694 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 @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; 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; @@ -30,86 +28,71 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("标签信息") public class PtlTag extends BaseBean implements Serializable { - private static final long serialVersionUID = -949910394508157581L; + + private static final long serialVersionUID = -2431773668822112292L; @Column(name = "TAG_NO") @ApiParam("标签代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer tagNo; @Column(name = "CONTROL_NO") @ApiParam("控制器代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String controlNo; @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "SECTION_NO") @ApiParam("区段代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String sectionNo; @Column(name = "PART_NO") @ApiParam("物料编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "BIN_NO") @ApiParam("BIN位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String binNo; @Column(name = "TAG_TYPE") @ApiParam("标签类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE") private Integer tagType; @Column(name = "LIGHT_STATUS") @ApiParam("亮灯状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS") private Integer lightStatus; @Column(name = "TAG_STATUS") @ApiParam("标签状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS") private Integer tagStatus; @Column(name = "LIGHT_MODE") @ApiParam("亮灯方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE") private Integer lightMode; @Column(name = "LIGHT_COLOR") @ApiParam("亮灯颜色") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR") private Integer lightColor; @Column(name = "IS_BUZZING") @ApiParam("是否蜂鸣") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING") private Integer isBuzzing; @Column(name = "MUSIC_TYPE") @ApiParam("音乐类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE") private Integer musicType; @Column(name = "DISPLAY_CONTEXT") @ApiParam("显示内容") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String displayContent; @Column(name = "ERROR_COUNT") @ApiParam("卡键次数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer errorCount; @Column(name = "CUSTOM_ATTRIBUTE") @ApiParam("自定义属性") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String customAttribute; } 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 5f056b7..0f63c84 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : @@ -28,11 +29,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="PTL_TEST_USER") @Api(value="PTL 测试用户",description = "测试用户") -public class PtlTestUser extends BaseBean { +public class PtlTestUser extends BaseBean implements Serializable { private static final long serialVersionUID = -130240511327784335L; - @Column(name="USER_INFO_ID") @ApiParam(value ="人员ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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 new file mode 100644 index 0000000..7033251 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java @@ -0,0 +1,40 @@ +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 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 PtlTime extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6674121566943415827L; + @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-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java deleted file mode 100644 index 818bc4b..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.ptl.bean; - - -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; -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; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW_ELEMENT") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面元素") -public class PtlWindowElement extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596427582758197995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - private String windowNo; - - @Column(name = "ELEMENT_NO") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - @ApiParam("元素代码") - private String elementNo; -} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java deleted file mode 100644 index f5f98d4..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.ptl.bean; - - -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; -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; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW_ELEMENT_ATTRIBUTE") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面元素属性") -public class PtlWindowElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596427582758285995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - private String windowNo; - - @Column(name = "ELEMENT_NO") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - @ApiParam("元素代码") - private String elementNo; - - @Column(name = "ATTRIBUTE_NO") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - @ApiParam("属性代码") - private String attributeNo; - - @Column(name = "ATTRIBUTE_VALUE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - @ApiParam("属性值") - private String attributeValue; - -} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java new file mode 100644 index 0000000..fc36a47 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaRouteModuleParam; +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class ActionModuleGroupModel implements Serializable { + + private static final long serialVersionUID = 3963042613552364928L; + + @ApiParam("组件代码") + private String amCode; + + @ApiParam("执行顺序") + private Integer seq; + + @ApiParam("流程组件参数集合") + private List routeModuleParamList; + + @ApiParam("区域流程组件参数集合") + private List areaRouteModuleParamList; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java index e2a1467..41eadd0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @author Wynne.Lu * @date 2020/2/12 18:18 @@ -11,7 +13,9 @@ import lombok.Data; */ @Data @ApiModel("作业组件model") -public class ActionModuleModel { +public class ActionModuleModel implements Serializable { + + private static final long serialVersionUID = 4925369056448110395L; @ApiModelProperty("组件代码") private String amCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java index 3a1e7fe..cda9485 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import java.io.Serializable; + /** * @author Wynne.Lu * @date 2020/2/13 19:31 @@ -17,7 +19,9 @@ import lombok.ToString; @NoArgsConstructor @ToString @ApiModel("actor消息类型及属性") -public class ActorMessageModel { +public class ActorMessageModel implements Serializable { + + private static final long serialVersionUID = 4524576023835016971L; @ApiModelProperty("消息类型代码") private String mtCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java index cd3cec6..ed49267 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -19,7 +21,9 @@ import lombok.ToString; @NoArgsConstructor @ToString @ApiModel("actor消息类型及属性") -public class AreaSectionTaskDetailModel { +public class AreaSectionTaskDetailModel implements Serializable { + + private static final long serialVersionUID = -896587708527024227L; private Long id; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java index 1cb36c9..e23dfcf 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java @@ -7,7 +7,8 @@ import java.io.Serializable; @Data public class AttrModel implements Serializable { - private static final long serialVersionUID = -4842958192243396773L; + + private static final long serialVersionUID = 7259890069511744335L; @ApiParam("属性名称") private String attrName; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java new file mode 100644 index 0000000..c4c0900 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 作业流程Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("作业流程Model") +public class BussinessProcessModel implements Serializable { + + private static final long serialVersionUID = 1987194216369839465L; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("GOJS位置") + private String position; + + @ApiParam("流程明细Model集合") + private List processDetailModelList; + + @ApiParam("区域代码") + private String areaNo; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index 13576e2..633331e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.ptl.model; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -19,7 +18,8 @@ import java.util.Map; @Data @ApiModel("通用数据传输对象") public class CommonMsgModel implements Serializable { - private static final long serialVersionUID = 6359899762200319607L; + + private static final long serialVersionUID = 8271636435115494111L; @ApiModelProperty("工厂") private String organizeCode; @@ -30,9 +30,6 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("消息类型") private String msgType; - @ApiModelProperty("是否重试") - private Integer isRestart= CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); - @ApiModelProperty("消息数据") private Map msgData; @@ -48,4 +45,13 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("当前流程状态") private PtlRouteStatus curRouteStatus; + @ApiModelProperty("外部触发事件") + private String triggerEvent; + + @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") + private boolean errorInnerAction = false; + + @ApiModelProperty("默认异常入库") + private boolean errorInsertFlag = true; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index f423f60..92d0c0d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -15,7 +15,8 @@ import java.io.Serializable; @Data @ApiModel("亮灯model") public class LightOnModel implements Serializable { - private static final long serialVersionUID = -1089361557513425229L; + + private static final long serialVersionUID = 2054373260210137133L; @ApiParam("标签地址，范围1~250,设置null即为所有标签") private Integer tagNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java index 167a62d..70bc3cc 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java @@ -17,7 +17,7 @@ import java.io.Serializable; @ApiModel("生产队列主表") public class MesQueueOrder implements Serializable { - private static final long serialVersionUID = -3124113504001270712L; + private static final long serialVersionUID = -3191808970468979533L; @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java index 48d66be..b92295c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java @@ -17,7 +17,7 @@ import java.io.Serializable; @ApiModel("生产队列明细") public class MesQueueOrderDetail implements Serializable { - private static final long serialVersionUID = 1945173626511595078L; + private static final long serialVersionUID = 806856745031040789L; @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java index fdfb332..444f867 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java @@ -18,7 +18,7 @@ import java.io.Serializable; @ApiModel("工位物料清单") public class MesStationBom implements Serializable { - private static final long serialVersionUID = -2658812944873600461L; + private static final long serialVersionUID = 7398825718819106180L; @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoFieldModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoFieldModel.java new file mode 100644 index 0000000..18ad42e --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoFieldModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : PojoField模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + * @Modify: + **/ +@Data +public class PojoFieldModel implements Serializable { + + private static final long serialVersionUID = 366939009033748970L; + @ApiParam(value ="属性名") + private String fieldName; + + @ApiParam(value ="属性类型") + private String fieldType; + + @ApiParam(value ="属性描述") + private String fieldDesc; + + @ApiParam(value ="字段名称") + private String fieldColumnName; + + @ApiParam(value = "数据来源") + private String dataSrc; + + @ApiParam(value = "开窗列表显示列名称") + private String listColumnName; + + @ApiParam(value = "开窗搜索列名称") + private String searchColumnName; + + @ApiParam(value = "回显列名") + private String explicitColumnName; + + @ApiParam(value = "下拉框规则") + private Integer selectRule; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoModel.java new file mode 100644 index 0000000..bd59909 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Pojo模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + **/ +@Data +public class PojoModel implements Serializable { + private static final long serialVersionUID = -3491931203656275910L; + @ApiParam(value ="包名") + private String packageName; + + @ApiParam(value ="POJO类名") + private String simpleName; + + @ApiParam(value ="POJO类全名") + private String fullName; + + @ApiParam(value ="表名称名") + private String tableName; + + @ApiParam(value ="POJO类描述") + private String pojoDesc; + + @ApiParam(value ="属性集合") + private List fieldList; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java new file mode 100644 index 0000000..916995e --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.ptl.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; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class ProcessDetailModel implements Serializable { + + private static final long serialVersionUID = 4353961796870951797L; + + @ApiParam("状态代码") + private String statusCode; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("触发类型") + private Integer triggerType; + + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @ApiParam("组件集MAP") + private Map> actionModuleGroupMap; + + @ApiParam("下个状态点MAP") + private Map nextStatusMap; + + @ApiParam("触发调用") + private Long actionAmgId; + + @ApiParam("进入状态调用") + private Long inAmgId; + + @ApiParam("离开状态调用") + private Long outAmgId; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java index c4bbcd4..f56a32a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java @@ -7,11 +7,15 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + @Data @NoArgsConstructor @AllArgsConstructor @Api("产品包装model") -public class ProductDataModel { +public class ProductDataModel implements Serializable { + + private static final long serialVersionUID = 6946629608590823479L; @ApiParam("字段代码") private String fieldCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java index 28b0ed1..5f5d0d4 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java @@ -19,6 +19,8 @@ import java.util.List; @Api("亮灯监听Model") public class PtlMonitorControlModel implements Serializable { + private static final long serialVersionUID = 7446249296664249977L; + @ApiParam("刷新频率") public String refreshTime; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java index 4e83d86..4d89870 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java @@ -17,7 +17,8 @@ import java.util.Map; @Data @ApiModel("特定条件model") public class SpecificRuleModel implements Serializable { - private static final long serialVersionUID = -4724747574943605500L; + + private static final long serialVersionUID = 7948646696191723363L; private List kList=new ArrayList<>(); diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java index 030a1d9..2f486c0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java @@ -19,6 +19,8 @@ import java.util.Map; @Data public class WsResultBean implements Serializable { + private static final long serialVersionUID = 7807441951231474373L; + /** * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 * moduleContent组件内容,taskComplete整个扫描完成 diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java new file mode 100644 index 0000000..0e84dc9 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.IfPickData; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface IfPickDataRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java new file mode 100644 index 0000000..227c5ef --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModuleParam; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionModuleParamRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionRouteRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionRouteRepository.java new file mode 100644 index 0000000..85ad4d1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionRouteRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActionRoute; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionRouteRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java new file mode 100644 index 0000000..8eba13c --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaActorAction; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlAreaActorActionRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java new file mode 100644 index 0000000..2737250 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlMethod; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlMethodRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java new file mode 100644 index 0000000..81c64ba --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlRouteModuleParamRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusErrorRecordRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusErrorRecordRepository.java new file mode 100644 index 0000000..2e89209 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusErrorRecordRepository.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.PtlRouteStatusErrorRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface PtlRouteStatusErrorRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTimeRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTimeRepository.java new file mode 100644 index 0000000..6aabb25 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTimeRepository.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlTime; +import org.springframework.stereotype.Repository; + +@Repository +public interface PtlTimeRepository 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 9a1598e..4d24640 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 @@ -306,4 +306,73 @@ public class PtlHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); return result; } + + /** + * 流程查询条件封装 + * + * @param actionRoute + * @return + */ + public static DdlPackBean packHqlPtlActionRoute(PtlActionRoute actionRoute, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode); + DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean); + DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean); + return packBean; + } + + /** + * 区域流程查询条件封装 + * @param areaRoute + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlPtlAreaRoute(PtlAreaRoute areaRoute, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(areaRoute, organizeCode); + DdlPreparedPack.getStringLikerPack(areaRoute.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(areaRoute.getAreaNo(), "areaNo", packBean); + DdlPreparedPack.getNumEqualPack(areaRoute.getRouteType(), "routeType", packBean); + return packBean; + } + + /** + * 区域 + * @param area + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlArea(PtlArea area, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(area, organizeCode); + DdlPreparedPack.getStringLikerPack(area.getAreaNo(), "areaNo", packBean); + DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean); + return packBean; + } + + /** + * 流程状态异常记录 + * @param routeStatusErrorRecord + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlRouteStatusErrorRecord(PtlRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getTaskNo(), "taskNo", packBean); + DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAreaNo(), "areaNo", packBean); + DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); + return packBean; + } + + /** + * IF_拣货数据 + * @param pickData + * @param organizeCode + * @return + */ + public static DdlPackBean getIfPickData(IfPickData pickData, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(pickData.getSyncFlag(), "syncFlag", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..80498fc 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-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java new file mode 100644 index 0000000..668a7e1 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.report.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; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_CSS_STYLE") +@Api(value="自定义样式") +public class BrCssStyle extends BaseBean { + + private static final long serialVersionUID = 8651392479116992679L; + + @Column(name="STYLE_CODE") + @ApiParam(value ="样式编码") + private String styleCode; + + @Lob + @Column(name="STYLE_CONTENT") + @ApiParam(value ="样式内容") + private String styleContent; + + @Column(name="STYLE_DESCRIPTION") + @ApiParam(value ="样式描述") + private String styleDescription; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index 5387dcd..6a9df34 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -1,122 +1,122 @@ -package cn.estsh.i3plus.pojo.report.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 : Adair Peng - * @CreateDate : 2019-01-18 11:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_POJO_ATTR") -@Api(value="对象属性",description = "对象属性") -public class BrPojoAttr extends BaseBean { - - private static final long serialVersionUID = -9025365832485707583L; - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="SERVER_ID") - @ApiParam(value ="服务ID",example = "-1") - private Integer serverId; - - @Column(name="POJO_ID") - @ApiParam(value ="模板对象ID" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long pojoId; - - @Column(name="POJO_NAME") - @ApiParam(value ="对象名称") - private String pojoName; - - @Column(name="PACKAGE_NAME_RDD") - @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") - private String packageNameRdd; - - @Column(name="POJO_TABLE_NAME_ALIAS") - @ApiParam(value ="对象别名") - private String pojoTableNameAlias; - - @Column(name="ATTR_COLUMN_NAME") - @ApiParam(value ="属性别名") - private String attrColumnName; - - @Column(name="ATTR_COLUMN_NAME_ALIAS") - @ApiParam(value ="属性别名") - private String attrColumnNameAlias; - - @Column(name="PARENT_ID") - @ApiParam(value ="上级ID",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - - @Column(name="ATTR_TYPE") - @ApiParam(value ="属性类型",example = "-1") - private Integer attrType; - - @Column(name="ATTR_REF_TYPE") - @ApiParam(value ="关系类型",example = "-1") - private Integer attrRefType; - - @Column(name="DATA_TYPE") - @ApiParam(value ="数据类型",example = "-1") - private Integer dataType; - - @Column(name="CHART_ATTR_NAME") - @ApiParam(value ="图标属性名称") - private String chartAttrName; - - @Column(name="AGGREGATION_TYPE") - @ApiParam(value ="聚合类型",example = "-1") - private Integer aggregationType; - - @Column(name="AGGREGATION_ID") - @ApiParam(value ="聚合类型",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long aggregationId; - - @Column(name="ATTR_SORT") - @ApiParam(value ="字段排序") - private Integer attrSort; - - @Column(name="ATTR_DATA_SORT") - @ApiParam(value ="字段排序") - private Integer attrDataSort; - - @Column(name="ATTR_STYLE") - @ApiParam(value ="字段样式") - private Integer attrStyle; - - @Column(name="ATTR_STYLE_RDD") - @ApiParam(value ="字段样式") - private String attrStyleRdd; - - @Column(name="ATTR_DEFAULT_VALUE") - @ApiParam(value ="属性默认值") - private String attrDefaultValue; - - @Column(name="ATTR_SHOW") - @ApiParam(value ="属性是否显示",example = "-1") - private Integer attrShow; - -} +//package cn.estsh.i3plus.pojo.report.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 : Adair Peng +// * @CreateDate : 2019-01-18 11:32 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_POJO_ATTR") +//@Api(value="对象属性",description = "对象属性") +//public class BrPojoAttr extends BaseBean { +// +// private static final long serialVersionUID = -9025365832485707583L; +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="SERVER_ID") +// @ApiParam(value ="服务ID",example = "-1") +// private Integer serverId; +// +// @Column(name="POJO_ID") +// @ApiParam(value ="模板对象ID" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long pojoId; +// +// @Column(name="POJO_NAME") +// @ApiParam(value ="对象名称") +// private String pojoName; +// +// @Column(name="PACKAGE_NAME_RDD") +// @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") +// private String packageNameRdd; +// +// @Column(name="POJO_TABLE_NAME_ALIAS") +// @ApiParam(value ="对象别名") +// private String pojoTableNameAlias; +// +// @Column(name="ATTR_COLUMN_NAME") +// @ApiParam(value ="属性别名") +// private String attrColumnName; +// +// @Column(name="ATTR_COLUMN_NAME_ALIAS") +// @ApiParam(value ="属性别名") +// private String attrColumnNameAlias; +// +// @Column(name="PARENT_ID") +// @ApiParam(value ="上级ID",example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long parentId; +// +// @Column(name="ATTR_TYPE") +// @ApiParam(value ="属性类型",example = "-1") +// private Integer attrType; +// +// @Column(name="ATTR_REF_TYPE") +// @ApiParam(value ="关系类型",example = "-1") +// private Integer attrRefType; +// +// @Column(name="DATA_TYPE") +// @ApiParam(value ="数据类型",example = "-1") +// private Integer dataType; +// +// @Column(name="CHART_ATTR_NAME") +// @ApiParam(value ="图标属性名称") +// private String chartAttrName; +// +// @Column(name="AGGREGATION_TYPE") +// @ApiParam(value ="聚合类型",example = "-1") +// private Integer aggregationType; +// +// @Column(name="AGGREGATION_ID") +// @ApiParam(value ="聚合类型",example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long aggregationId; +// +// @Column(name="ATTR_SORT") +// @ApiParam(value ="字段排序") +// private Integer attrSort; +// +// @Column(name="ATTR_DATA_SORT") +// @ApiParam(value ="字段排序") +// private Integer attrDataSort; +// +// @Column(name="ATTR_STYLE") +// @ApiParam(value ="字段样式") +// private Integer attrStyle; +// +// @Column(name="ATTR_STYLE_RDD") +// @ApiParam(value ="字段样式") +// private String attrStyleRdd; +// +// @Column(name="ATTR_DEFAULT_VALUE") +// @ApiParam(value ="属性默认值") +// private String attrDefaultValue; +// +// @Column(name="ATTR_SHOW") +// @ApiParam(value ="属性是否显示",example = "-1") +// private Integer attrShow; +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java new file mode 100644 index 0000000..6123774 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrCssStyle; +import cn.estsh.i3plus.pojo.report.bean.BrElement; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface BrCssStyleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java index 386bfc5..b719014 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:03 - * @Modify: - **/ -public interface BrPojoAttrRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:03 +// * @Modify: +// **/ +//public interface BrPojoAttrRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 2beeaa9..c465cee 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -114,13 +114,13 @@ public class ReportHqlPack { * @param brLayout * @return */ - public static String packHqlBrLayout(BrLayout brLayout){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBrLayout(BrLayout brLayout){ + DdlPackBean result = DdlPackBean.getDdlPackBean(brLayout); // 查询参数封装 - HqlPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result); + DdlPreparedPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result); - return result.toString(); + return result; } /** diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..076f15a 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 5881a9c..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 @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api(value = "数据源管理", description = "数据源管理") public class BsDataSource extends BaseBean { + private static final long serialVersionUID = 2763423692635373368L; @Column(name = "DATA_SOURCE_NAME") @ApiParam(value = "数据源名称") private String dataSourceName; @@ -51,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 new file mode 100644 index 0000000..ed054c8 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java @@ -0,0 +1,51 @@ +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; +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-04-15 16:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_LONG_DATA") +@Api(value = "长数据", description = "长数据") +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") + @ApiParam(value = "数据类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REF_DATA_TYPE.class) + private Integer refDataType; + + @Lob + @Column(name = "DATA") + @ApiParam(value = "数据") + private String data; +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java index 5dbad2d..9b3baec 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "MQ管理", description = "MQ管理") public class BsMessageQueue extends BaseBean { + private static final long serialVersionUID = -1130706382023544729L; @Column(name = "MESSAGE_QUEUE_NAME") @ApiParam(value = "消息队列名称") private String messageQueueName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java index f449535..b0c8a8a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "数据适配转换", description = "数据适配转换") public class BsParamAdapter extends BaseBean { + private static final long serialVersionUID = -6238745304002006776L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java index 5b9e496..a796248 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java @@ -7,11 +7,10 @@ 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.List; /** * @Description : socket套件 @@ -29,6 +28,7 @@ import java.util.List; @Api(value = "socket套件", description = "socket套件") public class BsSocketSuitCase extends BaseBean { + private static final long serialVersionUID = -1491505137380808987L; @Column(name = "SOCKET_TYPE_ID") @ApiParam(value = "socket类型（枚举）") private Integer socketTypeId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java index dfab548..6ddffe1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java @@ -31,6 +31,7 @@ import java.util.List; @Api(value = "适配认证", description = "适配认证") public class BsSslKey extends BaseBean { + private static final long serialVersionUID = 3934205467948800784L; @Column(name = "KEY_NAME") @ApiParam(value = "证书名称") private String keyName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java index a4c52be..65a2a2b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @XStreamAlias("BsSslKeyParam") public class BsSslKeyParam extends BaseBean { + private static final long serialVersionUID = 3521715129533450992L; @Column(name = "SSL_KEY_ID") @ApiParam(value = "证书id") @JsonSerialize(using = ToStringSerializer.class) 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 b757ba7..200ba31 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; @@ -33,12 +34,14 @@ import java.util.List; @Api(value = "适配套件", description = "适配套件") public class BsSuitCase extends BaseBean { + private static final long serialVersionUID = -281224716754866835L; @Column(name = "SUIT_CASE_NAME") @ApiParam(value = "套件名称") private String suitCaseName; @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; public int getCaseTypeIdVal(){ @@ -75,6 +78,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") @@ -108,6 +112,13 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "是否推送MQ") private Integer isPushMQ; + @Column(name = "RESULT_SOFT_TYPE",columnDefinition = "int default 0") + @ApiParam(value = "同步调用微服务") + private Integer resultSoftType; + public String getResultSoftTypeTxt() { + return resultSoftType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(resultSoftType); + } + @Column(name = "SSL_KEY_ID") @ApiParam(value = "证书id") @JsonSerialize(using = ToStringSerializer.class) @@ -222,6 +233,10 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配器状态") private Integer suitCaseStatus; + @Column(name = "BIND_BUSI_SCRIPT_CODE") + @ApiParam(value = "绑定业务脚本Code") + private String bindBusiScriptCode; + @Transient @ApiParam(value = "适配器套件明细") private Object bsSuitCaseDetail; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java index a4631b7..dc3e426 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java @@ -31,6 +31,7 @@ import java.util.List; @Api(value = "数据库套件", description = "数据库套件") public class BsSuitCaseDataSource extends BaseBean { + private static final long serialVersionUID = 5519482989293937465L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java index 838514a..74734ce 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.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; @@ -9,6 +11,7 @@ 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; @@ -29,6 +32,7 @@ import javax.persistence.Table; @Api(value = "数据库表操作", description = "数据库表操作") public class BsSuitCaseDataSourceTable extends BaseBean { + private static final long serialVersionUID = 3674958775373712985L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) @@ -40,15 +44,21 @@ public class BsSuitCaseDataSourceTable extends BaseBean { @Column(name = "OPERATE_TYPE_ID") @ApiParam(value = "操作类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.class) private Integer operateTypeId; - public int getOperateTypeIdVal(){ - if(operateTypeId == null){ + public int getOperateTypeIdVal() { + if (operateTypeId == null) { return -1; } return operateTypeId.intValue(); } + + public String getOperateTypeIdTxt() { + return operateTypeId == null ? "无" : BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.valueOfDescription(operateTypeId); + } + @Column(name = "EXECUTE_SQL") @ApiParam(value = "执行sql") private String executeSql; @@ -61,8 +71,8 @@ public class BsSuitCaseDataSourceTable extends BaseBean { @ApiParam(value = "是否有返回") private Integer isReturn; - public int getIsReturnVal(){ - if(isReturn == null){ + public int getIsReturnVal() { + if (isReturn == null) { return -1; } return isReturn.intValue(); 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 db6e129..f7fbfb9 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 @@ -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.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -10,6 +11,7 @@ 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; @@ -32,24 +34,43 @@ import java.util.List; @Api(value = "FTP适配器", description = "FTP适配器") public class BsSuitCaseFTP extends BaseBean { + private static final long serialVersionUID = 6174265510888236886L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseId; - @Column(name = "file_Name") + @Column(name = "File_Name") @ApiParam(value = "文件名") private String fileName; + @Column(name = "FILE_ENCODE") + @ApiParam(value = "文件编码") + private Integer fileEncode; + + @Column(name = "IS_TRANSFORM_MESSAGE") + @ApiParam(value = "是否转换报文") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isTransformMessage; + + public int getIsTransformMessageVal() { + return isTransformMessage == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isTransformMessage; + } + + public boolean isTransformMessage() { + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsTransformMessageVal()); + } + + @Column(name = "ENCODE") - @ApiParam(value = "编码") + @ApiParam(value = "ftp编码") private Integer encode; @Column(name = "IS_READ_AND_EMPTY") @ApiParam(value = "读取并清空") private Integer isReadAndEmpty; - public boolean isReadAndEmpty(){ + public boolean isReadAndEmpty() { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty); } @@ -57,7 +78,7 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "读取并删除") private Integer isReadAndDelete; - public boolean isReadAndDelete(){ + public boolean isReadAndDelete() { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete); } @@ -65,7 +86,7 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "是否需要遍历") private Integer isNeedTraversal; - public boolean isNeedTraversal(){ + public boolean isNeedTraversal() { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal); } @@ -73,12 +94,24 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "是否增量读取") private Integer isIncrementalRead; - public boolean isIncrementalRead(){ + public boolean isIncrementalRead() { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead); } + @Column(name = "IS_INCREMENTAL_WRITE") + @ApiParam(value = "是否增量写入") + private Integer isIncrementalWrite; + + public int getIsIncrementalWriteVal(){ + return isIncrementalWrite == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isIncrementalWrite; + } + + public boolean isIncrementalWrite() { + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal()); + } + @Transient - @ApiParam(value = "是否增量读取") + @ApiParam(value = "临时适配路径") private String tempSuitFilePath; @Transient diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java index 3d3452b..07007ca 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "MQ", description = "MQ 适配套件") public class BsSuitCaseMq extends BaseBean { + private static final long serialVersionUID = 4562973480210332977L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 7a8856c..e6e5251 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -38,6 +38,7 @@ import java.util.List; @Api(value = "适配器出入参", description = "适配器出入参") public class BsSuitCaseParam extends BaseBean { + private static final long serialVersionUID = -2186546861255097857L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) 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 fad903c..2ccf61d 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 @@ -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.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -32,6 +34,7 @@ import java.util.List; @Api(value = "适配器出入参", description = "适配器出入参") public class BsSuitCaseREST extends BaseBean { + private static final long serialVersionUID = 3871469059124604719L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) @@ -40,8 +43,23 @@ public class BsSuitCaseREST extends BaseBean { //CommonEnumUtil.HTTP_METHOD_TYPE @Column(name = "REQUEST_METHOD_ID") @ApiParam(value = "请求方式id") + @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; + public String getRequestMethodIdTxt(){ + return requestMethodId == null ? "无" : CommonEnumUtil.HTTP_METHOD_TYPE.valueOfDescription(requestMethodId); + } + + //CommonEnumUtil.TRUE_OR_FALSE + @Column(name = "IS_REQUEST_BODY") + @ApiParam(value = "是否使用requestBody") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isRequestBody; + + public int getIsRequestBodyVal() { + return isRequestBody == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isRequestBody; + } + @Transient @ApiParam(value = "请求头转换") private List requestHeaderList; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java index c5e2ef6..37a8e11 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "WebService", description = "WebService 适配套件") public class BsSuitCaseWebService extends BaseBean { + private static final long serialVersionUID = -5473608817496699798L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index 8dcb4f6..dac4976 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 @@ -34,6 +34,7 @@ import java.util.List; @Api(value = "适配报文详情", description = "适配报文详情") public class BsSuitDataDetail extends BaseBean { + private static final long serialVersionUID = 4086839854444963656L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配套件id") private String suitCaseId; @@ -69,13 +70,11 @@ public class BsSuitDataDetail extends BaseBean { private String getDateTime; // 移动至记录数据表 - @Lob @Column(name = "ORGIN_DATA") @ApiParam(value = "原始报文数据") private String orginData; // 移动至记录数据表 - @Lob @Column(name = "TRANS_DATA") @ApiParam(value = "转换后的报文数据") private String transData; @@ -92,5 +91,8 @@ public class BsSuitDataDetail extends BaseBean { @ApiParam(value = "适配请求文件列表") private List bsSuitFileList; + @Transient + @ApiParam(value = "id-查询条件") + private List searchIdList; } 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 21f5df5..7e2b460 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 @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "适配文件信息", description = "适配文件信息") public class BsSuitFile extends BaseBean { + private static final long serialVersionUID = -5476684791619434327L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) 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 66d428a..d67c241 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 @@ -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; @@ -34,6 +36,7 @@ import java.util.List; @Api(value = "适配记录", description = "适配记录") public class BsSuitRecord extends BaseBean { + private static final long serialVersionUID = 174969165955420968L; @Column(name = "SUIT_CASE_NAME_RDD") @ApiParam(value = "适配套件名称") private String suitCaseNameRdd; @@ -49,6 +52,7 @@ public class BsSuitRecord extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; @Column(name = "SUIT_CASE_DETAIL_ID") @@ -90,7 +94,6 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "认证结果") private Integer suitSslKeyResult; - // 移动至记录数据表 @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE") @ApiParam(value = "认证信息") private String suitSslKeyResultMessage; @@ -113,11 +116,15 @@ public class BsSuitRecord extends BaseBean { private Long executeTime; // 移动至记录数据表 - @Lob @Column(name = "SUIT_MESSAGE") - @ApiParam(value = "适配信息") + @ApiParam(value = "适配信息 longDataId") private String suitMessage; + // 移动至记录数据表 + @Column(name = "SUIT_SEND_MESSAGE") + @ApiParam(value = "适配发送报文") + private String suitSendMessage; + @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") private Integer processState; @@ -126,6 +133,10 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "处理时间") private String processTime; + @Column(name = "SCRIPT_RESULT") + @ApiParam(value = "脚本结果") + private String scriptResult; + @Transient @ApiParam(value = "适配记录参数") private List bsSuitRecordParamList; @@ -142,5 +153,16 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配请求文件列表") private List bsSuitFileList; + @Transient + @ApiParam(value = "适配记录报文-查询条件") + private String searchMessage; + + @Transient + @ApiParam(value = "适配入参-查询条件") + private String searchInputParam; + + @Transient + @ApiParam(value = "id-查询条件") + private List searchIdList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index c1d94dc..e255175 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -28,6 +28,7 @@ import javax.persistence.*; @Api(value = "适配记录参数", description = "适配记录参数") public class BsSuitRecordParam extends BaseBean { + private static final long serialVersionUID = -5521394058203638651L; @Column(name = "SUIT_RECORD_ID") @ApiParam(value = "适配记录id") private Long suitRecordId; 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 e89b27e..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 : 请求适配记录 @@ -30,6 +31,7 @@ import javax.persistence.*; @Api(value = "请求适配记录", description = "请求适配记录") public class BsSuitRequestRecord extends BaseBean { + private static final long serialVersionUID = -6724051278362565068L; @Column(name = "SUIT_RECORD_ID") @ApiParam(value = "适配记录id") @JsonSerialize(using = ToStringSerializer.class) @@ -45,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/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java index fc7c6fc..7d201ab 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "定时适配任务", description = "定时适配任务") public class BsSuitSchedule extends BaseBean { + private static final long serialVersionUID = 4814615639892051613L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java index 1499369..5ef077f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api(value = "适配类型", description = "适配类型") public class BsSuitType extends BaseBean { + private static final long serialVersionUID = 5149466646176647559L; @Column(name = "SUIT_TYPE_NAME") @ApiParam(value = "适配类型") private String suitTypeName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java index eaa600d..a8627b1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="测试数据 DataBase",description = "数据库操作测试") public class TestDataBase extends BaseBean { + private static final long serialVersionUID = -5334113633173923482L; @Column(name="NAME") @ApiParam(value ="名称" ) private String name; 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/BsLongDataRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsLongDataRepository.java new file mode 100644 index 0000000..8c51c4c --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsLongDataRepository.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.BsLongData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-15 17:15 + * @Modify: + **/ +@Repository +public interface BsLongDataRepository 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 a4d0bb7..cfa357f 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; } @@ -318,17 +318,19 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitRecord(BsSuitRecord bsSuitRecord){ DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",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.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true); + DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); ddlPackBean.setOrderByStr(bsSuitRecord.orderBy()); @@ -342,19 +344,37 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitDataDetail(BsSuitDataDetail bsSuitDataDetail){ DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getInPackList(bsSuitDataDetail.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getCaseTypeId(), "caseTypeId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true); + DdlPreparedPack.timeBuilder(bsSuitDataDetail.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); ddlPackBean.setOrderByStr(bsSuitDataDetail.orderBy()); return ddlPackBean; } + + /** + * 适配记录查询条件封装 + * @return + */ + 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); + + return ddlPackBean; + } + /** * 适配文件条件封装 * @param bsSuitFile 查询条件 @@ -374,17 +394,6 @@ public class SoftSwitchHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSuitRecordBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){ - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - - DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCode",ddlPackBean); - DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); - - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); - - return ddlPackBean; - } - public static DdlPackBean packHqlSuitDataDetailBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); @@ -396,32 +405,29 @@ public class SoftSwitchHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSuitRecordBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackArray(suitRecordIds,"id",ddlPackBean); - DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); + public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - - DdlPreparedPack.getInPackArray(suitRecordIds,"suitRecordId",ddlPackBean); - DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); - - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); + public static DdlPackBean packHqlBsLongData(BsLongData bsLongData){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsLongData); + DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); + DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsLongData.getData(),"data",ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){ - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - - DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",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; } } diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0368700..1351ed3 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 ccfef29..9fa4fcf 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,7 +4,6 @@ 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; @@ -27,6 +26,7 @@ import javax.persistence.Table; @Api(value = "系统配置", description = "SWEB系统配置") public class SwebConfig extends BaseBean { + private static final long serialVersionUID = -3064110608740977782L; @Column(name = "NAME") @ApiParam(value = "名称") private String name; 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 new file mode 100644 index 0000000..dbf70ee --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java @@ -0,0 +1,162 @@ +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; +import javax.persistence.Version; + +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-27 + * @Modify: + **/ +@Data +@Table(name = "SWEB_DOC_MOVEMENT_DETAILS") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("移库单-明细") +public class SwebDocMovementDetails extends BaseBean { + private static final long serialVersionUID = -1232334350341792942L; + + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + + @Column(name = "DEST_AREA_NO") + @ApiParam("目的库存地代码") + public String destAreaNo; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String destWhNo; + + @Column(name = "DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + + @Column(name = "DEST_LOCATE_NO") + @ApiParam("目标库位代码") + public String destLocateNo; + + @Column(name = "ORDER_NO") + @ApiParam(value = "移库单单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public String item; + + /** + * 是否免费:0=计费,1=免费 + */ + @Column(name = "IS_FREE") + @ApiParam(value = "是否免费", example = "1") + public Integer isFree; + + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + private Integer itemStatus; + + @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已拣货数量", example = "1") + private Double pickQty; + + @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已出库数量", example = "1") + private Double outQty; + + @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已收货数量", example = "1") + private Double recQty; + + @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已移库数量", example = "1") + private Double moveQty; + + @Column(name = "PLAN_DATE") + @ApiParam(value = "计划日期") + private String planDate; + + @Column(name = "PLAN_TIME") + @ApiParam(value = "计划时间") + private String planTime; + + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "条码打印数量", example = "1") + private Double printQty; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "REMARK") + @ApiParam(value = "操作原因") + private String remark; + + @Column(name = "SRC_AREA_NO") + @ApiParam("源库存地代码") + public String srcAreaNo; + + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Column(name = "SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + + @Column(name = "IS_SN") + @ApiParam(value = "条码生成状态", example = "20") + public Integer isSn; + + @Column(name = "LOT_NO") + @ApiParam("批次") + public String lotNo; +} 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 new file mode 100644 index 0000000..56aaa79 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java @@ -0,0 +1,149 @@ +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-27 + * @Modify: + **/ +@Data +@Table(name = "SWEB_DOC_MOVEMENT_MASTER") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("移库单-主表") +public class SwebDocMovementMaster extends BaseBean { + + private static final long serialVersionUID = -4539662053206835169L; + @Column(name = "ORDER_NO") + @ApiParam(value = "移库单单号") + private String orderNo; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + public String busiType; + + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + private String carNo; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; + + @Column(name = "CUST_ORDER_NO") + @ApiParam(value = "客户单号") + private String custOrderNo; + + @Column(name = "ERP_SRC_NO") + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + @Column(name = "IS_TASK") + @ApiParam(value = "是否生产任务", example = "1") + public Integer isTask; + + @Column(name = "IS_PART") + @ApiParam(value = "是否散件", example = "1") + private Integer isPart; + + /** + * 移动类型:IN=入库,OUT=出库,MOVE=移库 + */ + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + public Integer moveType; + + /** + * 状态:0=新建,10=处理中 + * ,20=已完成,90=已关闭,91=已取消 + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; + + @Column(name = "PRIORITY") + @ApiParam(value = "优先级", example = "1") + public Integer priority; + + /** + * 关联单据类型:1=ASN,10=PO,20=SO + */ + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型") + private String refType; + + @Column(name = "REF_NO") + @ApiParam(value = "关联单据") + private String refNo; + + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + + @Column(name = "VERSION") + @ApiParam(value = "版本", example = "1") + private Integer version; + + @Column(name = "TAG") + @ApiParam(value = "标签") + private String tag; + + @Column(name = "FLAG_NO") + @ApiParam(value = "客户发往地编号") + private String flagNo; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name = "IS_SN") + @ApiParam("打印状态") + private Integer isSn; + + @Column(name = "DEST_WH_NO") + @ApiParam("目的仓库代码") + private String destWhNo; + + @Column(name = "DEST_ZONE_NO") + @ApiParam("目的存储区代码") + private String destZoneNo; + + @Column(name = "PLAN_DATE") + @ApiParam("计划日期") + private String planDate; + + @Column(name = "PLAN_TIME") + @ApiParam("计划时间") + private String planTime; + + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + private String srcWhNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + private String srcZoneNo; + + @Column(name = "SHIP_TIME") + @ApiParam(value = "发运时间") + private String shipTime; +} 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 new file mode 100644 index 0000000..1dcc1c6 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java @@ -0,0 +1,85 @@ +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-27 + * @Modify: + **/ +@Data +@Table(name = "SWEB_DOC_MOVEMENT_SN") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("移库单-条码") +public class SwebDocMovementSn extends BaseBean { + + private static final long serialVersionUID = -8545031740048178867L; + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + public Double qty; + + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + /** + * 状态：操作状态 itemStatus + */ + @Column(name="SN_STATUS") + @ApiParam(value = "操作状态", example = "10") + public Integer snStatus; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + + @Column(name = "SN_TYPE") + @ApiParam(value = "条码类型") + private Integer snType; + + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; +} 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 new file mode 100644 index 0000000..7acd947 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java @@ -0,0 +1,99 @@ +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 2bb1f98..c3d0e27 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("订单发货通知记录表") public class SwebOrderDeliveryLog extends BaseBean { + private static final long serialVersionUID = -5505138833474471710L; @Column(name = "ORDER_ITEM_NO") @ApiParam("单据明细编号") private String orderItemNo; 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 83ad7ca..cde67c9 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 @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("物理包装") public class SwebPackage extends BaseBean { + private static final long serialVersionUID = 4329007629113785744L; @Column(name="PACKAGE_NO") @ApiParam("包装编号") private String packageNo; 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 new file mode 100644 index 0000000..65babf1 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java @@ -0,0 +1,97 @@ +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 df34d26..e627eee 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("开口合同主表") public class SwebProcurementPlanOrder extends BaseBean { + private static final long serialVersionUID = -868499874950128043L; @ApiParam("合同号") @Column(name = "ORDER_NO") private String orderNo; 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 f9132ff..6e049d3 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 @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("开口合同明细表") public class SwebProcurementPlanOrderDetails extends BaseBean { + private static final long serialVersionUID = 6437822344590464188L; @ApiParam("单据号") @Column(name = "ORDER_NO") private String orderNo; 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 3e86f3d..de0243b 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 @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("订单修改日志记录表") public class SwebPurchaseChangeLog extends BaseBean { + private static final long serialVersionUID = 4565614096003156828L; @Column(name = "ORDER_NO") @ApiParam("单据明细编号") private String orderNo; 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 fe4aff9..dde1758 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 @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("采购订单表-主表") public class SwebPurchaseOrder extends BaseBean { + private static final long serialVersionUID = -3748055439346407775L; @Column(name = "ORDER_NO") @ApiParam("单据号") public String orderNo; 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 18df792..a343b51 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 @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("采购订单表-明细表") public class SwebPurchaseOrderDetails extends BaseBean { + private static final long serialVersionUID = -7410188512201254931L; @Column(name = "ORDER_NO") @ApiParam("单据号") private String orderNo; @@ -131,6 +132,14 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("是否为钢卷料") private Integer isSteel; + @Column(name = "PLAN_DATE") + @ApiParam("计划交货日期") + private String planDate; + + @Column(name = "PLAN_TIME") + @ApiParam("计划交货时间") + private String planTime; + /** * 不冗余主表数据 */ 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 3e8eb11..ce53f9e 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 @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("采购订单表-条码明细表") public class SwebPurchaseOrderSn extends BaseBean { + private static final long serialVersionUID = 2226619667893717305L; @Column(name = "ORDER_NO") @ApiParam("单据明细编号") private String orderNo; @@ -67,9 +68,9 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "序列号") private String serialNo; - @Column(name = "BAR_CODE") + @Column(name = "SN") @ApiParam(value = "箱条码") - private String barCode; + private String sn; @Column(name = "ERP_WAREHOUSE") @ApiParam("库存地") 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 ba03cc8..d4afe0c 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("供应商关系表") public class SwebVendorRel extends BaseBean { + private static final long serialVersionUID = -283156702431035689L; @ApiParam("计划员代码") @Column(name = "PLANNER_CODE") private String plannerCode; 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 new file mode 100644 index 0000000..0733e25 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java @@ -0,0 +1,48 @@ +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 new file mode 100644 index 0000000..4ec038f --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java @@ -0,0 +1,46 @@ +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/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index 1c9cb27..cf8bf64 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -17,6 +17,7 @@ import java.io.Serializable; @AllArgsConstructor public class SwebLoginUserModel implements Serializable { + private static final long serialVersionUID = -2494619756222719468L; @ApiParam(value = "用户ID") private Long id; 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 new file mode 100644 index 0000000..ce5dc84 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class SwebMovementModel { + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "需求数量") + private Double qty; +} 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 3f5d66b..bad9575 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 @@ -18,6 +18,7 @@ import java.util.Map; @Data public class SwebPOBatchInsertEnterModel extends BaseBean { + private static final long serialVersionUID = -7184098625336146560L; @ApiParam("单据号") private String orderNo; 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 5294bcf..03b46e7 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 @@ -16,6 +16,7 @@ import java.io.Serializable; @Data public class SwebPOBatchInsertItemEnterModel implements Serializable { + private static final long serialVersionUID = 4003058741886494009L; @ApiParam(value = "零件号") private String partNo; 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 8cbf146..e0e7a1f 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 @@ -16,6 +16,7 @@ import lombok.Data; @Data public class SwebPODetailsUpdateHistoryModel extends BaseBean { + private static final long serialVersionUID = -9085820300059480272L; @ApiParam("单据号") private String orderNo; 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 4f50d7f..0f47fc7 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 @@ -14,6 +14,7 @@ import lombok.Data; @Data public class SwebPOForPubListEnterModel extends BaseBean { + private static final long serialVersionUID = -2116328977150605750L; @ApiParam("单据号") private String orderNo; 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 780d3be..d8e7886 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 @@ -18,6 +18,7 @@ import java.util.Map; @Data public class SwebPOForPubListResultItemModel extends BaseBean { + private static final long serialVersionUID = -6156680045478117732L; @Column(name = "ORDER_NO") @ApiParam("单据号") private String orderNo; @@ -60,4 +61,8 @@ public class SwebPOForPubListResultItemModel extends BaseBean { @Transient @ApiParam(value = "是否可编辑（前端使用）") public boolean isSet = false; + + @Transient + @ApiParam(value = "预计到货日期") + public String expectedTime; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java index 4c2464f..b5f7507 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java @@ -17,6 +17,7 @@ import java.util.List; @Data public class SwebPOForPubListResultModel extends BaseBean { + private static final long serialVersionUID = 3662427372635980801L; @ApiParam(value = "拆分请求时间数量列表", example = "1") private List reqTimeList; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java index ee15a2a..99cbd5f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java @@ -17,6 +17,7 @@ import java.util.List; @Data public class SwebPOForPubListResultModelV2 extends BaseBean { + private static final long serialVersionUID = -6692335488511053499L; @ApiParam(value = "拆分请求时间数量列表", example = "1") private List reqTimeList = Collections.EMPTY_LIST; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java index 31ee5c5..38ce2e3 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.sweb.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.bean.ListPager; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -17,6 +16,7 @@ import java.util.List; @Data public class SwebPOUpdatePublishForPublishModel extends BaseBean { + private static final long serialVersionUID = 8456615874926744777L; @ApiParam(value = "拆分请求时间数量列表", example = "1") private List reqTimeList; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementDetailsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementDetailsRepository.java new file mode 100644 index 0000000..c59a9b4 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementDetailsRepository.java @@ -0,0 +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.SwebDocMovementDetails; +import org.springframework.stereotype.Repository; + +@Repository +public interface SwebDocMovementDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementMasterRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementMasterRepository.java new file mode 100644 index 0000000..e1a6a0f --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementMasterRepository.java @@ -0,0 +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.SwebDocMovementMaster; +import org.springframework.stereotype.Repository; + +@Repository +public interface SwebDocMovementMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementSnRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementSnRepository.java new file mode 100644 index 0000000..889f5b5 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementSnRepository.java @@ -0,0 +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.SwebDocMovementSn; +import org.springframework.stereotype.Repository; + +@Repository +public interface SwebDocMovementSnRepository extends BaseRepository { +} 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 new file mode 100644 index 0000000..6059cb8 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java @@ -0,0 +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.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 new file mode 100644 index 0000000..4fea058 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java @@ -0,0 +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.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/WmsMovementToSwebRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java new file mode 100644 index 0000000..83a31be --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java @@ -0,0 +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.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/repository/WmsPoToSwebRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java new file mode 100644 index 0000000..419d43c --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java @@ -0,0 +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 org.springframework.stereotype.Repository; + +@Repository +public interface WmsPoToSwebRepository 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 a504867..459a7e8 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 @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; @@ -48,8 +49,10 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); - DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), - purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); + 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.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(purchaseOrder, result); @@ -171,4 +174,23 @@ public class SwebHqlPack { DdlPreparedPack.getNumNOEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result); 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.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); + return buildHql(details, result); + } } diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index b2eedd4..67b0bff 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 @@ -22,6 +22,20 @@ + + + + org.optaplanner + optaplanner-core + 7.36.0.Final + + + + org.optaplanner + optaplanner-persistence-jpa + 7.36.0.Final + + 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 1cb16f8..80ee2b6 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 @@ -43,7 +43,6 @@ public class AmpJisRec extends BaseBean { public String partNameRdd; @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) - @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -118,4 +117,8 @@ public class AmpJisRec extends BaseBean { this.qty = qty; this.unit = unit; } + + public AmpJisRec() { + + } } 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 60cabe4..2ea88ea 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 @@ -1,6 +1,8 @@ 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; @@ -31,33 +33,41 @@ public class BasCustomer extends BaseBean { private static final long serialVersionUID = -1980207700343546396L; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custNo; @Column(name = "CUST_NAME") @ApiParam(value = "客户简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custName; @Column(name = "CUST_DESC") @ApiParam(value = "客户全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custDesc; @Column(name = "CUST_ADDR") @ApiParam(value = "客户地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custAddr; @Column(name = "CUST_OWNER") @ApiParam(value = "联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custOwner; @Column(name = "CUST_EMAIL") @ApiParam(value = "邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custEmail; @Column(name = "CUST_TEL") @ApiParam(value = "电话号码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custTel; @Column(name = "CUST_FAX") @ApiParam(value = "传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custFax; } 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 ebf9603..583e70a 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 @@ -1,6 +1,8 @@ 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; @@ -31,66 +33,83 @@ public class BasVendor extends BaseBean{ private static final long serialVersionUID = 9214639813072592779L; @Column(name="VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorNo; @Column(name="VENDOR_NAME") @ApiParam("供应商简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorName; @Column(name="VENDOR_DESC") @ApiParam("供应商全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorDesc; + @Column(name = "USER_NAME") + @ApiParam("用户名") + @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") + private String userName; + @Column(name="VENDOR_ADDR") @ApiParam("供应商地址") private String vendorAddr; @Column(name="VENDOR_OWNER") @ApiParam("联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorOwner; @Column(name="VENDOR_EMAIL") @ApiParam("邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorEmail; @Column(name = "IS_ASN") @ApiParam(value = "是否发ASN", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isAsn; - @Column(name = "USER_NAME") - @ApiParam(value = "用户名") - private String userName; - @Column(name = "PASSWORD") @ApiParam(value = "密码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String password; @Column(name = "VENDOR_CALL") @ApiParam("供应商电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorCall; @Column(name = "VENDOR_FAX") @ApiParam("传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorFax; @Column(name = "VENDOR_PHONE") @ApiParam("手机") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorPhone; @Column(name = "KILOBIT") @ApiParam("千位符号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String kilobit; @Column(name = "DECIMALS") @ApiParam("小数位符号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String decimals; - //20-承运商 @Column(name = "VENDOR_TYPE") + @ApiParam("供应商类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "VENDOR_TYPE") private Integer vendorType; @Column(name = "MAP_LOCATION") @ApiParam("经纬度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; public BasVendor() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java similarity index 85% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java index da76b34..345b775 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.engine.script; +package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; -import javax.persistence.*; -import javax.script.CompiledScript; -import javax.script.ScriptContext; -import javax.script.ScriptEngine; -import javax.script.ScriptException; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; /** * 脚本持久化实体类 @@ -30,6 +29,7 @@ import javax.script.ScriptException; @Table(name = "SCRIPT_PERSISTENCE") @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; @@ -49,7 +49,7 @@ public class EngineScriptPersistence extends BaseBean { // 脚本的具体内容 @Lob - @Column(name = "SCRIPT_CONTENT") + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") private String scriptContent; // 脚本的描述，包含脚本的用法，参数说明等 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 new file mode 100644 index 0000000..18c15f2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +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.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * 脚本持久化历史记录 + * + * @author jason.niu + * @since 2020-04-29 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "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", columnDefinition = "TEXT") + private String scriptContent; + + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private Object compiledScript; + +} 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/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 8ec1cae..2eb3864 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 @@ -1,6 +1,8 @@ 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; @@ -32,34 +34,46 @@ public class MesPpMaster extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String woekorderNo; @Column(name="PDLINE_NO") @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 = "workCenterCode") private String pdlineNo; @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String planProductTime; @Column(name="SHIFT_NO") @ApiParam("班次代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shitNo; @Column(name="START_PRODUCT_TIME") @ApiParam("开始生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String startProductTime; @Column(name="END_PRODUCT_TIME") @ApiParam("结束生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String endProductTime; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_MASTER_STATUS") private Integer orderStatus = 0; @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq = 0; public Integer getOrderStatus() { 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 d091e87..697f6dd 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 @@ -55,4 +55,12 @@ public class MesPpTemplate extends BaseBean { @ApiParam(value = "工单数量") @AnnoOutputColumn private Double qty; + + @ApiParam(value = "序号") + @AnnoOutputColumn + private Integer seq; + + @ApiParam(value = "零件组号") + @AnnoOutputColumn + public String partGroupNo; } 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 dba988a..1e942f7 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 @@ -2,7 +2,7 @@ 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.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -18,7 +18,7 @@ import javax.persistence.*; import java.io.Serializable; /** - * @Description : 包材BOM信息 + * @Description : QAD_BOP信息 * @Reference : * @Author : jimmy.zeng * @CreateDate : 2020-01-09 14:40 @@ -29,7 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="QAD_BOP") -@Api("包材BOM信息") +@Api("QAD_BOP信息") public class QadBop implements Serializable { private static final long serialVersionUID = 4673217061075875734L; @@ -41,7 +41,7 @@ public class QadBop implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 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 dfe4dab..b1433df 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 @@ -2,7 +2,7 @@ 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.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -40,7 +40,7 @@ public class QadItemPacking implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 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 new file mode 100644 index 0000000..5a96543 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java @@ -0,0 +1,49 @@ +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.Table; + +/** + * @Description : BH检测大类表 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "QMS_CHECK_TYPE") +@Api("物料子检测项") +public class QmsCheckType extends BaseBean { + + private static final long serialVersionUID = -4867744538301370899L; + + @Column(name = "CHECK_TYPE_CODE") + @ApiParam("检测大类代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkTypeCode; + + @Column(name = "CHECK_TYPE_NAME") + @ApiParam("检测大类名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkTypeName; + + @Column(name = "REMARK") + @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String remark; +} 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 new file mode 100644 index 0000000..566dc2b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java @@ -0,0 +1,126 @@ +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 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 : BH库存条码扩展表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 13:22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="QMS_STOCK_SN_EXT_BH") +@Api("BH库存条码扩展表") +public class QmsStockSnExtBh extends BaseBean { + + @Column(name="sn") + @ApiParam("条码") + private String sn; + + @Column(name="BATCH_NO") + @ApiParam("BATCH号") + private String batchNo; + + @Column(name="BH_TYPE") + @ApiParam("BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description") + private Integer bhType; + + @Transient + @ApiParam("处理状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description") + private Integer workStatus; + + /*****汇总查询结果信息****/ + @Transient + @ApiParam("产线代码") + public String workCenterCode; + + @Transient + @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isQualified; + + + @Transient + @ApiParam("返修状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + public Integer reworkStatus; + + @Transient + @ApiParam("返修结果") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer reworkResult; + + @Transient + @ApiParam("挑选状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + public Integer pickStatus; + + @Transient + @ApiParam("挑选状态") + public Integer pickResult; + + @Transient + @ApiParam("物料号") + public String partNo; + + @Transient + @ApiParam("物料名称") + public String partName; + + @Transient + @ApiParam("客户发往地") + public String flagNo; + + + + @Transient + @ApiParam("二维码") + public String serialSn; + + + public QmsStockSnExtBh(String organizeCode, String bhCode, + String workCenterCode, String partNo, + String partName, String flagNo, Integer isQualified, + Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult, Integer bhType) { + this.organizeCode = organizeCode; + this.batchNo = bhCode; + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partName = partName; + this.flagNo = flagNo; + this.isQualified = isQualified; + this.reworkStatus = reworkStatus; + this.reworkResult = reworkResult; + this.pickStatus = pickStatus; + this.pickResult = pickResult; + this.bhType = bhType; + } + + public QmsStockSnExtBh(String batchNo, Integer bhType) { + this.batchNo = batchNo; + this.bhType = bhType; + } + public QmsStockSnExtBh() { + } + +} 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 250b6a7..b816bfe 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 @@ -118,7 +118,47 @@ public class SapDocFgSum extends BaseBean { @Transient public Long wdfdId; + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + private String bomVersion; + + @Column(name = "FG_ORDER_NO") + @ApiParam(value = "产品报工orderNo") + private String fGOrderNo; + + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + private String itemSeqNo; + public SapDocFgSum(){} + + 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) { + 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; + } 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; 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 new file mode 100644 index 0000000..4de7f0e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java @@ -0,0 +1,92 @@ +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.enumutil.CommonEnumUtil; +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.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 16:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="SOD_DET") +@Api("SOD_DET信息") +public class SodDet implements Serializable { + + private static final long serialVersionUID = 539607553249262854L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + 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="COLUMN_GROUP") + @ApiParam("分组列名") + public String columnGroup; + + @Column(name="COLUMN_GROUP_VALUE") + @ApiParam("分组列名值") + public String columnGroupValue; + + @Column(name="PROPERTIES_NAME") + @ApiParam("参数名") + public String propertiesName; + + @Column(name="PROPERTIES_VALUE") + @ApiParam("参数值") + public String propertiesValue; + + @Column(name="table_name") + @ApiParam("表名") + public String tableName; + + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; +} 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 338d1d1..6069c18 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 @@ -1,6 +1,8 @@ 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; @@ -31,26 +33,40 @@ public class SwebProcurementPlanOrder extends BaseBean { private static final long serialVersionUID = -4332932784803175933L; @Column(name = "ORDER_NO") @ApiParam(value = "合同号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; @Column(name = "VENDOR_CODE") @ApiParam(value = "供应商代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorCode; @Column(name = "VENDOR_NAME") @ApiParam(value = "供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName") private String vendorName; @Column(name = "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 partNo; @Column(name = "PART_NAME") @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 = "partName") private String partName; @Column(name = "CONSIGNMENT") @ApiParam(value = "是否寄售") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer consignment=2; } 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 2bbb7c8..55e2498 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,37 +35,37 @@ public class WareHouse extends BaseBean { private static final long serialVersionUID = 7914396535326597148L; @Column(name = "CODE") @ApiParam("仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String code; @Column(name = "NAME") @ApiParam("仓库名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String name; @Column(name = "ADDRESS") @ApiParam("仓库地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String address; @Column(name = "WH_LENGTH") @ApiParam(value = "长(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whLength; @Column(name = "WH_WIDTH") @ApiParam(value = "宽(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whWidth; @Column(name = "WH_HEIGHT") @ApiParam(value = "高(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whHeight; @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)") @ApiParam(value = "基本单元（米）") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double baseUnit; @Column(name = "MAP_LOCATION") 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 7ccc46c..00036f6 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 @@ -10,7 +10,11 @@ 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; import java.util.List; /** @@ -115,10 +119,14 @@ public class WmsASNMaster extends BaseBean { @ApiParam("备注") public String remark; - @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") + @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @ApiParam("道口") public String dock; + @ApiParam("泊位") + @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''") + public String zdoc; + @Transient @ApiParam("供应商电话") private String vendorCall; @@ -204,6 +212,17 @@ public class WmsASNMaster extends BaseBean { this.recStatus = recStatus; } + public WmsASNMaster(String orderNo, Integer asnStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) { + this.orderNo = orderNo; + this.asnStatus = asnStatus; + this.organizeCode = organizeCode; + this.vendorNo = vendorNo; + this.dock = dockCode; + this.zdoc = zdoc; + this.createDatetime = createDateTime; + this.createDateTimeStart = receiveDateTime; + } + public int getAsnStatusVal() { return this.asnStatus == null ? 0 : this.asnStatus; } 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 392c8e6..9ff19b8 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 @@ -143,8 +143,9 @@ public class WmsASNMasterDetails extends BaseBean { public WmsASNMasterDetails(){} - public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode){ + public WmsASNMasterDetails(Double recQty,Double qty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode,String planDate,String planTime){ this.recQty = recQty; + this.qty = qty; this.partNo = partNo; this.orderNo = orderNo; this.partNameRdd = partNameRdd; @@ -152,5 +153,7 @@ public class WmsASNMasterDetails extends BaseBean { this.unit = unit; this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; + this.planDate = planDate; + this.planTime = planTime; } } 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 5528099..889b2b3 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 @@ -49,17 +49,17 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private String agDescC; - @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0") + @Column(name = "INIT_AM_ID", columnDefinition = "bigint default 0") @ApiParam(value = "初始化组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; - @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0") + @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint default 0") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; - @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0") + @Column(name = "END_AM_ID", columnDefinition = "bigint default 0") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; @@ -81,8 +81,14 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private Integer isAutoCommit; + // 1=true, 2 = false + @Column(name = "IS_RESET_ABLE", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "是否允许重置") + @AnnoOutputColumn + private Integer isResetAble; + @Lob - @Column(name = "POSITION") + @Column(name = "POSITION", columnDefinition = "TEXT") @ApiParam(value = "GOJS位置") private String position; @@ -114,7 +120,11 @@ public class WmsActionGroup extends BaseBean { return this.autoInit == null ? 0 : this.autoInit.intValue(); } - public int geSubmitStepSeqVal() { + public int getSubmitStepSeqVal() { return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue(); } + + public int getIsResetAbleVal() { + return this.isResetAble == null ? 0 : this.isResetAble.intValue(); + } } 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 2926428..095ae01 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 @@ -100,7 +100,7 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "是否预显示") private Integer preShow; - @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0") + @Column(name = "SHOW_AM_ID", columnDefinition = "bigint default 0") @ApiParam(value = "回显组件方法ID") @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; 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 f3bb5e0..b96ae52 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 @@ -65,17 +65,17 @@ public class WmsActionLogData extends BaseBean { private String endTime; @Lob - @Column(name = "IN_PARAMS") + @Column(name = "IN_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输入参数") private String inParams; @Lob - @Column(name = "OUT_PARAMS") + @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输出参数") private String outParams; @Lob - @Column(name = "ERROR_MSG") + @Column(name = "ERROR_MSG", columnDefinition = "TEXT") @ApiParam(value = "异常信息") private String errorMsg; } 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 d43b2d8..28efa4f 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 @@ -59,6 +59,7 @@ public class WmsActionModule extends BaseBean { @AnnoOutputColumn public Integer isShowInfo; + @Column(name = "OP_TYPE_NAME", columnDefinition = "varchar(225) default ''") @ApiParam(value = "作业类型名称") public String opTypeName; 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 a852b02..12f5c0e 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 @@ -1,6 +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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,38 +36,64 @@ public class WmsAreaOwner extends BaseBean { private static final long serialVersionUID = -5772266802563087135L; @Column(name = "WH_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.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name="PART_NO") @ApiParam("物料编码") + @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") public String partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") + @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 = "partName") public String partNameRdd; @Column(name = "VENDOR_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.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; @Column(name = "OWNER_USER_NO") @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") private String ownerUserNo; @Column(name = "IS_PRE_ASSIGN") @ApiParam(value = "是否预分配人员") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) private Integer isPreAssign; @Column(name="SHIFT_NO") @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shiftNo; @Transient 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 new file mode 100644 index 0000000..3086942 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java @@ -0,0 +1,106 @@ +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 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; + + +/** + * @Description : 北京海纳川任务明细 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2018-11-17 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_AUTO_FORK_CALL_BACK_DETAILS", indexes = { + @Index(columnList = "TASK_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "无人叉车任务明细", description = "喜德无人叉车任务明细") +public class WmsAutoForkCallBackDetails extends BaseBean { + private static final long serialVersionUID = -8103992000562208799L; + + @Column(name = "REQ_CODE") + @ApiParam(value = "请求编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String reqCode; + + + @Column(name = "REQ_TIME") + @ApiParam(value = "请求时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String reqTime; + + @Column(name = "CLIENT_CODE") + @ApiParam(value = "客服端编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String clientCode; + + @Column(name = "TOKEN_CODE") + @ApiParam(value = "令牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tokenCode; + + @Column(name = "INTERFACE_NAME") + @ApiParam(value = "接口名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String interfaceName; + + @Column(name = "METHOD") + @ApiParam(value = "方法名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String method; + + @Column(name = "TASK_CODE") + @ApiParam(value = "任务单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String taskCode; + + @Column(name = "WB_CODE") + @ApiParam(value = "工作为") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String wbCode; + + @Column(name = "POD_CODE") + @ApiParam(value = "货架编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String podCode; + + @Column(name = "CURRENT_POSITION_CODE") + @ApiParam(value = "子任务的位置编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String currentPositionCode; + + @Column(name = "ROBOT_CODE") + @ApiParam(value = "执行任务的VGA编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String robotCode; + + @Column(name = "STATUS", nullable = false, columnDefinition = "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) + public Integer status; + + @Column(name = "REMARK", nullable = false) + @ApiParam("备注") + public String remark; + +} 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 new file mode 100644 index 0000000..e5fb349 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java @@ -0,0 +1,86 @@ +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 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; + +/** + * @Description : 自动化策略明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-20 16:51 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_AUTO_STRATEGY_DETAIL", indexes = { + @Index(columnList = "AUTO_STRATEGY_NO"), + @Index(columnList = "STRATEGY_ITEM_NO") +}) +@Api("自动化策略明细表") +public class WmsAutoStrategyDetail extends BaseBean { + private static final long serialVersionUID = 6855278572650548519L; + + @Column(name = "AUTO_STRATEGY_NO") + @ApiParam(value = "自动化策略编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String autoStrategyNo; + + @Column(name = "STRATEGY_ITEM_NO") + @ApiParam(value = "策略项编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyItemNo; + + @Column(name = "STRATEGY_ITEM_NAME") + @ApiParam(value = "策略项名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyItemName; + + @Column(name = "STRATEGY_ITEM_SPEC") + @ApiParam(value = "策略项描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyItemSpec; + + @Column(name = "FILTER_CONDITION") + @ApiParam(value = "过滤条件") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String filterCondition; + + @Column(name = "SORT_CONDITION") + @ApiParam(value = "排序条件") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String sortCondition; + + @Column(name = "STRATEGY_ACTION") + @ApiParam(value = "动作") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + @AnnoOutputColumn(refClass = WmsEnumUtil.STRATEGY_ACTION_TYPE.class, refForeignKey = "value", value = "description", hidden = true) + private Integer strategyAction; + + @Column(name = "STRATEGY_METHOD") + @ApiParam(value = "方法") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyMethod; + + @Column(name = "SCRIPT_NO") + @ApiParam(value = "脚本编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String scriptNo; + +} 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 new file mode 100644 index 0000000..9a4437d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java @@ -0,0 +1,88 @@ +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 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; + + +/** + * @Description : 自动化策略主表 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-06-20 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_AUTO_STRATEGY_MASTER", indexes = { + @Index(columnList = "STRATEGY_NO"), + @Index(columnList = "ROUTING_CODE") +}) +@Api("自动化策略主表") +public class WmsAutoStrategyMaster extends BaseBean { + private static final long serialVersionUID = -1818481118386594571L; + + @Column(name = "STRATEGY_NO") + @ApiParam(value = "策略编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyNo; + + @Column(name = "STRATEGY_NAME") + @ApiParam(value = "策略名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyName; + + @Column(name = "STRATEGY_SPEC") + @ApiParam(value = "策略描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategySpec; + + @Column(name = "STRATEGY_TYPE") + @ApiParam(value = "策略类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "OUT_MOVEMENT_MOVE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description", hidden = true) + private Integer strategyType; + + @Column(name = "ROUTING_CODE") + @ApiParam(value = "物料路线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String routingCode; + + @Column(name = "ROUTING_NAME") + @ApiParam(value = "物流路线名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String routingName; + + @Column(name = "STRATEGY_QTY_CONTROL") + @ApiParam(value = "数量控制") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "SHIPP_QTY_CONTROL") + @AnnoOutputColumn(refClass = WmsEnumUtil.AUTO_STRATEGY_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) + private Integer strategyQtyControl; + + @Column(name = "START_EFFECT_DATE") + @ApiParam(value = "开始生效时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String startEffectDate; + + @Column(name = "END_EFFECT_DATE") + @ApiParam(value = "结束生效时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String endEffectDate; + +} 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 new file mode 100644 index 0000000..31f0174 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java @@ -0,0 +1,51 @@ +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.Index; +import javax.persistence.Table; + +/** + * @Description : 自动化策略方法 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_AUTO_STRATEGY_METHOD", indexes = { + @Index(columnList = "STRATEGY_ACTION") +}) +@Api("自动化策略方法") +public class WmsAutoStrategyMethod extends BaseBean { + private static final long serialVersionUID = -4424882984978962477L; + + @Column(name = "STRATEGY_ACTION") + @ApiParam(value = "动作") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Integer strategyAction; + + @Column(name = "STRATEGY_METHOD") + @ApiParam(value = "策略方法") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyMethod; + + @Column(name = "STRATEGY_SPEC") + @ApiParam(value = "策略描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategySpec; +} 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 new file mode 100644 index 0000000..640c0d4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java @@ -0,0 +1,58 @@ +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 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-06-23 13:55 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_AUTO_TASK_LOG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "自动任务日志", description = "自动任务日志") +public class WmsAutoTaskLog extends BaseBean { + private static final long serialVersionUID = -7839329617395574378L; + + @Column(name = "ORDER_NO") + @ApiParam("关联订单号") + public String orderNo; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + public String busiType; + + @Column(name = "STRATEGY_NO") + @ApiParam("策略代码") + public String strategyNo; + + @Column(name = "STRATEGY_ACTION") + @ApiParam("策略动作") + public String strategyAction; + + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OPERATE_TYPE.class) + public String operateType; + + @Column(name = "ERROR_MSG") + @ApiParam("错误信息") + public String errorMsg; +} 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 new file mode 100644 index 0000000..649bea3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -0,0 +1,54 @@ +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.Table; + +/** + * @Description : BH子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_BH_CHILD_DETECTION_ITEM") +@Api("BH子检测项") +public class WmsBhChildDetectionItem extends BaseBean { + + private static final long serialVersionUID = -8005468634643773682L; + + @Column(name = "ITEM_CHECK_CODE") + @ApiParam("子检测项代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemCheckCode; + + @Column(name = "ITEM_CHECK_NAME") + @ApiParam("子检测项名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemCheckName; + + @Column(name = "CHECK_TYPE_CODE") + @ApiParam("检测大类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + public String checkTypeCode; + + @Column(name = "VALUE_TYPE") + @ApiParam("值类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") + 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 512e255..edb96e4 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 @@ -3,12 +3,14 @@ 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; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -36,59 +38,61 @@ public class WmsBom extends BaseBean { private static final long serialVersionUID = 5555657644784074446L; @Column(name = "PART_NO") @ApiParam(value = "父物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "父物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "UNIT") @ApiParam(value = "计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String unit; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Column(name = "ITEM_PART_NO") @ApiParam(value = "子物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNo; @Column(name = "ITEM_PART_NAM") @ApiParam(value = "子料物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNam; @Column(name = "ITEM_UNIT") @ApiParam(value = "子计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemUnit; - @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double itemQty; @Column(name = "BOM_NUM") @ApiParam(value = "BOM编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomNum; @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_START_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effStartTime; @@ -96,19 +100,37 @@ public class WmsBom extends BaseBean { @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_END_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effEndTime; @Column(name = "LOCATE_NO") @ApiParam(value = "线边库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String locateNo; @Column(name = "TERMINAL_NO") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemSeqNo; + + + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo; 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 new file mode 100644 index 0000000..88525bb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -0,0 +1,166 @@ +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; +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; + +/** + * @Description : bom历史记录 + * @Reference : + * @Author : jason + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_BOM_HISTORY") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "bom历史记录", description = "bom历史记录") +public class WmsBomHistory extends BaseBean { + private static final long serialVersionUID = -2781401699752981565L; + @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 = "UNIT") + @ApiParam(value = "计量单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String unit; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "数量") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double qty; + + @Column(name = "ITEM_PART_NO") + @ApiParam(value = "子物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String itemPartNo; + + @Column(name = "ITEM_PART_NAM") + @ApiParam(value = "子料物料描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String itemPartNam; + + @Column(name = "ITEM_UNIT") + @ApiParam(value = "子计量单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemUnit; + + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "子用量") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double itemQty; + + @Column(name = "BOM_NUM") + @ApiParam(value = "BOM编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomNum; + + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomVersion; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + @Column(name = "EFF_START_TIME") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private String effStartTime; + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + @Column(name = "EFF_END_TIME") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private String effEndTime; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "线边库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String locateNo; + + @Column(name = "TERMINAL_NO") + @ApiParam(value = "工位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String terminalNo; + + @Column(name = "NEW_BOM_VERSION") + @ApiParam(value = "工位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String newBomVersion; + + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + + @ApiParam(value = "目标存储区") + @Transient + public String destZoneNo; + + @ApiParam(value = "交易类型") + @Transient + public String transTypeCode; + + @ApiParam(value = "线路代码") + @Transient + public String routingCode; + + public Double getQty() { + return this.qty == null ? 0 : this.qty.doubleValue(); + } + + public Double getItemQty() { + return this.itemQty == null ? 0 : this.itemQty.doubleValue(); + } + + public WmsBomHistory() { + } + + public WmsBomHistory(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + this.itemQty = itemQty; + } + + public WmsBomHistory(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty,String effStartTime) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + this.itemQty = itemQty; + this.effStartTime = effStartTime; + } +} 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 263cc0e..b1643f2 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 @@ -5,6 +5,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; @@ -40,8 +41,9 @@ public class WmsBomTotal extends BaseBean { @ApiParam("计量单位") private String UNIT; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam("数量") + @ColumnDefault("0") private Double qty; @Column(name = "ITEM_PART_NO") @@ -56,8 +58,9 @@ public class WmsBomTotal extends BaseBean { @ApiParam(value = "子计量单位") private String itemUnit; - @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") + @ColumnDefault("0") private Double itemQty; @Column(name = "BOM_NUM") 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 1f2f1d4..f6e866e 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 @@ -16,6 +16,7 @@ import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 盘点单冻结信息 @@ -154,6 +155,14 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description") public Integer differenceType; + /** + * 差异类型：10：盘平，20：盘亏，30盘赢 + */ + @Transient + @ApiParam("差异集合") + @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description") + public List differenceTypeList; + public Integer getDifferenceTypeVal() { return this.differenceType == null ? -1: this.differenceType; 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 c632d9f..f6030f5 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 @@ -43,12 +43,12 @@ public class WmsCSOrderMaster extends BaseBean { */ @Column(name = "ORDER_TYPE") @ApiParam(value = "单据类型", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class, refForeignKey = "value", value = "description") public Integer orderType; @Column(name = "ORDER_STATUS") @ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer orderStatus; @Column(name = "ACTION_PERSENT") @@ -61,17 +61,17 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_INVENTORY") @ApiParam(value = "是否允许清点", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isInventory; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; @Column(name = "IS_PART") @ApiParam(value = "是否散件") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isPart; @Column(name = "YEAR") @@ -80,7 +80,7 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_SYNC_ERP") @ApiParam("是否同步ERP") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isSyncErp; @Transient @@ -119,7 +119,7 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "ALLOW_LOCATES") private String allowLocates; public Integer getIsInventoryVal() { - return this.isInventory == null ? 0 :this.isInventory.intValue(); + return this.isInventory == null ? 0 : this.isInventory.intValue(); } } 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 6c8b97a..fa3d7d1 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 @@ -1,7 +1,9 @@ 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; @@ -12,7 +14,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 车辆信息 @@ -26,43 +27,61 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_CAR") +@Table(name = "WMS_CAR") @Api("车辆信息") public class WmsCar extends BaseBean { - @Column(name="CAR_NO") - @ApiParam(value ="车牌号") + private static final long serialVersionUID = -905792638347428695L; + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String carNo; - @Column(name="CAR_DESC") - @ApiParam(value ="车辆描述") + @Column(name = "CAR_DESC") + @ApiParam(value = "车辆描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String carDesc; - @Column(name="MAX_CAPACITY") - @ApiParam(value ="载重量(KG)") + @Column(name = "MAX_CAPACITY") + @ApiParam(value = "载重量(KG)") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String maxCapacity; - @Column(name="DRIVER_NO") - @ApiParam(value ="默认驾驶员") + @Column(name = "DRIVER_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.WmsTmsDriver", + searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverNo") private String driverNo; - @Column(name="PHONE") - @ApiParam(value ="车主电话") + @Column(name = "PHONE") + @ApiParam(value = "车主电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String phone; - @Column(name="VENDOR_NO") - @ApiParam(value ="所属供应商") + @Column(name = "VENDOR_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.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; - @Transient - @ApiParam("司机名称") + @Column(name = "DRIVER_NAME_RDD") + @ApiParam("驾驶员名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver", + searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverName") private String driverNameRdd; - @Transient + @Column(name = "VENDOR_NAME_RDD") @ApiParam(value = "供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName") private String vendorNameRdd; @Column(name = "MAP_LOCATION") @ApiParam("经纬度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; } 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 new file mode 100644 index 0000000..e07cb5f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : COI对照表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-09 16:59 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_COI") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="COI对照表",description = "COI对照表") +public class WmsCoi extends BaseBean { + + private static final long serialVersionUID = -8298385889006722335L; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "PART_VOL") + @ApiParam(value = "体积") + private Double partVol; + + @Column(name = "TRUNROUND_RATE") + @ApiParam(value = "周转率") + private Double trunroundRate; + + @Column(name = "COI_VALUE") + @ApiParam(value = "COI值") + private Double coiValue; + + @Column(name = "LAST_UPDATE_DATE") + @ApiParam(value = "末次更新日期") + private String lastUpdateDate; + + @Column(name = "FREQUENCY") + @ApiParam(value = "频次") + private Double frequency; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位") + private String locateNo; +} 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 dff5890..a941bf2 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 @@ -5,6 +5,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; @@ -53,7 +54,7 @@ public class WmsConfig extends BaseBean { private String configValueType; @Lob - @Column(name="CONFIG_VALUE") + @Column(name="CONFIG_VALUE", columnDefinition = "TEXT") @ApiParam(value ="参数值") private String configValue; 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 3c51124..5529e33 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 @@ -1,20 +1,20 @@ 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 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; /** * @Description :容器类型 @@ -33,22 +33,27 @@ import javax.persistence.Transient; public class WmsContainerType extends BaseBean { private static final long serialVersionUID = 4849044986767609347L; @ApiParam(value = "容器类型代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctCode; @Column(name = "CT_NAME") @ApiParam(value = "容器类型名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctName; @Column(name = "USE_LIMIT") @ApiParam(value = "使用期限") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private Integer useLimit; @Column(name = "IS_RECYCLE") @ApiParam(value = "是否回收") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isRecycle; @Column(name = "LIMIT_UOM") @ApiParam(value = "期限单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String limitUom; } 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 7223d70..4933c46 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 @@ -3,6 +3,7 @@ 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; @@ -37,57 +38,86 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @Column(name = "STRATEGY_NAME") @ApiParam(value = "策略名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String strategyName; @Column(name = "part_type") @ApiParam(value = "物料分类") @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PART_ABC") private String partType; @Column(name = "STRATEGY_TYPE") @ApiParam(value = "策略分类", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "CS_STRATEGY_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class) private Integer strategyType; @Column(name = "CYCLE_RULE") @ApiParam(value = "循环规则") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String cycleRule; @Column(name = "START_DATE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "开始日期", example = "0") private String startDate; @Column(name = "END_DATE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "结束日期", example = "0") private String endDate; @Column(name = "NUM_MAX") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @ApiParam(value = "明细数量上限") private Integer numMax; @Column(name = "COVERAGE_RATE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @ApiParam(value = "抽盘覆盖率") private Double coverageRate; @Column(name = "ZONE_NOS") @ApiParam(value = "存储区") + @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") private String zoneNos; @Column(name = "LOCATES") @ApiParam(value = "盘点库位") + @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") private String locates; @Column(name = "last_run_time") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "上次运行时间") private String lastRunTime; @Column(name = "next_run_time") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "下次运行时间") private String nextRunTime; @Column(name = "REMAKE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) @ApiParam(value = "备注") private String remake; + + @ApiParam(value = "已盘物料") + @Column(name = "INVENTORY_MATERIAL") + @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 inventoryMaterial; + + @ApiParam(value = "已盘库位") + @Column(name = "INVENTORY_LOCATION") + @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") + private String inventoryLocation; } 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 new file mode 100644 index 0000000..95e581d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -0,0 +1,61 @@ +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 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 + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_CUST_WINDOW") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="客户窗口时间",description = "客户窗口时间") +public class WmsCustWindow extends BaseBean { + + private static final long serialVersionUID = -6544671103929721988L; + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + + @Column(name = "CUST_WINDOW_TIME") + @ApiParam(value = "窗口时间") + private String custWindowTime; + + @Column(name = "WEEKS") + @AnnoOutputColumn(refClass = WmsEnumUtil.WEEK_TYPE.class, refForeignKey = "value", value = "description") + @ApiParam(value = "星期") + private String weeks; + + @Column(name = "DELAY_HOUR") + @ApiParam(value = "容差") + private Integer delayHour; + + public WmsCustWindow(WmsCustWindow custWindow) { + this.custNo = custWindow.getCustNo(); + this.custWindowTime = custWindow.getCustWindowTime(); + this.weeks = custWindow.getWeeks(); + this.delayHour = custWindow.getDelayHour(); + } + + public WmsCustWindow() { + } +} 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 6e25a2b..3e7e870 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 @@ -1,6 +1,8 @@ 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; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 客户零件关系表 @@ -32,21 +33,34 @@ public class WmsCustomerPart extends BaseBean { private static final long serialVersionUID = 3903166651913139058L; @Column(name = "CUSTOMER_CODE") @ApiParam(value = "客户代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String customerCode; @Column(name = "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 partNo; @Column(name = "CUSTOMER_PART_NO") @ApiParam(value = "客户零件号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String customerPartNo; - @Transient + @Column(name = "CUSTOMER_DESC") @ApiParam(value = "客户全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custDesc") private String custDesc; - @Transient + @Column(name = "PART_NAME") @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 = "partName") private String partName; } 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 new file mode 100644 index 0000000..a071ed1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 客户物料发往地 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_CUSTOMER_PART_SHIPPING") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="客户物料发往地",description = "客户物料发往地") +public class WmsCustomerPartShipping extends BaseBean { + + private static final long serialVersionUID = 9091356911517332847L; + @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 = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + private String shippingFlag; +} 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 348bb18..1995c1c 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -41,7 +42,8 @@ public class WmsDataAuth extends BaseBean { return String.valueOf(dataObj); } - @Column(name = "DATA_OBJ_VALUE") + @Lob + @Column(name = "DATA_OBJ_VALUE", columnDefinition = "TEXT") @ApiParam(value = "数据对象值") private String dataObjValue; 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 65e800d..6447a3a 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,6 +1,8 @@ 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; @@ -104,7 +106,6 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="SID") @ApiParam("SID") public String sid; - /** * 状态:10=新建,20=已处理,30=处理出错 */ @@ -138,4 +139,53 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "BOM生效日期") @Column(name = "EFF_START_TIME") private String effStartTime; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "ACTUAL_REPORT_LINE") + @ApiParam("实际报工产线") + private String actualReportLine; + + @Column(name = "BATCH_NO") + @ApiParam("批号") + private String batchNo; + + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + private String bomVersion; + + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + private String fixLotNo = ""; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + private String packageNo; + + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemSeqNo; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + + @Column(name = "JIS_NO") + @ApiParam(value = "jis编号") + private String jisNo; + + public WmsDocFgDetail(String jisNo) { + this.jisNo = jisNo; + } + + public WmsDocFgDetail() { + } } 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 88f3576..329d006 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 @@ -1,7 +1,9 @@ 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; @@ -11,8 +13,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; -import java.util.Objects; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description :移库单明细实体(用于转储类业务) @@ -97,6 +103,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "计划时间") private String planTime; + @Transient + @ApiParam(value = "超时时间(单位:分钟)") + private Integer timeOut; + @Column(name = "SRC_NO") @ApiParam(value = "源单号") private String srcNo; @@ -108,6 +118,18 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; + + /** + * 已创建，已收货，已发运，已拣货 + */ + @Transient + @ApiParam(value = "状态中文") + private String itemStatusStr; + + @Transient + @ApiParam(value = "ERP单号") + private String erpSrcNo; + /** * 是否免费:0=计费,1=免费 */ @@ -120,6 +142,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "操作原因") private String remark; + /** + * 配料数量 + **/ @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已拣货数量", example = "1") @@ -145,6 +170,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "任务生成数量", example = "1") private Double taskGenerateQty; + @Column(name = "PRINT_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已打印数量") + private Double printGenerateQty; + @Column(name = "SRC_AREA_NO") @ApiParam("源库存地代码") public String srcAreaNo; @@ -169,6 +199,55 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "指定生产日期") private String assignDateCode; + @Column(name = "SO_ORDER_NO") + @ApiParam(value = "销售单据号") + private String soOrderNo; + + @Column(name = "MEL_TYPE") + @ApiParam(value = "材料类型") + private String melType; + + @Column(name = "PROJECT_NO") + @ApiParam(value = "项目号") + private String projectNo; + + @Column(name = "PRODUCTION_GROUP") + @ApiParam(value = "生产小组") + private String productionGroup; + + @Column(name = "CUST_PART_NO") + @ApiParam(value = "客户零件号") + private String custPartNo; + + @Column(name = "MATERIAL_TYPE") + @ApiParam(value = "物料类型") + private String materialType; + + @Column(name = "PART_SPEC") + @ApiParam(value = "简称") + private String partSpec; + + @Column(name = "WORK_ORDER_CODE") + @ApiParam(value = "工单码") + private String workOrderCode; + + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + private String seqNo; + + @Transient + @ApiParam(value = "客户编号") + private String custNo; + + @Transient + @ApiParam(value = "替代物料编码") + private String subPartNo; + + + @Transient + @ApiParam(value = "替代物料名称") + private String subPartName; + @Transient @ApiParam("实际批次") private String actualLot; @@ -241,6 +320,18 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") private Integer executeStatus; + @Transient + @ApiParam(value = "客户发往地编号") + private String flagNo; + + @Transient + @ApiParam("执行") + private Integer isMakeUp; + + @Transient + @ApiParam(value = "子位置号") + private String itemSeqNo; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } @@ -292,6 +383,12 @@ public class WmsDocMovementDetails extends BaseBean { public Integer isSn; + @Column(name = "REF_SRC") + @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refSrc; + + public WmsDocMovementDetails () { } @@ -326,4 +423,36 @@ public class WmsDocMovementDetails extends BaseBean { this.modifyDatetime = modifyDatetime; } + + public WmsDocMovementDetails(WmsPOMasterDetails poMasterDetails) { + this.orderNo = poMasterDetails.getOrderNo(); + this.planDate = poMasterDetails.getPlanDate(); + this.planTime = poMasterDetails.getPlanTime(); + } + + public WmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails,Integer busiType,String srcZoneNo,String destZoneNo, + String custNo) { + this.orderNo = wmsDocMovementDetails.getOrderNo(); + this.partNo = wmsDocMovementDetails.getPartNo(); + this.qty = wmsDocMovementDetails.getQty(); + this.taskGenerateQty = wmsDocMovementDetails.getTaskGenerateQty(); + this.partNameRdd = wmsDocMovementDetails.getPartNameRdd(); + 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.busiType = busiType; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.custNo = custNo; + } + } 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 ead19c3..f20b634 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 @@ -1,7 +1,9 @@ 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; @@ -11,7 +13,11 @@ import lombok.ToString; 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 java.util.List; /** @@ -115,6 +121,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient private List movementDetailsList; @@ -178,6 +188,53 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "QAD发运单据类型") private String erpSrcType; + @ApiParam("是否正常运输") + @Column(name = "IS_NORMAL_TRANSPORTATION") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + private Integer isNormalTransportation; + + @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 = "LOGISTICS_VENDOR_NO") + @ApiParam("物流供应商") + private String logisticsVendorNo; + + //正常运输 和非正常运输 + @Column(name = "BUSINESS_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") + @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) + private Integer businessType; + + @Column(name = "IS_TRANSPORTATION_CREATION") + @ApiParam(value = "运输信息创建") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + private Integer isTransportationCreation; + + @Column(name = "IS_GOOD_PRODUCT") + @ApiParam(value = "是否良品") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + private Integer isGoodProduct; + + @Column(name = "COST_CENTER") + @ApiParam(value = "成本中心") + private String costCenter; + + @Column(name = "REMAKE") + @ApiParam(value = "备注1") + private String remake; + + @Column(name = "SECONDARY_REMAKE") + @ApiParam(value = "备注2") + private String secondaryRemake; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; @@ -202,6 +259,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("物料编号组") public String[] partNos; + @Transient + @ApiParam("工厂集合") + private List organizeCodeList; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -209,4 +270,12 @@ public class WmsDocMovementMaster extends BaseBean { public int getBusiTypeVal() { return this.busiType == null ? 0 : this.busiType; } + + public WmsDocMovementMaster(WmsPOMaster wmsPoMaster) { + this.orderNo = wmsPoMaster.getOrderNo(); + this.vendorNo = wmsPoMaster.getVendorNo(); + } + + public WmsDocMovementMaster() { + } } 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 9e8d916..2db18a2 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 @@ -11,7 +11,11 @@ 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 : 移库单条码表 @@ -78,6 +82,14 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "WORK_ORDER_CODE") + @ApiParam(value = "工单码") + private String workOrderCode; + + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + private String seqNo; + @Column(name = "SN_TYPE") @ApiParam(value = "条码类型") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") @@ -127,7 +139,6 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; - @Transient @ApiParam("打印模板") private String templateNo; @@ -136,6 +147,15 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("剩余箱数量") private Long countBox; + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + public WmsDocMovementSn(){} public WmsDocMovementSn(Long countBox,String partNo) { 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 new file mode 100644 index 0000000..32ce767 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -0,0 +1,75 @@ +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 lombok.EqualsAndHashCode; +import lombok.ToString; +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; + +/** + * @Description : 销售订单明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 13:30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_SO_DETAILS") +@Api("销售订单明细表") +@ToString +public class WmsDocSoDetails extends BaseBean { + private static final long serialVersionUID = -8900949569711082994L; + + @Column(name = "ORDER_NO") + @ApiParam(value = "单据号") + private String orderNo; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "SNP_QTY") + @ApiParam(value = "标准包装", example = "1") + private Double snpQty; + + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Transient + @ApiParam(value = "客户编号") + private String custCode; +} 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 new file mode 100644 index 0000000..863ea9c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java @@ -0,0 +1,68 @@ +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 lombok.EqualsAndHashCode; +import lombok.ToString; +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-04-13 13:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_SO_MASTER") +@Api("销售订单主表") +@ToString +public class WmsDocSoMaster extends BaseBean { + + private static final long serialVersionUID = 8250843929041855006L; + + @Column(name = "ORDER_NO") + @ApiParam(value = "单据号") + private String orderNo; + + @Column(name = "ORDER_TYPE") + @ApiParam("订单类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SO_ORDER_TYPE.class, refForeignKey = "value", value = "description") + public Integer orderType; + + @Column(name = "ORDER_STATUS") + @ApiParam(value = "订单状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer orderStatus; + + @Column(name = "CUST_CODE") + @ApiParam(value = "客户编号") + private String custCode; + + @Column(name = "CUST_DESC") + @ApiParam(value = "客户全称") + private String custDesc; + + @Column(name = "CUST_DELIVERY_CODE") + @ApiParam(value = "客户发往地代码") + private String custDeliveryCode; + + @Column(name = "FLAG_NAME") + @ApiParam(value = "客户发往地名称") + private String flagName; + + +} 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 8e638b7..f48da84 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,23 +29,24 @@ import javax.persistence.Table; @Table(name="WMS_DOCK") @Api("道口预约信息") public class WmsDock extends BaseBean { + private static final long serialVersionUID = 1084849307899138229L; @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockCode; @Column(name="DOCK_ADDRESS") @ApiParam("道口发运地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockAddress; @Column(name="DOCK_DESC") @ApiParam("道口发运地址描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockDesc; @Column(name="DOCK_TYPE") @ApiParam("道口类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - private String dockType; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_TYPE") + private Integer dockType; } 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 e26a736..d8dd810 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 道口预约信息 @@ -30,43 +31,52 @@ import javax.persistence.Table; @Api("道口预约信息") public class WmsDockOrderInfo extends BaseBean { + private static final long serialVersionUID = -18500387985953214L; @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockCode; @Column(name="ORDER_DATE") @ApiParam("预约日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String orderDate; @Column(name="WINDOW_TIME") @ApiParam("窗口时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String windowTime; @Column(name="ORDER_STATUS") @ApiParam("预约状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_ORDER_STATUS") private Integer orderStatus; @Column(name="SUPPLIER_CODE") @ApiParam("供应商编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String supplierCode; @Column(name="CAR_NO") @ApiParam("车辆编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String carNo; @Column(name="DRIVER_NAME") @ApiParam("驾驶员") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String driverName; @Column(name="ORDER_NO") @ApiParam("单据号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; + + @Transient + @ApiParam("驾驶员编码") + private String driverNo; + + @Transient + @ApiParam("库位代码") + private Integer masterStatus; } 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 0084679..4ccaabf 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,13 +30,14 @@ import javax.persistence.Table; @Api("道口窗口时间") public class WmsDockWindowTime extends BaseBean { + private static final long serialVersionUID = -3188113111546998811L; @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String dockCode; @Column(name="WINDOW_TIME") @ApiParam("窗口时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String windowTime; } 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 89184cf..66d6249 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 @@ -25,79 +25,94 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_FG_INSTOCK") +@Table(name = "WMS_DOC_FG_INSTOCK") @Api("产品入库信息") public class WmsFGInStock extends BaseBean { private static final long serialVersionUID = 5337952801731230326L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("订单号") public String orderNo; - @Column(name="WO_NO") + @Column(name = "WO_NO") @ApiParam("ERP工单号") public String woNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") public String unit; - @Column(name="SN") + @Column(name = "SN") @ApiParam("条码") public String sn; /** * 状态：1=新建,10=已处理,20=处理出错 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") public Integer orderStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String remark; /** - * 来源：MNU=手工,MES=MES接口 + * 来源：BH:BatchHold,MNU=手工,MES=MES接口 */ - @Column(name="SRC") + @Column(name = "SRC") @ApiParam("单据来源") public String src; - @Column(name="ERP_AREA_NO") + @Column(name = "ERP_AREA_NO") @ApiParam("默认收货库存地") public String erpAreaNo; - @Column(name="LINE_NO") + @Column(name = "LINE_NO") @ApiParam("生产线") public String lineNo; - @Column(name="WH_NO") + @Column(name = "WH_NO") @ApiParam("默认仓库") public String whNo; - @Column(name="CUST_NO") + @Column(name = "CUST_NO") @ApiParam("客户编码") public String custNo; - @Column(name="SHIPPING_FLAG") + @Column(name = "SHIPPING_FLAG") @ApiParam("特殊发货标志") public String shippingFlag; - @Column(name="MFG_LOG_NO") + @Column(name = "MFG_LOG_NO") @ApiParam("生产批次") public String mfgLogNo; + + @Column(name = "BATCH_NO") + @ApiParam("batch号") + private String batchNo; + + @Column(name = "PACKAGE_NO") + @ApiParam("箱条码") + private String packageNo; + + /** + * 条码类型：10=实物条码(正常),20=首件,30=中件,40=末件 + */ + @Column(name = "SN_TYPE") + @ApiParam("条码类型") + private Integer snType; } 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 new file mode 100644 index 0000000..2ef602d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java @@ -0,0 +1,70 @@ +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.*; + +/** + * @Description : 仓库健康度指标 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_INDICATOR", indexes = { + @Index(columnList = "INDICATOR_CODE"), + @Index(columnList = "GROUP_NAME") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度指标",description = "仓库健康度指标") +public class WmsHealthIndicator extends BaseBean { + + private static final long serialVersionUID = 7332606119041273554L; + + @Column(name = "INDICATOR_CODE") + @ApiParam(value = "指标代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorCode; + + @Column(name = "INDICATOR_NAME") + @ApiParam(value = "指标名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorName; + + @Column(name = "GROUP_NAME") + @ApiParam(value = "模块名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String groupName; + + @Column(name = "CALC_FORMULA") + @ApiParam(value = "指标测算公式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String calcFormula; + + @Transient + @ApiParam(value = "指标等级") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorGrade; + + @Transient + @ApiParam(value = "指标颜色") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorColor; + + @Transient + @ApiParam(value = "指标测算值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double indicatorCalcValue; +} 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 new file mode 100644 index 0000000..317c3e9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java @@ -0,0 +1,67 @@ +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.Index; +import javax.persistence.Table; + +/** + * @Description : 仓库健康度指标 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_INDICATOR_LEVEL", indexes = { + @Index(columnList = "INDICATOR_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度指标分级",description = "仓库健康度指标分级") +public class WmsHealthIndicatorLevel extends BaseBean { + + private static final long serialVersionUID = 7332606229041273554L; + + @Column(name = "INDICATOR_CODE") + @ApiParam(value = "指标代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorCode; + + @Column(name = "INDICATOR_NAME") + @ApiParam(value = "指标名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorName; + + @Column(name = "INDICATOR_LOWER_LIMIT") + @ApiParam(value = "指标下限") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double indicatorLowerLimit; + + @Column(name = "INDICATOR_UPPER_LIMIT") + @ApiParam(value = "指标上限") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double indicatorUpperLimit; + + @Column(name = "INDICATOR_GRADE") + @ApiParam(value = "指标等级") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorGrade; + + @Column(name = "INDICATOR_COLOR") + @ApiParam(value = "指标颜色") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorColor; +} 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 new file mode 100644 index 0000000..f5d7d59 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java @@ -0,0 +1,55 @@ +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.*; + +/** + * @Description : 仓库健康度指标结果 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_INDICATOR_RESULT", indexes = { + @Index(columnList = "INDICATOR_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度指标结果",description = "仓库健康度指标结果") +public class WmsHealthIndicatorResult extends BaseBean { + + private static final long serialVersionUID = 7332606339041273554L; + + @Column(name = "INDICATOR_CODE") + @ApiParam(value = "指标代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorCode; + + @Column(name = "INDICATOR_NAME") + @ApiParam(value = "指标名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorName; + + @Column(name = "INDICATOR_VALUE") + @ApiParam(value = "指标测算值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double indicatorValue; + + @Lob + @Column(name = "INDICATOR_DETAILS") + @ApiParam(value = "指标测算明细") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorDetails; +} 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 new file mode 100644 index 0000000..d3572e5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java @@ -0,0 +1,107 @@ +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.Lob; +import javax.persistence.Table; + +/** + * @Description : 仓库健康度变量 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_VARIABLE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度变量",description = "仓库健康度变量") +public class WmsHealthVariable extends BaseBean { + + private static final long serialVersionUID = 7332606449041273554L; + + @Column(name = "VARIABLE_CODE") + @ApiParam(value = "变量代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableCode; + + @Column(name = "VARIABLE_NAME") + @ApiParam(value = "变量名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableName; + + @Column(name = "CYCLE_RANGE") + @ApiParam(value = "周期(天)") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer cycleRange; + + @Column(name = "CALC_FREQUENCY") + @ApiParam(value = "计算频次(天)") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer calcFrequency; + + @Column(name = "LAST_CALC_TIME") + @ApiParam(value = "末次计算时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lastCalcTime; + + @Column(name = "NEXT_CALC_TIME") + @ApiParam(value = "下次计算时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String nextCalcTime; + + @Column(name = "APPLY_AREA") + @ApiParam(value = "适应存储区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String applyArea; + + @Column(name = "APPLY_PART_GROUP") + @ApiParam(value = "适应物料组") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String applyPartGroup; + + @Lob + @Column(name = "VARIABLE_PARAM") + @ApiParam(value = "变量参数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableParam; + + @Lob + @Column(name = "SQL_STATEMENT") + @ApiParam(value = "SQL语句") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String sqlStatement; + + @Column(name = "CLASS_PATH") + @ApiParam(value = "调用类名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String className; + + @Column(name = "FUNCTION_NAME") + @ApiParam(value = "方法名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String functionName; + + @Column(name = "SCRIPT_NO") + @ApiParam(value = "脚本编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String scriptNo; + + @Column(name = "CALC_WAYS") + @ApiParam(value = "测算方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String calcWays; +} 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 new file mode 100644 index 0000000..cd066ab --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java @@ -0,0 +1,56 @@ +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.Lob; +import javax.persistence.Table; + +/** + * @Description : 仓库健康度变量测算结果 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_VARIABLE_RESULT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度变量测算结果",description = "仓库健康度变量测算结果") +public class WmsHealthVariableResult extends BaseBean { + + private static final long serialVersionUID = 7332606559041273554L; + + @Column(name = "VARIABLE_CODE") + @ApiParam(value = "变量代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableCode; + + @Column(name = "VARIABLE_NAME") + @ApiParam(value = "变量名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableName; + + @Column(name = "VARIABLE_VALUE") + @ApiParam(value = "变量测算值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer variableValue; + + @Lob + @Column(name = "VARIABLE_DETAILS") + @ApiParam(value = "变量测算明细") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableDetails; +} 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 9b7661f..3e63579 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 @@ -1,6 +1,8 @@ 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; @@ -33,32 +35,43 @@ public class WmsIbCheckPlan extends BaseBean{ private static final long serialVersionUID = 3557978060450659460L; @Column(name="PART_NO") @ApiParam(value ="物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, 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 partNo; @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name="START_DATE") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="开始日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startDate; @Column(name="END_DATE") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="结束日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endDate; @Column(name="LOT_QTY") @ApiParam(value ="样本数量", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer lotQty; @Column(name="COUNTER") @ApiParam(value ="已收货件数", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer counter; @Column(name="CHECK_COUNTER") @ApiParam(value ="已抽点件数", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer checkCounter; @Transient 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 a69e24b..8734084 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 @@ -3,6 +3,7 @@ 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; @@ -35,12 +36,12 @@ public class WmsLocate extends BaseBean { private static final long serialVersionUID = -8425904594036746967L; @Column(name = "LOCATE_NO") @ApiParam(value = "库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String locateNo; @Column(name = "LOCATE_NAME") @ApiParam(value = "库位名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String locateName; /** @@ -49,110 +50,142 @@ public class WmsLocate extends BaseBean { @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LOCATE_TYPE") private Integer locateType; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + @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") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + @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") private String zoneNo; @Column(name = "FURNITURE_NO") @ApiParam(value = "家具代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String furnitureNo; @Column(name = "X") @ApiParam(value = "X", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer x; @Column(name = "Y") @ApiParam(value = "Y", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer y; @Column(name = "Z") @ApiParam(value = "Z", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer z; @Column(name = "LC_LENGTH") @ApiParam(value = "长") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcLength; @Column(name = "LC_WIDTH") @ApiParam(value = "宽") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcWidth; @Column(name = "LC_HEIGHT") @ApiParam(value = "高") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcHeight; @Column(name = "SEQ") @ApiParam(value = "序号", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq; @Column(name = "STATUS") @ApiParam(value = "库位状态", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "LOCATE_STATUS") private Integer status; @Column(name = "MAX_PACKAGE_QTY") @ApiParam(value = "最大包装数量", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer maxPackageQty; @Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大零件数量", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double maxPartQty; @Column(name = "STOCK_UNIT") @ApiParam(value = "存放单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockUnit; @Column(name = "LINE_CODE") @ApiParam(value = "生产线") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String lineCode; @Column(name = "BOX_QTY") @ApiParam(value = "箱数", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer boxQty; @Column(name = "PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "零件数", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double partQty; @Column(name = "ENCRYPTION_NO") @ApiParam(value = "加密编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String encryptionNo; @Column(name = "LAST_CS_TIME") @ApiParam(value = "末次盘点时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastCsTime; @Column(name = "POSITION") @ApiParam(value = "三维位置") private String position; + /** + * BH库位类型:10:HOLD库位；20：待检测库位；30:待出库库位 + */ + @Column(name = "BH_LOCATE_TYPE") + @ApiParam(value = "BH库位类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_LOCATE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description") + private Integer bhLocateType; + + @Column(name = "DOWN_X") + @ApiParam(value = "X向下偏移", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") + private Integer downX; + + @Column(name = "UP_X") + @ApiParam(value = "X向上偏移", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") + private Integer upX; + + @Column(name = "DOWN_Y") + @ApiParam(value = "Y向下偏移", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") + private Integer downY; + + @Column(name = "UP_Y") + @ApiParam(value = "Y向上偏移", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") + private Integer upY; + // 导入用 @ApiParam(value = "工厂") @Transient @@ -163,6 +196,10 @@ public class WmsLocate extends BaseBean { private Integer destBoxQty; @Transient + @ApiParam(value = "库位利用率") + public Integer proportion; + + @Transient @ApiParam(value = "错误信息", example = "-1") private String errorMsg; @@ -186,6 +223,14 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "库龄") private String age; + @Transient + @ApiParam(value = "库位箱数") + private Long qty; + + @Transient + @ApiParam(value = "不等于库位类型") + private Integer notLocateType; + public WmsLocate() { } @@ -236,6 +281,12 @@ public class WmsLocate extends BaseBean { this.z=z; } + public WmsLocate(Long qty, Integer status, String zoneNo) { + this.qty = qty; + this.status = status; + this.zoneNo = zoneNo; + } + public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); } 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 c4b5956..47d5248 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 @@ -1,6 +1,8 @@ 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; @@ -32,38 +34,53 @@ public class WmsLocatePart extends BaseBean { private static final long serialVersionUID = 9134745988014340144L; @Column(name = "LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, 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 partNo; @Column(name = "PART_NAME_RDD") @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 = "partName") private String partNameRdd; @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double pullQty; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "IS_GENERATE_PICKLIST") @ApiParam(value = "是否生成领料单", example = "2") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isGeneratePicklist; @Column(name = "SAFETY_STOCK", columnDefinition = "decimal(18,8)") @ApiParam(value = "安全库存", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double safetyStock; @Column(name = "MOQ", columnDefinition = "decimal(18,8)") @ApiParam(value = "起订量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double moq; @Transient 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 new file mode 100644 index 0000000..0f53480 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java @@ -0,0 +1,90 @@ +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 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 :QianHuaSheng + * @CreateDate : 2020-05-15 3:18 下午 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流费用记录") +public class WmsLogisticExpenseRecords extends BaseBean { + private static final long serialVersionUID = 6512855224667052310L; + + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + @Column(name = "ORDER_NO") + @ApiParam("单据号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String orderNo; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + public Integer busiType; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") + private Integer transportType; + + @Column(name = "sum") + @ApiParam(value = "总运输费用") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double sum; + + @Column(name = "LOGISTICS_VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String logisticsVendorNo; + + @Transient + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class) + public Integer orderStatus; + + public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) { +// this.organizeName = docMovementMaster.getorganizeName; + this.orderNo = docMovementMaster.getOrderNo(); + this.organizeCode = docMovementMaster.getOrganizeCode(); + this.shippingFlag = docMovementMaster.getFlagNo(); + this.busiType = docMovementMaster.getBusiType(); + this.transportType = docMovementMaster.getTransportType(); + this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo(); + } + + public WmsLogisticExpenseRecords() { + } +} 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 new file mode 100644 index 0000000..711686f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java @@ -0,0 +1,94 @@ +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 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 :QianHuaSheng + * @CreateDate : 2020-05-15 3:18 下午 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS_DETAILS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流费用记录明细") +public class WmsLogisticExpenseRecordsDetails extends BaseBean { + + private static final long serialVersionUID = -6839107270239441520L; + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + @Column(name = "ORDER_NO") + @ApiParam("单据号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partName; + + @Column(name = "PART_UNIT") + @ApiParam(value = "物料单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partUnit; + + @Column(name = "unit") + @ApiParam(value = "计量单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + private String unit; + + @Column(name = "QTY") + @ApiParam(value = "数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double qty; + + @Column(name = "COST") + @ApiParam(value = "总运输费用") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double cost; + + @Column(name = "START_TIME") + @ApiParam(value = "开始时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String startTime; + + @Column(name = "END_TIME") + @ApiParam(value = "结束时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String endTime; + + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; +} 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 new file mode 100644 index 0000000..acc1cb6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java @@ -0,0 +1,87 @@ +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 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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_LOGISTICS_COSTS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@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 = "PLACE_OF_ORIGIN") + @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 = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; + + @Column(name = "LOGISTICS_VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String logisticsVendorNo; + + @Column(name = "SALES_UNIT") + @ApiParam(value = "计价单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String salesUnit; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") + @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) + private Integer transportType; + + @Column(name = "price") + @ApiParam(value = "单价") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double price; + + @Column(name = "START_DATE") + @ApiParam(value = "生效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String startDate; + + @Column(name = "END_DATE") + @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 new file mode 100644 index 0000000..c641bc9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java @@ -0,0 +1,151 @@ +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 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 :QianHuaSheng + * @CreateDate : 2020-05-14 11:41 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_LOGISTICS_FREIGHT_APPROVAL") +@Api("物流运费审批") +public class WmsLogisticsFreightApproval extends BaseBean { + private static final long serialVersionUID = -1385266737512278984L; + + @Column(name = "ORDER_NO") + @ApiParam("单据号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String orderNo; + + @Column(name = "BUSI_TYPE") + @ApiParam("单据类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class) + private Integer busiType; + + @Column(name = "APPROVAL_STATUS") + @ApiParam("审批状态") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "APPROVAL_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.APPROVAL_STATUS.class) + private Integer approvalStatus; + + @Column(name = "SUPPLY_WAREHOUSE") + @ApiParam("供货仓库") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String supplyWarehouse; + + @Column(name = "DEMAND_WAREHOUSE") + @ApiParam("需求仓库") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String demandWarehouse; + + @Column(name = "CUST_NO") + @ApiParam("客户代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String custNo; + + @Column(name = "LOGISTICS_VENDOR_NO") + @ApiParam("物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String logisticsVendorNo; + + @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_CODE") + @ApiParam(value = "客户发出地代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String placeOfOriginCode; + + @Column(name = "PLACE_OF_ORIGIN_DESC") + @ApiParam(value = "客户发出地描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String placeOfOriginDesc; + + @Column(name = "CUST_DELIVERY_CODE") + @ApiParam(value = "客户发往地代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String custDeliveryCode; + + @Column(name = "CUST_DELIVERY_DESC") + @ApiParam(value = "客户发往地描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String custDeliveryDesc; + + @Column(name = "is_urgent") + @ApiParam(value = "是否紧急") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer isUrgent; + + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String assignSrcWhNo; + + @Column(name = "REMAKE") + @ApiParam("备注") + public String remake; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String assignDestWhNo; + + @Column(name = "FLAG_NO") + @ApiParam(value = "客户发往地编号") + private String flagNo; + + //正常运输 和非正常运输 + @Column(name = "BUSINESS_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") + @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) + private Integer businessType; + + public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) { + this.orderNo = docMovementMaster.getOrderNo(); + this.organizeCode = docMovementMaster.getOrganizeCode(); + this.busiType = docMovementMaster.getBusiType(); + this.organizeCode = docMovementMaster.getOrganizeCode(); + this.approvalStatus = WmsEnumUtil.APPROVAL_STATUS.APPROVE_PROCESSING.getValue(); + this.supplyWarehouse = docMovementMaster.getAssignSrcWhNo(); + this.demandWarehouse = docMovementMaster.getAssignDestWhNo(); + this.custNo = docMovementMaster.getCustNo(); + this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo(); + this.transportType = docMovementMaster.getTransportType(); + this.placeOfOriginCode = docMovementMaster.getFlagNo(); + this.custDeliveryCode = docMovementMaster.getAssignSrcWhNo(); + this.isUrgent = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + this.assignSrcWhNo = docMovementMaster.getAssignSrcWhNo(); + this.assignDestWhNo = docMovementMaster.getAssignDestWhNo(); + this.flagNo = docMovementMaster.getFlagNo(); + this.businessType = docMovementMaster.getBusinessType(); + } + + public WmsLogisticsFreightApproval() { + + } +} 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 new file mode 100644 index 0000000..6ef36b6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java @@ -0,0 +1,59 @@ +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.Table; + +/** + * @Description : 运输方式 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_MODE_TRANSPORT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "运输方式", description = "运输方式") +public class WmsModeTransport extends BaseBean { + + private static final long serialVersionUID = 2323715097364547677L; + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @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") + private String transportType; + + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "序号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serialNumber; + + @Column(name = "remake") + @ApiParam(value = "说明") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String remake; + +} 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 e9f1cd8..4e5da1c 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 @@ -1,16 +1,24 @@ 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 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; /** * @Description : 库存移动单明细信息 @@ -36,38 +44,58 @@ public class WmsMoveDetails extends BaseBean { private static final long serialVersionUID = -5898637337319011710L; @Column(name = "ORDER_NO") @ApiParam("单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String orderNo; @Column(name = "ITEM") @ApiParam(value = "行号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Integer item; @Column(name = "PART_NO") @ApiParam("物料编码") + @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") public String partNo; @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") + @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 = "partName") public String partNameRdd; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "CUST_NO") @ApiParam("客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") public String custNo; - @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "处理数量", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double transQty; - @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)") + @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 = "REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "不合格处理数量", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double rejectQty; public Double getRejectQty() { @@ -76,42 +104,63 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "UNIT") @ApiParam("单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String unit; @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") 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") 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") 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") 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") 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") public String destLocateNo; /** - * 状态:1=创建,10=待处理,20=已处理 + * 状态:10:创建,20:待处理,30:已处理,40:处理出错 */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "0") @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_STATUS") public Integer itemStatus; @Column(name = "REF_ITEM") @ApiParam("关联单据行号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refItem; /** @@ -119,16 +168,24 @@ public class WmsMoveDetails extends BaseBean { */ @Column(name = "REF_TYPE") @ApiParam("关联单据类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE") public String refType; @Column(name = "REF_SRC") @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; @Column(name = "GROUP_NO") @ApiParam("分组号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String groupNo; + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomVersion; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; @@ -196,8 +253,13 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "CONSIGNATION") @ApiParam("是否寄售 1-是 2-否") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer consignation = 2; + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } 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 ec13c1e..0c358df 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 @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import 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; @@ -11,7 +10,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.Index; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单主表信息 @@ -68,6 +72,10 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "车牌号") private String carNo; + @Column(name = "DRIVER_NO") + @ApiParam("司机") + public String driverNo; + @Column(name = "BUSI_TYPE_CODE") @ApiParam(value = "业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") @@ -225,12 +233,60 @@ 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) { + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + 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; + this.refSrc = refSrc; + } + public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ this.itemQty = itemQty; this.transTypeCode = transTypeCode; this.orderStatus = orderStatus; } + + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, + Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String remark, + String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId + ) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.remark = remark; + this.isUrgent = isUrgent; + this.transTypeCode = transTypeCode; + this.errorMessage = errorMessage; + this.busiTypeCode = busiTypeCode; + this.refOrderNo = refOrderNo; + this.carNo = carNo; + this.organizeCode = organizeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + this.fixId = fixId; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } 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 4581410..40da59c 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 @@ -11,7 +11,12 @@ 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; /** * @Description : 库存移动单条码信息 @@ -76,6 +81,7 @@ public class WmsMoveSn extends BaseBean { @ApiParam("备注") public String remark; + @Column(name = "LOT_NO") @ApiParam("批次编号") public String lotNo; @@ -84,7 +90,7 @@ public class WmsMoveSn extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -121,12 +127,12 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; - @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -163,6 +169,14 @@ public class WmsMoveSn extends BaseBean { @ApiParam("供应商编号") private String vendorNo; + @Column(name = "srcSn") + @ApiParam("原条码") + private String srcSn; + + @Column(name = "SERIAl_SN") + @ApiParam("产品条码") + public String serialSn; + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") @@ -200,6 +214,54 @@ public class WmsMoveSn extends BaseBean { @ApiParam("是否寄售 1-是 2-否") private Integer consignation; + @Transient + @ApiParam("收货物料编码") + public String rcPartNo; + + @Transient + @ApiParam("发运物料编码") + public String outPartNo; + + @Transient + @ApiParam("发运单据") + public String outRefSrc; + + @Transient + @ApiParam("收货单据") + public String rcRefSrc; + + @Transient + @ApiParam("发运条码") + public String outSn; + + @Transient + @ApiParam("收货条码") + public String rcSn; + + @Transient + @ApiParam("发运单位") + public String outUnit; + + @Transient + @ApiParam("收货单位") + public String rcUnit; + + @Transient + @ApiParam("发运数量") + public Double outQty; + + @Transient + @ApiParam("收货数量") + public Double rcQty; + + @Transient + @ApiParam("委外发运时间") + public String outDatetime; + + @Transient + @ApiParam("委外收货时间") + public String rcDatetime; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -281,4 +343,35 @@ public class WmsMoveSn extends BaseBean { 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; + this.vendorNo = vendorNo; + this.rcPartNo = rcPartNo; + this.outPartNo = outPartNo; + this.destQty = destQty; + } + + public WmsMoveSn(Long id,String organizeCode,String outRefSrc,String rcRefSrc,String outSn,String rcSn, + String outPartNo,String rcPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty, + String outDatetime,String rcDatetime ,String vendorNo, String modifyUser,String modifyDatetime) { + this.id = id; + this.organizeCode = organizeCode; + this.outRefSrc = outRefSrc; + this.rcRefSrc = rcRefSrc; + this.outSn = outSn; + this.rcSn = rcSn; + this.outPartNo = outPartNo; + this.rcPartNo = rcPartNo; + this.outUnit = outUnit; + this.rcUnit = rcUnit; + this.outQty = outQty; + this.rcQty = rcQty; + this.outDatetime = outDatetime; + this.rcDatetime = rcDatetime; + this.vendorNo = vendorNo; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } } 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 2833b2f..5b06475 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 @@ -6,10 +6,15 @@ 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 javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单处理成功后的记录，通过监听交易成功队列写入 @@ -65,6 +70,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "车牌号") private String carNo; + @Column(name = "DRIVER_NO") + @ApiParam("司机") + public String driverNo; + @Column(name="ITEM") @ApiParam(value = "行号") public String item; @@ -85,12 +94,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "处理数量", example = "0") + @ColumnDefault("0") public Double transQty; - @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "不合格处理数量", example = "0") + @ColumnDefault("0") public Double rejectQty; @Column(name="UNIT") @@ -143,8 +154,9 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单位") public String refUnit; - @Column(name="REF_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REF_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam("关联数量") + @ColumnDefault("0") public Double refQty; @Column(name = "SRC_AREA_NO") @@ -183,6 +195,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("是否预收货") public Integer priorRC = 2; + @Column(name = "ERP_SRC_NO") + @ApiParam(value = "ERP单号") + private String erpSrcNo; + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") @ApiParam(value = "QAD发运单据类型") @@ -196,6 +212,23 @@ public class WmsMoveToERP extends BaseBean { @Transient private Long finishedCounts; + @Column(name = "POD_DIR") + @ApiParam(value = "方向") + private Integer podDir; + + + @Column(name = "COST_CENTER") + @ApiParam(value = "成本中心") + private String costCenter; + + @Column(name = "SECONDARY_REMAKE") + @ApiParam(value = "备注2") + private String secondaryRemake; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + @Transient private Long shippingId; 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 681ae56..485ce2e 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 @@ -10,7 +10,11 @@ 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; import java.util.List; /** @@ -157,12 +161,60 @@ public class WmsPOMaster extends BaseBean { private String planDateEnd; @Transient + @ApiParam("计划日期") + private String planDate; + + @Transient + @ApiParam("计划时间") + private String planTime; + + @Transient + @ApiParam("看板状态") + private Integer boardStatus; + + @Transient private List orderNoList; - @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") + @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @ApiParam("道口") public String dock; + @ApiParam("泊位") + @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''") + public String zdoc; + + @ApiParam("发运单号") + @Column(name = "SHIPMENT_NOTE_NUMBER") + public String shipmentNoteNumber; + + @ApiParam("erp单号") + @Column(name = "ERP_SRC_NO") + private String erpSrcNo; + + public WmsPOMaster() { + + } + + public WmsPOMaster(String orderNo, Integer poStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.organizeCode = organizeCode; + this.vendorNo = vendorNo; + this.dock = dockCode; + this.zdoc = zdoc; + 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 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 529c486..9cc690d 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 @@ -39,7 +39,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("物料编码") private String partNo; - @Column(name = "BOX_QTY") + @Column(name = "BOX_QTY", nullable = false) @ColumnDefault("0") @ApiParam(value = "箱数", example = "0") private Integer boxQty; @@ -52,7 +52,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("行号") private Integer item; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") private Double qty; @@ -69,28 +69,28 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("订单号") private String orderNo; - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", 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)") + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") private Double rcQty = 0d; //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } - @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") private Double passQty; //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; } - @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") private Double ngQty; @@ -128,6 +128,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "是否免费", example = "1") private Integer isFree; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient @ApiParam(value = "散件收货输入数量", example = "0") private Double inputRcQty; @@ -163,6 +167,29 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("集装箱号") private String containerNo; + + @Transient + @ApiParam("采购订单状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description") + private Integer purchaseItemStatus; + + @Transient + @ApiParam("供应商") + private String vendorNo; + + @Transient + @ApiParam("供应商名称") + private String vendorName; + + @Transient + @ApiParam("开始时间") + private String planStratDate; + + @Transient + @ApiParam("结束时间") + private String planEndDate; + + public Double getSnpVal() { return snp; } @@ -185,4 +212,48 @@ public class WmsPOMasterDetails extends BaseBean { this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; } + + public WmsPOMasterDetails( + String organizeCode, + String orderNo, + Integer purchaseItemStatus, + String planDate, + String planTime, + String partNo, + String partNameRdd, + Double qty, + Double rcQty, + String vendorNo, + String createUser, + String createDatetime, + String modifyUser, + String modifyDatetime, + String remark + ){ + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.purchaseItemStatus = purchaseItemStatus; + this.planDate = planDate; + this.planTime = planTime; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.rcQty = rcQty; + this.vendorNo = vendorNo; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + 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; + } } 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 22dc007..98f1b1b 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 @@ -5,6 +5,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; @@ -41,12 +42,14 @@ public class WmsPackSn extends BaseBean { @ApiParam(value = "物料名称") private String partNameAdd; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam("数量") + @ColumnDefault("0") private Double qty; - @Column(name = "SID", columnDefinition = "decimal(18,8)") + @Column(name = "SID", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam("SID") + @ColumnDefault("0") private Double sId; @Column(name = "COMMIT_DATE") 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 189a4f6..8b08f24 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 @@ -1,6 +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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +38,7 @@ public class WmsPackage extends BaseBean { public String packageNo; @Column(name="PACKAGE_TYPE_ID") + @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class) @ApiParam(value = "包装类型", example = "1") public Integer packTypeId; @@ -55,6 +60,7 @@ public class WmsPackage extends BaseBean { @Column(name="PRINT_STATUS") @ApiParam(value = "打印状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class) public Integer printStatus; @Column(name="PACK_LEVEL") @@ -64,4 +70,9 @@ public class WmsPackage extends BaseBean { @Column(name="MEMO") @ApiParam(value = "备注") public String memo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String locateNo; } 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 71eb010..1d9ed2e 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 @@ -1,6 +1,8 @@ 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; @@ -11,14 +13,13 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** - * @Description :容器类型 + * @Description :包装规格 * @Reference : - * @Author : 容器类型 + * @Author : * @CreateDate : 2019-11-07 16:06 - * @Modify: + * @Modify: 2020-04-27 修改头部描述-dragon **/ @Data @Entity @@ -30,34 +31,49 @@ import javax.persistence.Transient; public class WmsPackageSpec extends BaseBean { private static final long serialVersionUID = 4849044986767609445L; @ApiParam(value = "包装规格代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String specCode; @Column(name = "SPEC_NAME") @ApiParam(value = "包装规格名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String specName; @Column(name = "QTY") @ApiParam(value = "包装数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qty; @Column(name = "PARENT_SPEC") @ApiParam(value = "上级规格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/base-data/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode") private String parentSpec; @Column(name = "SPEC_LEVEL") @ApiParam(value = "规格层级") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SPEC_LEVEL") private Integer specLevel; @Column(name = "IS_MIXED") @ApiParam(value = "是否混包") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isMixed; @Column(name = "POCKET_TYPE") @ApiParam(value = "容器类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/wms/base-data/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode") private String pocketType; @ApiParam(value = "上级规格名称") - @Transient + @Column(name = "PARENT_NAME") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/base-data/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName") private String parentName; + + @Column(name = "DIRECTION") + @ApiParam(value = "方向") + private Integer direction; } 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 e8ae08b..d0c88bb 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 @@ -3,6 +3,7 @@ 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; @@ -12,7 +13,11 @@ 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 :物料实体 @@ -32,239 +37,260 @@ import javax.persistence.*; @Api("物料表") public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; + @Column(name = "PART_NO") @ApiParam(value = "物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; - @Column(name = "PART_SPEC") - @ApiParam(value = "物料规格") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - private String partSpec; + @Column(name = "PART_TYPE_DESC") + @ApiParam(value = "物料类型描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partTypeDesc; @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_PART_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class) private String partType; - @Column(name = "PART_TYPE_DESC") - @ApiParam(value = "物料类型描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) - private String partTypeDesc; + @Column(name = "STOCK_UNIT") + @ApiParam(value = "库存单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + private String stockUnit; + + @Column(name = "IN_LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + private String inLocateNo; + + @Column(name = "SNP", columnDefinition = "decimal(18,8)") + @ApiParam(value = "标包", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double snp; + + @ColumnDefault("2") + @Column(name = "IQC") + @ApiParam(value = "是否免检", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") + private Integer iqc; + + @Column(name = "PART_SPEC") + @ApiParam(value = "物料规格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partSpec; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String color; - @Column(name = "STOCK_UNIT") - @ApiParam(value = "库存单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") - private String stockUnit; - @Column(name = "ABC") @ApiParam(value = "分类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double pu2su; - @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam(value = "标包", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double snp; - - @ColumnDefault("2") - @Column(name = "IQC") - @ApiParam(value = "是否免检", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") - private Integer iqc; - @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + @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") private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String lotCheckRule; @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer snControl; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorNo; - @Column(name = "IN_LOCATE_NO") - @ApiParam(value = "默认入库库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") - private String inLocateNo; - @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; + @Column(name = "PART_VOL", columnDefinition = "decimal(18,8)") + @ApiParam(value = "体积", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double partVol; + @Transient @ApiParam("总数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; @Column(name = "verb_num") @ApiParam(value = "单次拆包数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double verbNum; @Column(name = "IS_PROD_LOT") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM, - isRequire = 2, entityName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, isRequire = 2, dataSrc = "PULL_WAY_STATUS") @ApiParam(value = "拉动方式") private String pullWay; @Column(name = "TAIL_QTY_MODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") @ApiParam(value = "尾数计算方式", example = "1") private Integer tailQtyMode; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double cycleRquestQty = 0d; @Column(name = "CURING_TIME") @ApiParam(value = "固化时间", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; + @Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否回收", example = "2") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) + public Integer isRecycle; + + + @Column(name = "FREQUENCY") + @ApiParam(value = "频次", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FREQUENCY") + @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true) + private Integer frequency; + + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); } @@ -276,6 +302,11 @@ public class WmsPart extends BaseBean { public WmsPart() { } + public Double getPartVol() { + return partVol == null ? 0 : partVol; + } + + public Double getQty() { return qty == null ? 0 : qty; } @@ -305,4 +336,10 @@ public class WmsPart extends BaseBean { this.qty = cqty; this.partType = partType; } + + public WmsPart(String partGroup, Double cqty, String createDateTime) { + this.partGroup = partGroup; + this.qty = cqty; + this.createDatetime = createDateTime; + } } 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 new file mode 100644 index 0000000..57acbe8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.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.Table; + +/** + * @Description : 物料检测大类 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_CHECK_TYPE") +@Api("物料检测大类") +public class WmsPartCheckType extends BaseBean { + + private static final long serialVersionUID = -5189386821943180930L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partName; + + @Column(name = "CHECK_TYPE_CODE") + @ApiParam("检测大类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + public String checkTypeCode; + + @Column(name = "SAMPLE_SIZE") + @ApiParam("样本数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer sampleSize; +} 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 new file mode 100644 index 0000000..aa6cdcf --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -0,0 +1,160 @@ +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.Index; +import javax.persistence.Table; + +/** + * @Description :物料扩展属性 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-07 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_EXTEND", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) +@Api("物料扩展属性表") +public class WmsPartExtend extends BaseBean { + + private static final long serialVersionUID = 353287580297379377L; + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "IS_SETTLE") + @ApiParam(value = "是否内部交易") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer isSettle; + + @Column(name = "SETTLE_FACTORY_CODE") + @ApiParam(value = "结算工厂") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String settleFactoryCode; + + @Column(name = "SETTLE_REC_ERP_WH") + @ApiParam(value = "结算物料收货库存") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String settleRecErpWh; + + @Column(name = "VALUATION_CLASS") + @ApiParam(value = "评估类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String valuationClass; + + @Column(name = "VALUATION_CLASS_NAME") + @ApiParam(value = "评估类描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String valuationClassName; + + @Column(name = "MC_CODE") + @ApiParam(value = "MRP控制者") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String mcCode; + + @Column(name = "MC_NAME") + @ApiParam(value = "MRP控制者名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String mcName; + + @Column(name = "IS_STEEL") + @ApiParam(value = "是否为钢卷料") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_STEEL_TYPE") + private Integer isSteel; + + @Column(name = "IS_PACKAGE_MATERIAL") + @ApiParam(value = "是否为包材") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer isPackageMaterial; + + @Column(name = "RECEIVING_TYPE") + @ApiParam(value = "收货类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String receivingType; + + @Column(name = "LOT_CONTROL") + @ApiParam(value = "批次控制") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lotControl; + + @Column(name = "RANGE_LOT") + @ApiParam(value = "批次容差") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer rangeLot; + + @Column(name = "QUALITY_RATE") + @ApiParam(value = "质检率") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double qualityRate; + + @Column(name = "ROUTING") + @ApiParam(value = "工艺") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String routing; + + @Column(name = "PO_PART_MULTIPLE") + @ApiParam(value = "乘倍包装") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String poPartMultiple; + + @Column(name = "RANGE_QTY_RATE") + @ApiParam(value = "数量容差") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer rangeQtyRate; + + @Column(name = "RANGE_INVENTORY") + @ApiParam(value = "盘点容差") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer rangeInventory; + + @Column(name = "PROD_LINE") + @ApiParam(value = "产品类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String prodLine; + + @Column(name = "SUPPLY_TYPE") + @ApiParam(value = "供货类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_SUPPLY_TYPE") + private Integer supplyType; + + @Column(name = "RECEIVING_MODE") + @ApiParam(value = "收货方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_RECEIVING_METHOD") + private Integer receivingMethod; + + @Column(name = "PRE_RECEIVING_DAY") + @ApiParam(value = "预收货天数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer preReceivingDay; + + @Column(name = "IS_WAY_CALCULATION") + @ApiParam(value = "是否计算在途库存") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer isWayCalculation; + + @Column(name = "IS_AUTO_PURCHASE") + @ApiParam(value = "是否自动采购") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer isAutoPurchase; + + @Column(name = "AUTO_PURCHASE_QTY") + @ApiParam(value = "自动采购数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer autoPurchaseQty; +} 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 9641130..5265509 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 @@ -1,6 +1,8 @@ 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; @@ -31,9 +33,11 @@ public class WmsPartGroup extends BaseBean{ private static final long serialVersionUID = 9214639813072864436L; @Column(name="PART_GROUP_NO") @ApiParam("物料组编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partGroupNo; @Column(name="PART_GROUP_NAME") @ApiParam("物料组名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partGroupName; } \ No newline at end of file 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 new file mode 100644 index 0000000..b6099d9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -0,0 +1,78 @@ +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.Table; + +/** + * @Description : 物料子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_ITEM_CHECK") +@Api("物料子检测项") +public class WmsPartItemCheck extends BaseBean { + + private static final long serialVersionUID = 2889708862689686630L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partNo; + + @Column(name = "CHECK_TYPE_CODE") + @ApiParam("检测大类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + public String checkTypeCode; + + @Column(name = "CHECK_ITEM_CODE") + @ApiParam("子检测项代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemCode; + + @Column(name = "CHECK_ITEM_NAME") + @ApiParam("子检测项名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemName; + + @Column(name = "VALUE_TYPE") + @ApiParam("子检测箱值类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") + private Integer valueType; + + @Column(name = "STANDARD") + @ApiParam("标准值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD") + private Integer standard; + + @Column(name = "MAX") + @ApiParam("最大值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double max; + + @Column(name = "MIN") + @ApiParam("最小值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double min; +} 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 e7dc3ca..2896d6e 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 @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,11 +14,11 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :容器类型 + * @Description :物料包装关系 * @Reference : - * @Author : 容器类型 + * @Author : * @CreateDate : 2019-11-07 16:06 - * @Modify: + * @Modify: 2020-04-27 修改头部描述-dragon **/ @Data @Entity 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 1d29b77..1a083df 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="物料关系表",description = "物料关系表") public class WmsPartRelation extends BaseBean { + private static final long serialVersionUID = -3532040201124896970L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; 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 69e19ef..236cf72 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 @@ -6,6 +6,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; @@ -46,8 +47,9 @@ public class WmsPickCount extends BaseBean { @ApiParam(value = "物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", nullable = false) @ApiParam(value = "数量") + @ColumnDefault("0") private Double qty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java index 3cc6419..d85b01d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java @@ -56,5 +56,7 @@ public class WmsPickingMovement extends BaseBean { @AnnoOutputColumn private String planTime; - + @ApiParam(value = "ERP单号") + @AnnoOutputColumn + private String erpSrcNo; } 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 6c78826..63e1e37 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 @@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -70,6 +70,7 @@ public class WmsPoSn extends BaseBean { /** * 质量:10-合格 20-不合格 30-隔离 40-报废 */ + @Column(name="QC_STATUS") @ApiParam(value = "质量状态", example = "10") public Integer qcStatus; @@ -89,7 +90,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("组条码") public String groupNo; - @Column(name="REC_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double recQty; @@ -150,6 +151,11 @@ public class WmsPoSn extends BaseBean { @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; + @Transient + @ApiParam(value = "生产批次") + private String leftCode = ""; + + public WmsPoSn(){} public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ 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 34ecff1..e7c329b 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("开口合同PO关系表") public class WmsProcurementPlanContract extends BaseBean { + private static final long serialVersionUID = 3966394697226562966L; @Column(name = "ORDER_NO") @ApiParam(value = "合同号") private String orderNo; 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 4539336..a90107b 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 @@ -1,6 +1,8 @@ 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; @@ -31,10 +33,12 @@ public class WmsProdCfgType extends BaseBean { private static final long serialVersionUID = -131043081244530896L; @Column(name="PROD_CFG_TYPE_CODE") @ApiParam("项目代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String prodCfgTypeCode; @Column(name="PROD_CFG_TYPE_NAME") @ApiParam("项目名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String prodCfgTypeName; } 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 f6db3d7..e415a70 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -20,6 +19,7 @@ import java.io.Serializable; @Api(value="生产退料导入模板",description = "生产退料导入模板") public class WmsProductReturnMovement implements Serializable{ + private static final long serialVersionUID = -4099139082544312496L; @ApiParam(value = "单号") @AnnoOutputColumn private String orderNo; 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 new file mode 100644 index 0000000..fefe223 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java @@ -0,0 +1,59 @@ +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.Table; + +/** + * @Description : 物流供应商 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_PROVIDER_FLAG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流供应商关系", description = "库存物流供应商关系条码信息") +public class WmsProviderFlag extends BaseBean { + + private static final long serialVersionUID = -4732299479463118555L; + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + + @Column(name = "VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "物流供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String vendorName; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; + + @Column(name = "SHIPPING_FLAG_NAME") + @ApiParam(value = "发往地编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlagName; +} 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 90b3a58..ed602bf 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -29,23 +28,24 @@ import javax.persistence.Table; @Table(name = "WMS_PULL_RULE") @Api("拉动规则") public class WmsPullRule extends BaseBean { + private static final long serialVersionUID = -4259512587710548316L; @Column(name = "PULL_WAY") @ApiParam(value = "拉动类型", example = "10") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS") private Integer pullWay; @Column(name = "CONTAIN_UNFINISH_ORDER") @ApiParam(value = "考虑未完成的移库单", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer containUnfinishOrder; @Column(name = "CONTAIN_EXIST_PERIOD") @ApiParam(value = "考虑现有库存", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer containExistStock; @Column(name = "TAIL_QTY_MODE") @ApiParam(value = "尾数计算方式", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") private Integer tailQtyMode; } 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 4eaabf1..eccb351 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 @@ -5,6 +5,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; @@ -46,8 +47,9 @@ public class WmsPullTaskDetails extends BaseBean{ @ApiParam("库位代码") private String locateNo; - @Column(name="LOCATE_CAPACITY") + @Column(name="LOCATE_CAPACITY", nullable = false) @ApiParam(value = "库位容量", example = "0") + @ColumnDefault("0") private Integer locateCapacity = 0; @Column(name="PART_NO") @@ -58,52 +60,63 @@ public class WmsPullTaskDetails extends BaseBean{ @ApiParam("零件名称") private String partNameRdd; - @Column(name="PLAN_PACK_QTY") + @Column(name="PLAN_PACK_QTY", nullable = false) @ApiParam(value = "计划数量", example = "0d") + @ColumnDefault("0") private Double planPackQty = 0d; - @Column(name="PLAN_PACK_COUNT") + @Column(name="PLAN_PACK_COUNT", nullable = false) @ApiParam(value = "计划容器数", example = "0d") + @ColumnDefault("0") private Double planPackCount = 0d; - @Column(name="FIRST_BATCH_QTY") + @Column(name="FIRST_BATCH_QTY", nullable = false) @ApiParam(value = "首批批量", example = "0d") + @ColumnDefault("0") private Double firstBatchQty = 0d; - @Column(name="FIRST_PACK_COUNT") + @Column(name="FIRST_PACK_COUNT", nullable = false) @ApiParam(value = "首批容器数", example = "0d") + @ColumnDefault("0") private Double firstPackCount = 0d; - @Column(name="REQUEST_QTY") + @Column(name="REQUEST_QTY", nullable = false) @ApiParam(value = "补货批量", example = "0d") + @ColumnDefault("0") private Double requestQty = 0d; - @Column(name="REQUEST_PACK_COUNT") + @Column(name="REQUEST_PACK_COUNT", nullable = false) @ApiParam(value = "补货容器数", example = "0d") + @ColumnDefault("0") private Double requestPackCount = 0d; - @Column(name="REQUEST_LOT_NO") + @Column(name="REQUEST_LOT_NO", nullable = false) @ApiParam(value = "补货批次", example = "0d") + @ColumnDefault("0") private Double requestLotNo = 0d; - @Column(name="REQUEST_TOTAL_COUNT") + @Column(name="REQUEST_TOTAL_COUNT", nullable = false) @ApiParam(value = "补货累加次数", example = "0d") + @ColumnDefault("0") private Double requestTotalCount = 0d; @Column(name="LAST_REQUEST_TIME") @ApiParam("上一次补货时间") private String lastRequestTtime; - @Column(name="BOOT_QTY") + @Column(name="BOOT_QTY", nullable = false) @ApiParam(value = "尾箱批量", example = "0d") + @ColumnDefault("0") private Double bootQty = 0d; - @Column(name="BOOT_PACK_COUNT") + @Column(name="BOOT_PACK_COUNT", nullable = false) @ApiParam(value = "尾箱容器数", example = "0d") + @ColumnDefault("0") private Double bootPackCount = 0d; - @Column(name="BOOT_LOT_NO") + @Column(name="BOOT_LOT_NO", nullable = false) @ApiParam(value = "尾箱批次", example = "0d") + @ColumnDefault("0") private Double bootLotNo = 0d; @Column(name="ORDER_STATUS") 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 aa9559c..00fa875 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 @@ -1,6 +1,8 @@ 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; @@ -32,42 +34,56 @@ public class WmsPullTaskMaster extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String woekorderNo; @Column(name="PDLINE_NO") @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 = "workCenterCode") private String pdlineNo; @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String planProductTime; @Column(name="SHIFT_NO") @ApiParam("班次代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shitNo; @Column(name="START_PRODUCT_TIME") @ApiParam("开始生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startProductTime; @Column(name="END_PRODUCT_TIME") @ApiParam("结束生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endProductTime; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_MASTER_STATUS") private Integer orderStatus = 0; @Column(name="IS_SUSPEND") @ApiParam(value = "是否暂停", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isSuspend = 2; @Column(name="PULL_TASK_TYPE") @ApiParam(value = "拉动任务类型", example = "10") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_TYPE") private Integer pullTaskType; @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer seq; public Integer getOrderStatus() { 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 new file mode 100644 index 0000000..8691970 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java @@ -0,0 +1,62 @@ +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.ApiOperation; +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; + +/** + * @Description : 采购计划历史 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-04-15 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PURCHASE_PLAN_HISTORY") +@Api("采购计划历史") +public class WmsPurchasePlanHistory extends BaseBean { + private static final long serialVersionUID = -8147353212724381079L; + + @Column(name = "ORDER_NO") + @ApiParam("单号") + private String orderNo; + + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @Column(name = "CAR_NO") + @ApiParam("车牌号") + private String carNo; + + @Column(name = "CONTACT") + @ApiParam("联系人") + private String contact; + + @Column(name = "CONTACT_TEL") + @ApiParam("联系电话") + private String contactTel; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + + +} 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 ef75213..f527605 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 @@ -52,12 +52,12 @@ public class WmsPushConfig extends BaseBean{ @Lob @ApiParam("查询Hql") - @Column(name = "HQL_STR") + @Column(name = "HQL_STR", columnDefinition = "TEXT") private String hqlStr; @Lob @ApiParam("查询Sql") - @Column(name = "SQL_STR") + @Column(name = "SQL_STR", columnDefinition = "TEXT") private String sqlStr; @ApiParam("脚本编号") @@ -66,12 +66,12 @@ public class WmsPushConfig extends BaseBean{ @Lob @ApiParam("标题模板") - @Column(name = "TITLE_TEMPLATE") + @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT") private String titleTemplate; @Lob @ApiParam("消息体模板") - @Column(name = "CONTENT_TEMPLATE") + @Column(name = "CONTENT_TEMPLATE", columnDefinition = "TEXT") private String contentTemplate; @ApiParam("推送类型") 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 e10dca9..e22e520 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 @@ -36,7 +36,7 @@ public class WmsPushLog extends BaseBean{ private String pushTitle; @Lob - @Column(name = "PUSH_CONTENT") + @Column(name = "PUSH_CONTENT", columnDefinition = "TEXT") @ApiParam("推送内容") private String pushContent; 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 d0275ca..8d77ca7 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 @@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean { public String remark; - @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "实检数量", example = "0") public Double factQty; - @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "合格数量", example = "0") public Double passQty; - @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; 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 33ed3df..bfe28bc 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 @@ -1,7 +1,9 @@ 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; @@ -34,6 +36,7 @@ public class WmsQCMaster extends BaseBean { private static final long serialVersionUID = 2701710669030092148L; @Column(name = "ORDER_NO") @ApiParam("单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String orderNo; /** @@ -43,6 +46,7 @@ public class WmsQCMaster extends BaseBean { @Column(name = "ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_TYPE") public Integer orderType; /** @@ -51,48 +55,67 @@ public class WmsQCMaster extends BaseBean { @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") public Integer orderStatus; @Column(name = "REMARK") @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String remark; @Column(name = "CUST_NO") @ApiParam("客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") public String custNo; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "VERSION") @ApiParam(value = "版本", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Integer version; @Column(name = "REF_TYPE") @ApiParam("关联单号类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE") public String refType; @Column(name = "REF_SRC") @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; - @Transient + @Column(name = "CUST_NAME") @ApiParam(value = "客户简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo") private String custName; - @Transient - @ApiParam(value = "供应商简称") + @Column(name = "VENDOR_DESC") + @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; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "IS_GENERAL_TASK") public Integer isTask; @Column(name = "IS_PART") @ApiParam(value = "是否散件", example = "2") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") public Integer isPart; @Transient 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 bbc0e78..d02e9b0 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 @@ -6,6 +6,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; @@ -49,12 +50,14 @@ public class WmsQCTrans extends BaseBean { @ApiParam("备注") public String remark; - @Column(name="PASS_QTY") + @Column(name="PASS_QTY", nullable = false) @ApiParam("合格数量") + @ColumnDefault("0") public double passQty; - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", nullable = false) @ApiParam("不合格数量") + @ColumnDefault("0") public double rejectQty; @Column(name="UNIT") 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 new file mode 100644 index 0000000..8efb843 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java @@ -0,0 +1,66 @@ +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 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 : RFID条码操作记录表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-10 14:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_RFID_OPERATE_RECORD") +@Api("RFID条码操作记录表") +public class WmsRfidOperateRecord extends BaseBean { + private static final long serialVersionUID = -2506345764570725810L; + + @Column(name="RFID_SN") + @ApiParam("RFID_条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String rfidSn; + + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.RFID_OPERATE_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "RFID_OPERATE_TYPE") + public Integer operateType; + + @Column(name="SRC_LOCATE") + @ApiParam("源库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String srcLocate; + + @Column(name="DEST_LOCATE") + @ApiParam("目标库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String destLocate; + + @Column(name="SRC_QTY") + @ApiParam("源数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + public Integer srcQty; + + @Column(name="DEST_QTY") + @ApiParam("目标数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + public Integer destQty; +} 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 1ac54c6..67c0edd 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 @@ -1,6 +1,8 @@ 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; @@ -33,26 +35,32 @@ public class WmsRouting extends BaseBean { private static final long serialVersionUID = 7759454799191378612L; @Column(name = "ROUTING_CODE") @ApiParam(value = "线路代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routingCode; @Column(name = "ROUTING_NAME") @ApiParam(value = "线路名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routingName; @Column(name = "ROUTING_DESC") @ApiParam(value = "线路描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String routingDesc; @Column(name = "FOR_PROUCT_CLASS") @ApiParam(value = "适用产品分类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forProductClass; @Column(name = "FOR_WAREHOUSE") @ApiParam(value = "适用仓库", example ="1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forWareHouse; @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forProduct; @Transient 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 25e42ae..4fe577d 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 @@ -5,6 +5,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; @@ -36,20 +37,24 @@ public class WmsRoutingDetail extends BaseBean { @ApiParam(value = "作业步骤") private String opStep; - @Column(name = "OK_SEQ") + @Column(name = "OK_SEQ", nullable = false) @ApiParam(value = "成功跳转序号", example = "1") + @ColumnDefault("0") private Integer okSeq; - @Column(name = "NG_SEQ") + @Column(name = "NG_SEQ", nullable = false) @ApiParam(value = "失败跳转序号", example = "1") + @ColumnDefault("0") private Integer ngSeq; - @Column(name = "SEQ") + @Column(name = "SEQ", nullable = false) @ApiParam(value = "序号", example = "1") + @ColumnDefault("0") private Integer seq; - @Column(name = "PARENT_SEQ") + @Column(name = "PARENT_SEQ", nullable = false) @ApiParam(value = "上级步骤序号", example = "1") + @ColumnDefault("0") private Integer parentSeq; } 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 b7c6c2b..db8be1d 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 @@ -5,6 +5,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; @@ -36,7 +37,8 @@ public class WmsRoutingMaster extends BaseBean { @ApiParam(value = "路线名称") private String routingName; - @Column(name = "SEQ") + @Column(name = "SEQ", nullable = false) @ApiParam(value = "序号", example = "1") + @ColumnDefault("0") private Integer seq; } 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 892ea6e..4bf40f2 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 @@ -13,8 +13,6 @@ 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 :物流线路规则表 @@ -123,6 +121,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目的单据条码状态") private Integer destMoveSnStatus; + @Column(name = "FILTER_SCRIPT_NO", length = 50) + @ApiParam(value = "过滤条件") + private String filterScriptNo; + public WmsRoutingRule(){} } 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 new file mode 100644 index 0000000..8723563 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -0,0 +1,117 @@ +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 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 : puxiao.liao + * @CreateDate : 2020-05-23 11:00 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_SERIAL_SN", indexes = { + @Index(columnList = "BATCH_NO"), + @Index(columnList = "STOCK_SN"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SERIAL_SN") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "产品条码信息", description = "产品条码信息") +public class WmsSerialSn extends BaseBean { + + private static final long serialVersionUID = -2540413299274882785L; + + @Column(name = "BATCH_NO") + @ApiParam(value = "BATCH号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String batchNo; + + @Column(name = "STOCK_SN") + @ApiParam(value = "库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String stockSn; + + @Column(name = "SERIAL_SN") + @ApiParam(value = "产品条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serialSn; + + @Column(name = "SRC_STOCK_SN") + @ApiParam(value = "源库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String srcStockSn; + + @Column(name = "BH_TYPE") + @ApiParam(value = "BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE") + private Integer bhType; + + @Column(name = "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 partNo; + + @Column(name = "PART_NAME_RDD") + @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 = "partName") + private String partNameRdd; + + + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double qty; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + public WmsSerialSn() { + + } + + public WmsSerialSn(String organizeCode, String batchNo, String stockSn, String partNo, String partNameRdd, String serialSn, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.organizeCode = organizeCode; + this.batchNo = batchNo; + this.stockSn = stockSn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.serialSn = serialSn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} 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 new file mode 100644 index 0000000..e92e884 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -0,0 +1,106 @@ +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 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.List; + +/** + * @Description : 产品条码事务表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 9:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@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) + private String batchNo; + + @Column(name="SERIAL_SN") + @ApiParam("产品条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serialSn; + + @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") + private Integer bhType; + + @Column(name = "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 partNo; + + @Column(name = "PART_NAME_RDD") + @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 = "partName") + private String partNameRdd; + + @Column(name="SRC_STOCK_SN") + @ApiParam("源库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String srcStockSn; + + @Column(name="DEST_STOCK_SN") + @ApiParam("目标库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String destStockSn; + + @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") + 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") + private Integer isOk; + + @Transient + @ApiParam("操作类型") + private List transTypeLst; + + public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) { + this.organizeCode = wmsSerialSn.getOrganizeCode(); + this.batchNo = wmsSerialSn.getBatchNo(); + this.serialSn = wmsSerialSn.getSerialSn(); + this.bhType = wmsSerialSn.getBhType(); + this.partNo = wmsSerialSn.getPartNo(); + this.partNameRdd = wmsSerialSn.getPartNameRdd(); + this.destStockSn = wmsSerialSn.getStockSn(); + this.transType = transType; + } + + public WmsSerialSnTrans() { + } +} 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 b894c55..40f637d 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 @@ -1,6 +1,8 @@ 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; @@ -32,17 +34,21 @@ public class WmsShift extends BaseBean{ @Column(name="SHIFT_NO") @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shiftNo; @Column(name="SHIFT_NAME") @ApiParam("班次名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shiftName; @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; } \ No newline at end of file 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 f740e9c..46b0051 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 @@ -44,7 +44,7 @@ public class WmsShipping extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; 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 a64dc8f..ff6c631 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 @@ -1,6 +1,8 @@ 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; @@ -32,45 +34,65 @@ public class WmsShippingFlag extends BaseBean { @Column(name = "CUST_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.BasCustomer", + searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo") private String custNo; @Column(name = "FLAG_NO") @ApiParam(value = "客户发往地编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String flagNo; @Column(name = "FLAG_NAME") @ApiParam(value = "客户发往地名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String flagName; @Column(name = "SHIPP_QTY") @ApiParam(value = "发运数量控制") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer shippQty; @Column(name = "FLAG_DESC") @ApiParam(value = "全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagDesc; @Column(name = "FLAG_ADDR") @ApiParam(value = "客户发往地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagAddr; @Column(name = "FLAG_OWNER") @ApiParam(value = "联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagOwner; @Column(name = "FLAG_EMAIL") @ApiParam(value = "邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagEmail; @Column(name = "FLAG_TEL") @ApiParam(value = "联系人电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagTel; @Column(name = "FLAG_FAX") @ApiParam(value = "传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagFax; + @Column(name = "DEST_ZONE_NO") + @ApiParam(value = "存储区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String destZoneNo; + @Column(name="TEMPLATE_NO") @ApiParam("模板编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/wms/label/sys-label-template/cloud-query", + searchColumnName = "templateCode,templateName",listColumnName = "templateCode,templateName", explicitColumnName = "templateCode") private String templateNo; } 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 new file mode 100644 index 0000000..928d2d4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java @@ -0,0 +1,96 @@ +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 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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_SHORT_LOGISTICS_COSTS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流费用管理") +public class WmsShortLogisticsCosts extends BaseBean { + + private static final long serialVersionUID = 733863151632950809L; + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + @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 = "PLACE_OF_ORIGIN") + @ApiParam(value = "发出地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String placeOfOrigin; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; + + @Column(name = "DESTINATION_WAREHOUSE") + @ApiParam(value = "目的仓库") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String destinationWarehouse; + + @Column(name = "LOGISTICS_VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String logisticsVendorNo; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") + @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) + private Integer transportType; + + @Column(name = "SALES_UNIT") + @ApiParam(value = "计价单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String salesUnit; + + @Column(name = "price") + @ApiParam(value = "单价") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double price; + + @Column(name = "START_DATE") + @ApiParam(value = "生效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String startDate; + + @Column(name = "END_DATE") + @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/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 468634a..0ef223b 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 @@ -3,11 +3,13 @@ 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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -31,9 +33,10 @@ import javax.persistence.Table; @Api(value="条码操作记录表",description = "条码操作记录表") public class WmsSnOperateRecord extends BaseBean { + private static final long serialVersionUID = -8163029081131228416L; @Column(name = "SN") @ApiParam(value = "条码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String sn; @Column(name = "LINE_CODE") @@ -48,8 +51,9 @@ public class WmsSnOperateRecord extends BaseBean { @ApiParam(value = "库位代码") private String locateNo; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量", example = "0") + @ColumnDefault("0") private Double qty = 0d; @Column(name = "PART_NO") @@ -75,12 +79,16 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam(value = "操作类型") @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SN_OPERATE_TYPE") private Integer operateType; @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSN; + @Column(name = "REMARK") + @ApiParam(value = "备注") + private String remark; + } 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 001b0a6..9ee5464 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 @@ -2,16 +2,19 @@ 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 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; /** * @Description : 库存初始化表 @@ -30,9 +33,10 @@ import javax.persistence.Table; @Api("库存初始化信息") public class WmsStockInitialize extends BaseBean { + private static final long serialVersionUID = -6653811290493674698L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String whNo; @Column(name = "ZONE_NO") @@ -52,22 +56,23 @@ public class WmsStockInitialize extends BaseBean { @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String partNameRdd; @Column(name = "UNIT") @ApiParam(value = "单位") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String unit; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "可用数量", example = "0") - @AnnoOutputColumn + @ColumnDefault("0") + @AnnoOutputColumn(required = false) private Double qty = 0d; - @Column(name = "SNP", columnDefinition = "decimal(18,8)") + @Column(name = "SNP", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "标准包装", example = "1") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private Double snp; @Column(name = "STATUS") @@ -78,4 +83,45 @@ public class WmsStockInitialize extends BaseBean { @AnnoOutputColumn private String currentOrganizeCode; + @Column(name = "SN") + @ApiParam(value = "工装条码") + @AnnoOutputColumn(required = false) + private String sn; + + @Column(name = "QC_STATUS") + @ApiParam(value = "质检状态", example = "0") + @ColumnDefault("10") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description", required = false) + private Integer qcStatus; + + /** + * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 + */ + @Column(name = "SN_STATUS") + @ApiParam(value = "条码状态", example = "0") + @ColumnDefault("30") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description", required = false) + private Integer snStatus; + + @Column(name = "USE_COUNT", nullable = true) + @ApiParam(value = "领用次数", example = "0") + @ColumnDefault("0") + @AnnoOutputColumn(required = false) + private Integer useCount; + + @Column(name = "SEQ_NO", nullable = true) + @ApiParam(value = "序号", example = "0") + @ColumnDefault("0") + @AnnoOutputColumn(required = false) + private Integer seqNo; + + @Transient + @ApiParam(value = "确认标志") + private boolean confirm; + + + @Transient + @ApiParam(value = "物料-1，器具-2") + public String intiType; + } 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 837cbf2..a587db3 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 @@ -79,39 +79,39 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "可用数量") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "不合格数量") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "隔离数量") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "质检中数量") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "待入库数量") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "冻结数量") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "寄售数量") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "锁定数量") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "报废数量") private Double scrapQty; 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 e048183..7c2aaa7 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 @@ -1,17 +1,24 @@ 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 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.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; @@ -47,74 +54,107 @@ public class WmsStockSn extends BaseBean { private static final long serialVersionUID = 4869307400585363697L; @Column(name = "WH_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.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "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 partNo; @Column(name = "PART_NAME_RDD") @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 = "partName") private String partNameRdd; @Column(name = "LOT_NO", nullable = false) @ApiParam("收货批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String lotNo = ""; @Column(name = "DATE_CODE", nullable = false) @ApiParam(value = "供应商批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String dateCode = ""; @Column(name = "FIX_LOT_NO", nullable = false) @ApiParam(value = "特殊批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String fixLotNo = ""; @Column(name = "QUALITY_DATE") @ApiParam("保质期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String qualityDate; @Column(name = "LEFT_CODE", nullable = false) @ApiParam(value = "生产批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String leftCode = ""; @Column(name = "VENDOR_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.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "CUST_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.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String custNo; @Column(name = "SHIPPING_FLAG") @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shippingFlag; @Column(name = "SN") @ApiParam(value = "条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sn; @Column(name = "SN_2D") @ApiParam(value = "二维码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sn2d; @Column(name = "PACKAGE_NO") @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String packageNo; @Column(name = "UNIT") @ApiParam(value = "单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unit; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") @ApiParam(value = "数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty = 0d; /** @@ -122,51 +162,72 @@ public class WmsStockSn extends BaseBean { */ @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_QC_STATUS") private Integer qcStatus; /** * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_STATUS") private Integer snStatus; /** * 1:已打印；2：未打印；3：退料生成条码 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PRINT_STATUS") private Integer printed; @Column(name = "PDATE") @ApiParam(value = "打印时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Date pdate; /** * 1=ASN,10=PO,20=SO */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSrc; @Column(name = "CUST_SN") @ApiParam(value = "客户条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custSn; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterCode; @Column(name = "SN_TYPE") @ApiParam(value = "条码类型", example = "10") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE") private Integer snType = 10; + @Column(name = "USE_COUNT") + @ApiParam(value = "领用次数", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer useCount; + + @Column(name = "SEQ_NO") + @ApiParam(value = "序号", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer seqNo; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; @@ -219,6 +280,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "包装零件号") private String packagePartNo; + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + @Transient @ApiParam(value = "工厂名称") public String organizeName; @@ -318,6 +383,130 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "箱数") private Integer boxQty; + @Transient + @ApiParam(value = "是否报工") + private String isReport; + + @Transient + @ApiParam(value = "是否需要报工") + private Integer isReportPartNo; + + @Transient + @ApiParam(value = "库存地代码") + private String areaNo; + + @Transient + @ApiParam(value = "物料规格") + private String partSpec; + + @Transient + @ApiParam(value = "箱数") + private Long boxQtys; + + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + + @Transient + @ApiParam("大检测项类型") + public String checkTypeCode; + + @Transient + @ApiParam("样本数") + private Integer sampleSize; + + @Transient + @ApiParam("BATCH号") + private String batchNo; + + @Transient + @ApiParam(value = "产品条码") + private String serialSn; + + @Transient + @ApiParam("BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description") + private Integer bhType; + + @Transient + @ApiParam("处理状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description") + private Integer workStatus; + + @Transient + @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isQualified; + + @Transient + @ApiParam("返修状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + public Integer reworkStatus; + + @Transient + @ApiParam("返修结果") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer reworkResult; + + @Transient + @ApiParam("挑选状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + public Integer pickStatus; + + @Transient + @ApiParam("挑选状态") + public Integer pickResult; + + @Transient + @ApiParam("位置号-打印用") + public String positionNo; + + @Transient + @ApiParam("父位置号") + public String parentPositionNo; + + + @Transient + @ApiParam(value = "材料类型") + private String melType; + + @Transient + @ApiParam(value = "项目号") + private String projectNo; + + @Transient + @ApiParam(value = "生产小组") + private String productionGroup; + + @Transient + @ApiParam(value = "客户零件号") + private String custPartNo; + + @Transient + @ApiParam(value = "物料类型") + private String materialType; + + @Transient + @ApiParam(value = "工单码") + private String workOrderCode; + + @Transient + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + @Transient + @ApiParam(value = "检测结果ID") + private Long summaryId; + + @Transient + @ApiParam(value = "颜色") + private String color; + public WmsStockSn() { } @@ -360,8 +549,8 @@ public class WmsStockSn extends BaseBean { } - public WmsStockSn(Integer snStatus,String whNo,String locateNo,String partNo,String partNameRdd,String lotNo,Double qty){ - this.snStatus=snStatus; + public WmsStockSn(Integer snStatus, String whNo, String locateNo, String partNo, String partNameRdd, String lotNo, Double qty) { + this.snStatus = snStatus; this.whNo = whNo; this.locateNo = locateNo; this.partNo = partNo; @@ -370,7 +559,7 @@ public class WmsStockSn extends BaseBean { this.qty = qty; } - public WmsStockSn(Long id,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + public WmsStockSn(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 lotCheckRule, String sn2d, @@ -404,11 +593,225 @@ public class WmsStockSn extends BaseBean { this.modifyUser = modifyUser; } - public WmsStockSn (String partNo, String packageNo,String locateNo, String createDatetime, String modifyDatetime) { + public WmsStockSn(String partNo, String packageNo, String locateNo, String createDatetime, String modifyDatetime) { + this.partNo = partNo; + this.packageNo = packageNo; + this.locateNo = locateNo; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + } + + public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo, String partSpec, Integer qcStatus, Double qty, Long boxQtys, + String locateNo, String zoneNo, String whNo, String lotNo, String refSrc, + String dateCode, String packageNo, String createDatetime, String createUser, + String modifyDatetime, String modifyUser) { + this.id = id; + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.areaNo = areaNo; + this.partSpec = partSpec; + this.qcStatus = qcStatus; + this.qty = qty; + this.boxQtys = boxQtys; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.refSrc = refSrc; + this.dateCode = dateCode; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + + public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo, Integer qcStatus, Double qty, + String locateNo, String zoneNo, String whNo, String lotNo, String refSrc, + String dateCode, String packageNo, String createDatetime, String createUser, + String modifyDatetime, String modifyUser) { + this.id = id; + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.areaNo = areaNo; + this.qcStatus = qcStatus; + this.qty = qty; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.refSrc = refSrc; + this.dateCode = dateCode; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + + public WmsStockSn(String organizeCode, String refSrc, String partNo, String partNameRdd, Integer snType, + String locateNo, String workCenterCode, String packageNo, String shippingFlag, String lotNo, String dateCode, String fixLotNo + , String leftCode, Double qty, String sn, String createUser, String createDatetime,String modifyUser,String modifyDatetime) { + this.organizeCode = organizeCode; + this.refSrc = refSrc; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snType = snType; + this.locateNo = locateNo; + this.workCenterCode = workCenterCode; + this.packageNo = packageNo; + this.shippingFlag = shippingFlag; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.fixLotNo = fixLotNo; + this.leftCode = leftCode; + this.qty = qty; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } + + + public WmsStockSn(WmsStockSn stockSn, String batchCode) { + this.id = stockSn.getId(); + this.organizeCode = stockSn.getOrganizeCode(); + this.refSrc = stockSn.getRefSrc(); + this.partNo = stockSn.getPartNo(); + this.partNameRdd = stockSn.getPartNameRdd(); + this.snType = stockSn.getSnType(); + this.locateNo = stockSn.getLocateNo(); + this.workCenterCode = stockSn.getWorkCenterCode(); + this.packageNo = stockSn.getPackageNo(); + this.shippingFlag = stockSn.getShippingFlag(); + this.lotNo = stockSn.getLotNo(); + this.dateCode = stockSn.getDateCode(); + this.fixLotNo = stockSn.getFixLotNo(); + this.leftCode = stockSn.getLeftCode(); + this.qty = stockSn.getQty(); + this.sn = stockSn.getSn(); + this.createUser = stockSn.getCreateUser(); + this.createDatetime = stockSn.getCreateDatetime(); + this.modifyUser = stockSn.getModifyUser(); + this.modifyDatetime = stockSn.getModifyDatetime(); + this.refSrc = batchCode; + } + + public WmsStockSn(String organizeCode, String batchNo, String sn, String workCenterCode, String partNo, + String partNameRdd, String shippingFlag, String leftCode, String createUser, String createDatetime, + String modifyUser, String modifyDatetime) { + this.organizeCode = organizeCode; + this.batchNo = batchNo; + this.sn = sn; + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.shippingFlag = shippingFlag; + this.leftCode = leftCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + + } + + public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo, + String partNameRdd, Long summaryId, String workCenterCode, String createUser, String createDatetime, + String modifyUser, String modifyDatetime) { + this.organizeCode = organizeCode; + this.batchNo = batchNo; + this.bhType = bhType; + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.summaryId = summaryId; + this.workCenterCode = workCenterCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + + } + + 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) { + this.organizeCode = organizeCode; + this.id = id; + this.sn = sn; this.partNo = partNo; - this.packageNo =packageNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; this.locateNo = locateNo; - this.createDatetime=createDatetime; + 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; } + + public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) { + this.packageNo = packageNo; + this.qty = qty; + this.qualityDate = qualityDate; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + } + + } 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 new file mode 100644 index 0000000..dfe3b86 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java @@ -0,0 +1,56 @@ +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.Index; +import javax.persistence.Table; + +/** + * @Description :替代料 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_SUB_PART", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) +@Api("替代料") +public class WmsSubPart extends BaseBean { + + private static final long serialVersionUID = -8864784324056827764L; + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "SUB_PART_NO") + @ApiParam(value = "替代物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String subPartNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partName; + + @Column(name = "SUB_PART_NAME") + @ApiParam(value = "替代物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String subPartName; +} 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 new file mode 100644 index 0000000..0470492 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java @@ -0,0 +1,117 @@ +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 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.Transient; +import java.util.List; +import java.util.Map; + +/** + * @Description : 悬挂链库存同步数据 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-14 9:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_SUSPEN_STOCK_SYNC", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) +@Api("悬挂链库存同步数据") +public class WmsSuspenStockSync extends BaseBean { + + @Column(name = "SRC") + @ApiParam(value = "数据来源") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String src; + + @Column(name = "SERVER_URL") + @ApiParam(value = "服务地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serverUrl; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String locateNo; + + @Column(name = "PART_NO_A") + @ApiParam(value = "物料号A") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNoA; + + @Column(name = "PART_NO_B") + @ApiParam(value = "物料号B") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNoB; + + @Column(name = "QTY_A") + @ApiParam(value = "数量A") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double qtyA; + + @Column(name = "qty_b") + @ApiParam(value = "数量B") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double qtyB; + + @Column(name = "LOT_NO_A") + @ApiParam(value = "批次A") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lotNoA; + + @Column(name = "LOT_NO_B") + @ApiParam(value = "批次B") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lotNoB; + + @Column(name = "STATUS") + @ApiParam(value = "状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.SUSPEN_STOCK_SYNC_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer status; + + @Column(name = "ERROR_MSG") + @ApiParam(value = "错误信息") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String errorMsg; + + @Transient + @ApiParam(value = "物料数组集") + private String[] partNos; + + @Transient + @ApiParam(value = "数量数组集") + private Double[] qtys; + + @Transient + @ApiParam(value = "批次数组集") + private String[] lotNos; + + @Transient + @ApiParam(value = "物料数据List") + private List partList; + + @Transient + @ApiParam(value = "物料数据Map") + private Map partNameMap; + +} 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 61cb767..99716c7 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 @@ -9,8 +9,13 @@ 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 java.math.BigDecimal; +import java.util.List; /** * @Description : 作业任务明细信息 @@ -61,12 +66,12 @@ public class WmsTaskDetails extends BaseBean { @ApiParam(value = "供应商编号") private String vendorNo; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "1") private Double qty; - @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "处理数量", example = "1") private Double transQty; @@ -140,6 +145,11 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("交易类型") public String transTypeCodeRdd; + @Transient + @ApiParam("工厂代码集合") + private List organizeCodeList; + + public Double getQty() { return this.qty == null ? 0 : this.qty; } 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 a137f31..67fd34b 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 @@ -10,7 +10,11 @@ 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; import java.util.List; /** @@ -104,6 +108,14 @@ public class WmsTaskInfo extends BaseBean { @ApiParam(value = "供应商编号") private String vendorNo; + @Transient + @ApiParam("工厂集合") + private List organizeCodeList; + + @Transient + @ApiParam("业务类型代码") + public String busiTypeCode; + public WmsTaskInfo(){}; public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){ 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 4b798fd..9927324 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 @@ -5,6 +5,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; @@ -47,6 +48,7 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "IS_SN") @ApiParam("是否有条码") + @ColumnDefault("0") public Integer isSn; @Column(name = "TRANS_CODE") @@ -55,5 +57,6 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "IS_ONE_STEP") @ApiParam("是否一步法") + @ColumnDefault("0") public Integer isOneStep; } 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 3531e8f..6d7bec2 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 @@ -1,6 +1,8 @@ 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; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.UniqueConstraint; /** * @Description : 工位表 @@ -32,13 +33,18 @@ public class WmsTerminal extends BaseBean{ private static final long serialVersionUID = 9214639813072592713L; @Column(name="TERMINAL_NO") @ApiParam("工位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String terminalNo; @Column(name="TERMINAL_NAME") @ApiParam("工位名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String terminalName; @Column(name="PDLINE_NO") @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 = "workCenterCode") private String pdlineNo; } \ No newline at end of file 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 new file mode 100644 index 0000000..aeb6e6a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -0,0 +1,100 @@ +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 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.Transient; + +/** + * @Description : 检测结果明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-23 11:03 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_TEST_RESULT_DETAILS", indexes = { + @Index(columnList = "BH_CODE"), + @Index(columnList = "PART_NO"), + @Index(columnList = "WORK_CENTER_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("检测结果明细表") +public class WmsTestResultDetails extends BaseBean { + + private static final long serialVersionUID = -3295112411840494690L; + @Column(name = "BH_CODE") + @ApiParam("BH号") + public String bhCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + public String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + public String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + public String partName; + + @Column(name = "CHECK_TYPE_CODE") + @ApiParam("检测大类") + public String checkTypeCode; + + @Column(name = "QR_CODE") + @ApiParam("二维码") + public String qrCode; + + @Column(name = "IS_QUALIFIED") + @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isQualified; + + @Column(name = "IS_FINISH") + @ApiParam("是否完成") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isFinish; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + public String checkValue; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description") + public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue(); + + @Transient + @ApiParam("已检测数") + private Long checkSize; + + @Transient + @ApiParam("移动单单号") + private String moveNo; + + public WmsTestResultDetails() { + } + + public WmsTestResultDetails(String partNo, String checkTypeCode, String bhCode, Long checkSize) { + this.partNo = partNo; + this.checkTypeCode = checkTypeCode; + this.bhCode = bhCode; + this.checkSize = checkSize; + } +} 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 new file mode 100644 index 0000000..29121cc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -0,0 +1,137 @@ +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 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 : jimmy.zeng + * @CreateDate : 2020-04-23 10:50 + * @Modify: + **/ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TEST_RESULT_SUMMARY") +@Api("检测结果汇总表") +public class WmsTestResultSummary extends BaseBean { + + private static final long serialVersionUID = -4600850017207281216L; + + @Column(name = "BH_CODE") + @ApiParam("BH号") + public String bhCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + public String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + public String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + public String partName; + + @Column(name = "FLAG_NO") + @ApiParam("客户发往地") + public String flagNo; + + @Column(name = "IS_QUALIFIED") + @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isQualified; + + @Column(name = "REWORK_STATUS") + @ApiParam("返修状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + public Integer reworkStatus; + + @Column(name = "REWORK_RESULT") + @ApiParam("返修结果") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer reworkResult; + + @Column(name = "PICK_STATUS") + @ApiParam("挑选状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + public Integer pickStatus; + + @Column(name = "PICK_RESULT") + @ApiParam("挑选结果") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer pickResult; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description") + public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue(); + + @Transient + @ApiParam("BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description") + private Integer bhType; + + @Transient + @ApiParam("库存条码") + private String sn; + + @Transient + @ApiParam("库存条码二维码") + private String serialSn; + + public WmsTestResultSummary(String organizeCode, String bhCode, + String workCenterCode, String partNo, + String partName, String flagNo, Integer isQualified, + Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult) { + this.organizeCode = organizeCode; + this.bhCode = bhCode; + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partName = partName; + this.flagNo = flagNo; + this.isQualified = isQualified; + this.reworkStatus = reworkStatus; + this.reworkResult = reworkResult; + this.pickStatus = pickStatus; + this.pickResult = pickResult; + } + + public WmsTestResultSummary(String organizeCode, String bhCode, + String workCenterCode, String partNo, + String partName, String flagNo, Integer isQualified, + Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult, Integer bhType) { + this.organizeCode = organizeCode; + this.bhCode = bhCode; + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partName = partName; + this.flagNo = flagNo; + this.isQualified = isQualified; + this.reworkStatus = reworkStatus; + this.reworkResult = reworkResult; + this.pickStatus = pickStatus; + this.pickResult = pickResult; + this.bhType = bhType; + } + + 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 new file mode 100644 index 0000000..fdcf3d7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @Description : WMS回显模板数据 + * @Reference : + * @Author : siliter + * @CreateDate : 2020-05-11 09:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_THYMELEAF") +@Api("WMS回显模板数据") +public class WmsThymeleaf extends BaseBean { + + private static final long serialVersionUID = -5751852067398308165L; + + @Column(name = "TL_CODE") + @ApiParam("模板代码") + private String tlCode; + + @Column(name = "TL_DESC") + @ApiParam("模板描述") + private String tlDesc; + + @Column(name = "PROMPT_MSG") + @ApiParam("引导消息") + private String promptMsg; + + @Lob + @Column(name = "TL_CONTENT", columnDefinition = "TEXT") + @ApiParam(value = "模板内容") + private String tlContent; +} 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 0ecea20..ffbfba7 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 @@ -1,7 +1,9 @@ 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; @@ -29,35 +31,44 @@ import javax.persistence.Table; @Api("驾驶员信息") public class WmsTmsDriver extends BaseBean { + private static final long serialVersionUID = 2083909056682628791L; @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String driverNo; @Column(name="DRIVER_NAME") @ApiParam(value ="驾驶员姓名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String driverName; @Column(name="SEX") @ApiParam(value ="驾驶员性别") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer sex; @Column(name="AGE") @ApiParam(value ="驾驶员年龄") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String age; @Column(name="ID_NO") @ApiParam(value ="驾驶员身份证号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String idNo; @Column(name="ADRESS") @ApiParam(value ="驾驶员籍贯") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String adress; @Column(name="PHONE") @ApiParam(value ="车牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String phone; @Column(name="LOGIN_NO") @ApiParam(value =" 登录账号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String loginNo; } 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 c0cbe93..4b47141 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 @@ -32,6 +32,7 @@ import java.util.List; @Api("装车单信息") public class WmsTmsShippingExt extends BaseBean { + private static final long serialVersionUID = -3261413137866351406L; @Column(name="MOVE_NO") @ApiParam(value ="移库单号") private String moveNo; @@ -105,10 +106,6 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("物料编码") private String partNo; - @Transient - @ApiParam("关联单号") - private String refOrderNo; - @Column(name="PATH_URL") @ApiParam("回执单地址") private String pathUrl; @@ -116,4 +113,28 @@ public class WmsTmsShippingExt extends BaseBean { @Transient @ApiParam("打印模板列表") private List shipModels; + + //需求仓库-目的仓库 + @Column(name="DESC_WAREHOUSE") + @ApiParam("目的仓库") + private String descWarehouse; + + //承运商-物流供应商 + @Column(name="LOGISTICS_VENDOR_NO") + @ApiParam("物流供应商") + private String logisticsVendorNo; + + //运输方式-单据运输方式（维护内容） + @Column(name="DOCUMENT_TRANSPORT_METHOD") + @ApiParam("单据运输方式") + private Integer documentTransportMethod; + + //是否不良品调拨—调拨单录入字段 + @Column(name="DEFECTIVE_ALLOCATION") + @ApiParam("调拨单录入字段") + private String defectiveAllocation; + +// @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 new file mode 100644 index 0000000..2935a37 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java @@ -0,0 +1,130 @@ +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 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 : jimmy.zeng + * @CreateDate : 2020-06-09 16:45 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_TRACTICS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="策略表",description = "策略表") +public class WmsTractics extends BaseBean { + + private static final long serialVersionUID = -8203200560604263871L; + @Column(name="TRACTICS_CODE") + @ApiParam(value ="策略代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tracticsCode; + + @Column(name="TRACTICS_NAME") + @ApiParam(value ="策略名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tracticsName; + + @Column(name="TRACTICS_DESC") + @ApiParam(value ="策略描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tracticsDesc; + + @Column(name="TRACTICS_GRADE") + @ApiParam(value ="策略等级") + // @AnnoOutputColumn(refClass = WmsEnumUtil.TRACTICS_GRADE.class, refForeignKey = "value", value = "description") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "TRACTICS_GRADE") + private Integer tracticsGrade; + + @Column(name="TRACTICS_GROUP") + @ApiParam(value ="策略组") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "TRACTICS_GROUP") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRACTICS_GROUP.class, refForeignKey = "value", value = "description") + private Integer tracticsGroup; + + @Column(name="TRACTICS_ITEM") + @ApiParam(value ="策略项") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer tracticsItem; + + @Column(name="TRACTICS_PART_GROUP") + @ApiParam(value ="策略适用物料组") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", + searchColumnName = "partGroupNo,partGroupName", listColumnName = "partGroupNo,partGroupName", explicitColumnName = "partGroupNo") + private String tracticsPartGroup; + + @Column(name = "TRACTICS_PART_GROUP_NAME") + @ApiParam(value = "策略适用物料组名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tracticsPartGroupName; + + @Column(name="TRACTICS_ZONE") + @ApiParam(value ="策略适用存储区") + @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") + private String tracticsZone; + + @Column(name="TRACTICS_PARAM") + @ApiParam(value ="参数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tracticsParam; + + @Column(name="TRACTICS_START_TIME") + @ApiParam(value ="策略生效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String tracticsStartTime; + + @Column(name="TRACTICS_END_TIME") + @ApiParam(value ="策略失效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String tracticsEndTime; + + @Column(name="LEV1_STRATEGY_PUT") + @ApiParam(value ="1级策略上架") + @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE") + private Integer lev1StrategyPut; + + @Column(name="LEV1_STRATEGY_PICKING") + @ApiParam(value ="1级策略拣货") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE") + private Integer lev1StrategyPicking; + + @Column(name="LEV2_STRATEGY_PUT") + @ApiParam(value ="2级策略") + @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO") + private Integer lev2StrategyPut; + + @Column(name="LEV3_STRATEGY_PUT") + @ApiParam(value ="3级策略") + @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE") + private Integer lev3StrategyPut; + +// public String getIev1StrategyPicking (String lev1StrategyPicking) { +// return this.lev1Strategy = lev1StrategyPicking; +// } +} 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 674df38..5818f82 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 @@ -58,7 +58,7 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; 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 d5e6146..14fbf1f 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 @@ -1,6 +1,8 @@ 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; @@ -36,30 +38,47 @@ public class WmsTransQuan extends BaseBean { private static final long serialVersionUID = -7379945456037422449L; @Column(name = "TRANS_NO") @ApiParam(value = "事务编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transNo; @Column(name = "WH_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.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, 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 partNo; @Column(name = "PART_NAME_RDD") @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 = "partName") private String partNameRdd; @Column(name = "UNIT") @ApiParam(value = "单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unit; @Column(name = "TRANS_STATUS") @@ -76,75 +95,95 @@ public class WmsTransQuan extends BaseBean { @Column(name = "REF_SRC") @ApiParam(value = "关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSrc; @Column(name = "TRANS_CODE") @ApiParam(value = "交易代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transCode; @Column(name = "MOVE_NO") @ApiParam(value = "库存移动单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String moveNo; @Column(name = "VENDOR_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.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; @Column(name = "CUST_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.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String custNo; @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String errorMessage; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double scrapQty; @Column(name="TRANS_TYPE_NAME") @ApiParam(value ="交易名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transTypeName; /*@Transient 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 1e47d2e..fe49873 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 @@ -58,7 +58,7 @@ public class WmsTransRcd extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; 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 447bdf9..b4f5ed5 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 @@ -66,12 +66,12 @@ public class WmsTransSn extends BaseBean { @ApiParam("事务代码") public String transCode; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "交易数量", example = "0") public Double qty; - @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格交易数量", example = "0") public Double rejectQty; 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 a20ea25..2c5f6e1 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 @@ -77,6 +77,10 @@ public class WmsTransType extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description") private Integer orderBackType; + @Column(name = "TM_NAME") + @ApiParam(value = "交易处理组件名称") + private String tmName; + @Transient @ApiParam("菜单URL") private String menuUrl; 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 d34d0e6..49ce84f 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 @@ -3,6 +3,7 @@ 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; @@ -10,7 +11,11 @@ import lombok.Data; 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.Table; +import javax.persistence.Transient; import java.util.List; @@ -39,47 +44,47 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_TYPE") @ApiParam("业务类型") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE") public Integer busiType; @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE") public Integer busiSceneType; @Column(name = "SRC_AREA_NO") @ApiParam("发货库存地") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String srcAreaNo; @Column(name = "DEST_AREA_NO") @ApiParam("目标库存地") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String destAreaNo; @Column(name = "OUT_VENDOR_NO") @ApiParam("委外供应商编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String outVendorNo; @Column(name = "PART_NO") @ApiParam("物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String partNo; @Column(name = "CUST_NO") - @ApiParam("客户代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String custNo; @Column(name = "IS_TRANSPORT") @ApiParam("是否安排运输") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") - public int isTransport; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + public Integer isTransport; @Column(name = "REMARK",length = 255) @ApiParam("备注") 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 290f7c0..84ce516 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 @@ -1,6 +1,8 @@ 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; @@ -31,14 +33,17 @@ public class WmsUnit extends BaseBean { private static final long serialVersionUID = 7332606009041273554L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitCode; @Column(name = "UNIT_NAME") @ApiParam(value = "单位名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitName; @Column(name = "UNIT_PRECISION") @ApiParam(value = "单位精度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer unitPrecision; public Integer getUnitPrecisionValue(){ 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 03e877d..5fbc76e 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 @@ -1,6 +1,8 @@ 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; @@ -31,14 +33,17 @@ public class WmsUnitConvert extends BaseBean { private static final long serialVersionUID = -466720560879335877L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitCode; @Column(name = "DEST_UNIT_CODE") @ApiParam(value = "目标单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String destUnitCode; @Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double unitCoefficient; public Double getUnitCoefficientVal() { 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 042c111..bcd0499 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 @@ -1,6 +1,8 @@ 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; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 供应商零件关系 @@ -22,20 +23,26 @@ import javax.persistence.Transient; **/ @Data @Entity -@Table(name="WMS_VENDOR_PART") +@Table(name = "WMS_VENDOR_PART") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="供应商零件关系",description = "供应商零件关系") +@Api(value = "供应商零件关系", description = "供应商零件关系") public class WmsVendorPart extends BaseBean { private static final long serialVersionUID = 7339520734918140529L; @Column(name = "VENDOR_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.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String vendorNo; @Column(name = "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 partNo; @Column(name = "VENDOR_PART_NO") @@ -44,14 +51,20 @@ public class WmsVendorPart extends BaseBean { @Column(name = "MAX_AMOUNT") @ApiParam(value = "供应商月提供最大数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double maxAmount; - @Transient + @Column(name = "PART_NO_NAME") @ApiParam("物料名称") + @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 = "partName") private String partName; - - @Transient + @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName") private String vendorName; } 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 new file mode 100644 index 0000000..ee0536c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 供应商计划员 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_VENDOR_PLANNER") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="供应商计划员",description = "供应商计划员") +public class WmsVendorPlanner extends BaseBean { + + private static final long serialVersionUID = 6444925010696953067L; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "PLANNER_NAME") + @ApiParam(value = "计划员") + private String plannerName; +} 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 new file mode 100644 index 0000000..fa72ef5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 供应商父子关系 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_VENDOR_RELATION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="供应商父子关系",description = "供应商父子关系") +public class WmsVendorRelation extends BaseBean { + + private static final long serialVersionUID = 723387673958938803L; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "SUB_VENDOR_CODE") + @ApiParam(value = "子供应商编号") + private String subVendorNo; + + @Column(name = "SUB_VENDOR_NAME") + @ApiParam(value = "子供应商名称") + private String subVendorName; +} 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 new file mode 100644 index 0000000..4902c6a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 供应商窗口时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_VENDOR_WINDOW") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="供应商窗口时间",description = "供应商窗口时间") +public class WmsVendorWindow extends BaseBean { + + private static final long serialVersionUID = -8156667748890281030L; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "WINDOW_TIME") + @ApiParam(value = "窗口时间") + private String windowTime; + + @Column(name = "DELAY_HOUR") + @ApiParam(value = "容差") + private Integer delayHour; + + @Column(name = "WEEK_DAY") + @ApiParam(value = "星期") + private String weekDay; +} 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 a9b02e2..dad3549 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 @@ -5,6 +5,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; @@ -67,28 +68,34 @@ public class WmsWaveRule extends BaseBean { @ApiParam(value = "单据控制时间") public String orderControlTime; - @Column(name = "FIXED_ORDER_QTY") + @Column(name = "FIXED_ORDER_QTY", nullable = false) @ApiParam(value = "固定单据数量", example = "0") + @ColumnDefault("0") public Integer fixedOrderQty; - @Column(name = "FIXED_PART_QTY") + @Column(name = "FIXED_PART_QTY", nullable = false) @ApiParam(value = "固定物料箱数", example = "0") + @ColumnDefault("0") public Integer fixedPartQty; - @Column(name = "WAVE_QTY") + @Column(name = "WAVE_QTY", nullable = false) @ApiParam(value = "波次数量", example = "0") + @ColumnDefault("0") public Integer waveQty; - @Column(name = "ORDER_MAX_QTY") + @Column(name = "ORDER_MAX_QTY", nullable = false) @ApiParam(value = "最大单据数量", example = "0") + @ColumnDefault("0") public Integer orderMaxQty; - @Column(name = "PART_MAX_QTY") + @Column(name = "PART_MAX_QTY", nullable = false) @ApiParam(value = "最大物料数量", example = "0") + @ColumnDefault("0") public Double partMaxQty; - @Column(name = "ORDER_TIMEOUT_TIME") + @Column(name = "ORDER_TIMEOUT_TIME", nullable = false) @ApiParam(value = "单据等待时间", example = "0") + @ColumnDefault("0") public Integer orderTimeOutTime; @Column(name = "NEXT_WAVE_TIME") 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 6da587b..241599c 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 @@ -1,6 +1,8 @@ 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; @@ -31,30 +33,43 @@ public class WmsWorkCenter extends BaseBean { private static final long serialVersionUID = 415180808859365167L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterCode; @Column(name = "WORK_CENTER_NAME") @ApiParam(value = "工作中心名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterName; @Column(name = "ERP_WORK_CENTER") @ApiParam(value = "ERP_工作中心") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String erpWorkCenter; @Column(name = "WORK_VER") @ApiParam(value = "生产版本") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workVer; @Column(name = "SRC_ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String srcZoneNo; @Column(name = "DESC_ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String descZoneNo; @Column(name = "DESC_LOCATION_CODE") @ApiParam(value = "成品库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; } 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 9175316..1a792c6 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 @@ -1,6 +1,8 @@ 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; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 工作中心线边库区关系 @@ -28,21 +29,33 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Api(value="工作中心线边库区关系",description = "工作中心线边库区关系") public class WmsWorkCenterZone extends BaseBean { - private static final long serialVersionUID = 950689993212839817L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @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 = "workCenterCode") private String workCenterCode; @Column(name = "ZONE_NO") @ApiParam(value = "线边库区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; - @Transient + @Column(name = "WORK_CENTER_NAME") @ApiParam("工作中心名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, 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 workCenterName; - @Transient + @Column(name = "ZONE_NAME") @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 = "zoneName") private String zoneName; } 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 11d9020..3b1566e 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 @@ -1,6 +1,8 @@ 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; @@ -12,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库区物料 @@ -32,42 +35,77 @@ public class WmsZonePart extends BaseBean{ private static final long serialVersionUID = 9214639813072592546L; @Column(name="ZONE_NO") @ApiParam("存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name="PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, 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 partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") + @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 = "partName") private String partNameRdd; @Column(name="PULL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "拉动数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double pullQty; @Column(name="MAX", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "最大值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name="MIN", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "最小值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "IS_GENERATE_PICKLIST") @ApiParam(value = "是否生成领料单", example = "2") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isGeneratePickList; @Column(name="MOQ", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "起订量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double moq; @Column(name="SAFETY_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @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 f916604..5d1e4b0 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,82 +35,82 @@ public class WmsZones extends BaseBean { private static final long serialVersionUID = 7759454799191378612L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String whNo; @Column(name = "AREA_NO") @ApiParam(value = "库存地代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String zoneNo; @Column(name = "ZONE_NAME") @ApiParam(value = "存储区名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String zoneName; @Column(name = "PARENT_ZONE_NO") @ApiParam(value = "父级存储区", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String parentZoneNo; @Column(name = "IS_SON_NODE") @ApiParam(value = "是否子节点") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "TRUE_OR_FALSE") private Integer isSonNode; @Column(name = "IS_PM") @ApiParam(value = "零件级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isPm; @Column(name = "IS_LM") @ApiParam(value = "批次级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isLm; @Column(name = "IS_SN") @ApiParam(value = "条码级管控", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isSn; @Column(name = "IS_MIX") @ApiParam(value = "允许混淆", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isMix; @Column(name = "IS_SC") @ApiParam(value = "库容检查", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isSc; @Column(name = "STRATEGY") @ApiParam(value = "堆放策略") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String strategy; @Column(name = "IS_NEGATIVE") @ApiParam(value = "允许负库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isNegative; @Column(name = "CHECK_FIFO") @ApiParam(value = "校验先进先出", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer checkFifo; @Column(name = "ZONE_LENGTH") @ApiParam(value = "长") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer zoneLength; @Column(name = "ZONE_WIDTH") @ApiParam(value = "宽") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer zoneWidth; @Column(name = "POSITION") @@ -119,17 +119,17 @@ public class WmsZones extends BaseBean { @Column(name = "ZONE_PULL_WAY") @ApiParam(value = "补货方式", example = "10") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "ZONE_PULL_WAY") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "ZONE_PULL_WAY") private Integer zonePullWay; @Column(name = "PULL_CYCLE") @ApiParam(value = "固定拉动周期", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer pullCycle; @Column(name = "LAST_PULL_TIME") @ApiParam(value = "上次拉动时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastPullTime; @Transient 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 01b511f..d7c87ee 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 @@ -7,10 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; + +import javax.persistence.*; /** * @Description : WMS字段信息表 @@ -21,14 +19,18 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_FIELDINFO", indexes = { +@Table(name = "WMS_FIELDINFO", + indexes = { @Index(columnList = "FIELD_NAME"), - @Index(columnList = "ENTITY_NAME") -}) + @Index(columnList = "ENTITY_NAME")}, + uniqueConstraints = { + @UniqueConstraint(columnNames = { + "FIELD_NAME", "ENTITY_NAME"})} +) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="WMS字段信息表",description = "WMS字段信息表") +@Api(value = "WMS字段信息表", description = "WMS字段信息表") public class WmsFieldInfo extends BaseBean { private static final long serialVersionUID = 3903166651913139064L; @@ -109,7 +111,15 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "回显列名") private String explicitColumnName; - @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @Column(name = "IS_MULTIPLE") + @ApiParam(value = "是否多选") + private Integer isMultiple; + + @Column(name = "DATA_SRC") + @ApiParam(value = "数据来源") + private String dataSrc; + + @Column(name = "GET_VAL_WAY") @ApiParam(value = "下拉框规则") - private Integer selectRule; + private Integer getValWay; } 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 1359939..5ebf953 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 @@ -5,6 +5,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; @@ -46,12 +47,14 @@ public class WmsListElement extends BaseBean { @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") private Integer seq; - @Column(name = "IS_REQUIRE") + @Column(name = "IS_REQUIRE", nullable = false) + @ColumnDefault("2") @ApiParam(value = "是否必选:默认1-必选，2-非必选") private Integer isRequire; - @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "宽度", example = "0") + @ColumnDefault("0") private Double width; @Column(name = "SORT") @@ -86,9 +89,9 @@ public class WmsListElement extends BaseBean { @ApiParam(value = "字段类型") private Integer fieldType; - @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @Column(name = "DYNAMIC_FIELD_GET_WAY") @ApiParam(value = "下拉框规则") - private Integer selectRule; + private Integer getValWay; @Column(name = "ENTITY_NAME") @ApiParam(value = "实体名称") 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 40fdf34..29477e4 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 @@ -7,6 +7,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; @@ -63,16 +64,18 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "处理数量", example = "0") + @ColumnDefault("0") public Double transQty; public Double getTransQty(){ return this.transQty == null ? 0 : this.transQty.doubleValue(); } - @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "不合格处理数量", example = "0") + @ColumnDefault("0") public Double rejectQty; public Double getRejectQty(){ 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 06890f3..7679f39 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 @@ -60,7 +60,7 @@ public class WmsMoveMasterSnapshot extends BaseBean { private String transTypeCode; @Lob - @Column(name = "ERROR_MESSAGE") + @Column(name = "ERROR_MESSAGE", columnDefinition = "TEXT") @ApiParam(value = "错误信息") private String errorMessage; 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 7b9e473..724a81d 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 @@ -87,47 +87,47 @@ public class WmsStockQuanSnapshot extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; 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 b13c8f0..8d15ecc 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 @@ -7,6 +7,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; import org.springframework.format.annotation.DateTimeFormat; @@ -116,8 +117,9 @@ public class WmsStockSnSnapshot extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量", example = "0") + @ColumnDefault("0") private Double qty = 0d; /** 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 new file mode 100644 index 0000000..81f5de7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.wms.bean.template; + +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.util.List; + +/** + * @Description : 导入模板信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE") +@Api("导入模板信息") +public class BasImportTemplate extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592889L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TEMPLATE_NAME") + @ApiParam("模板名称") + private String templateName; + + @Column(name="TEMPLATE_DESC") + @ApiParam("模板描述") + private String templateDesc; + + @Column(name="GROUP_NAME") + @ApiParam("分组名称") + private String groupName; + + /** + * 10-单表，20-多表 + */ + @Column(name="IMPORT_TYPE") + @ApiParam(value = "导入类型", example = "0") + private Integer importType; + + /** + * 10-全覆盖，20-差异更新，30-重复不导入 + */ + @Column(name="UPDATE_TYPE") + @ApiParam(value = "更新类型", example = "0") + private Integer updateType; + + @Column(name="SCRIPT_NO") + @ApiParam("脚本编号") + private String scriptNo; + + @Column(name="START_ROW") + @ApiParam(value = "起始行", example = "0") + private Integer startRow; + + @Transient + @ApiParam("模板明细列表") + private List templateDetailsList; +} \ No newline at end of file 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 new file mode 100644 index 0000000..d45be01 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -0,0 +1,117 @@ +package cn.estsh.i3plus.pojo.wms.bean.template; + +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 : siliter.yuan + * @CreateDate : 2020-04-16 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE_DETAILS") +@Api("导入模板明细信息") +public class BasImportTemplateDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592999L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TABLE_NAME") + @ApiParam("表名称") + private String tableName; + + @Column(name="FIELD_CODE") + @ApiParam("字段英文名称") + private String fieldCode; + + @Column(name="FIELD_ALIAS") + @ApiParam("字段别名") + private String fieldAlias; + + @Column(name="LABEL_CODE") + @ApiParam("标签代码") + private String labelCode; + + @Column(name="LABEL_NAME") + @ApiParam("标签名称") + private String labelName; + + @Column(name="DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + /** + * 数据格式 文本、整数、小数、日期 + */ + @Column(name="DATA_FORAMT") + @ApiParam("数据格式") + private String dataFormat; + + /** + * 1-是，2-否 + */ + @Column(name="IS_REQUIRE") + @ApiParam(value = "是否必填", example = "0") + private Integer isRequire; + + @Column(name="DECIMAIL_SPLIT") + @ApiParam("小数点分隔符") + private String decimalSplit; + + @Column(name="THOUSANDS_SPLIT") + @ApiParam("千分位分隔符") + private String thousandsSplit; + + // YYYY-MM-DD/DD-MM-YY/YYYY-MM-DD HH:mm:ss + @Column(name="DATE_FORMAT") + @ApiParam("日期格式") + private String dateFormat; + + @Column(name="REMARK") + @ApiParam("备注") + private String remark; + + @Column(name="SEQ") + @ApiParam(value = "序号", example = "0") + private Integer seq; + + @Column(name="MAX_LENGTH") + @ApiParam(value = "最大长度", example = "0") + private Integer maxLength; + + @Column(name="RELATION_TABLE") + @ApiParam("关联表名") + private String relationTable; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + /** + * 是否主键 1-是，2-否 + */ + @Column(name="IS_PK") + @ApiParam(value = "是否主键", example = "0") + private Integer isPk; + + @Column(name="SHEET_NAME") + @ApiParam("工作薄名称") + private String sheetName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java index c945e71..8a5f846 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class MappingItem { +public class MappingItem implements Comparable { /** * 来源字段名称 */ @@ -38,6 +38,11 @@ public class MappingItem { */ public Object defaultValue; + /** + * 字段的顺序号 + */ + public int seq; + @Override public String toString() { return "srcName:" @@ -45,6 +50,12 @@ public class MappingItem { + this.destBeanName + ", destName" + this.destName + ", defaultValue:" + this.defaultValue + ", destPk:" - + this.destPk; + + this.destPk + ", seq:" + + this.seq; + } + + @Override + public int compareTo(MappingItem o) { + return this.seq - o.seq; } } 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 2e3cffa..9dfdc8c 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 @@ -1,12 +1,17 @@ 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.Table; @@ -26,6 +31,7 @@ import javax.persistence.Table; @Table(name = "WMS_INTERFACE_DATA_MAPPER") @Api("接口数据映射") public class WmsInterfaceDataMapper extends BaseBean { + private static final long serialVersionUID = 4139044040492108498L; /** * 排序编号 */ @@ -98,7 +104,7 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 接口分组名称 - * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES */ @Column(name = "GROUP_NAME") public String groupName; @@ -157,4 +163,14 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "USE_SCRIPT_FILTER") public Integer useScriptFilter; + + + /** + * 数据格式类型 + */ + @Column(name = "SOFT_DATA_TYPE") + @ApiParam(value = "数据格式类型") + @ColumnDefault("10") + @AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false) + public Integer softDataType; } 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 43fe989..752e8bb 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 @@ -9,7 +9,8 @@ public class WmsInterfaceEnumUtil { 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"), + SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"); private int value; private String name; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java new file mode 100644 index 0000000..178a0ea --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description : 发运计划任务跟踪 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-27 4:37 下午 + * @Modify: + **/ +@Data +public class AssignmentDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "单号") + private String orderNo; + + @ApiParam(value = "时间") + private String createDatetime; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "源存储区") + private String srcZoneNo; + + @ApiParam(value = "客户编码") + private String custNo; + + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @ApiParam(value = "状态中文描述", example = "1") + private String itemStatusStr; + + @ApiParam(value = "出库数量") + private Double outQty; + + public AssignmentDto(String orderNo, String createDatetime, String partNameRdd, + String srcZoneNo, String custNo, Integer itemStatus, Double outQty, String partNo) { + this.orderNo = orderNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.srcZoneNo = srcZoneNo; + this.custNo = custNo; + this.itemStatus = itemStatus; + this.outQty = outQty; + this.partNo = partNo; + } + + public AssignmentDto() { + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java index 49d975d..3b0840c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java @@ -4,12 +4,12 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; -import javax.persistence.Transient; import java.io.Serializable; @Data public class WmsCarDto extends BaseDto implements Serializable { + private static final long serialVersionUID = 1477585131669086208L; @Column(name="CAR_NO") @ApiParam(value ="车牌号") private String carNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java new file mode 100644 index 0000000..6458aab --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +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; + +/** + * @Description :窗口输出类 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-21 2:37 下午 + * @Modify: + **/ +@Data +@Api("窗口输出类") +public class WmsCustWindowDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + + @ApiParam(value = "窗口时间") + private String custWindowTime; + + @ApiParam(value = "星期一客户") + private String mondayCust; + + @ApiParam(value = "星期二客户") + private String tuesdayCust; + + @ApiParam(value = "星期三客户") + private String wednesdayCust; + + @ApiParam(value = "星期四客户") + private String thursdayCust; + + @ApiParam(value = "星期五客户") + private String fridayCust; + + @ApiParam(value = "星期六客户") + private String saturdayCust; + + @ApiParam(value = "星期日客户") + private String sundayCust; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java new file mode 100644 index 0000000..46b0a13 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +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; + +/** + * @Description :移动单效率(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("移动单效率(出参)") +public class WmsMoveMovementEffectivenessDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "日期") + private String date; + + @ApiParam(value = "比列") + private Double percentage; + + public WmsMoveMovementEffectivenessDto(String date, Double percentage) { + this.date = date; + this.percentage = percentage; + } + + public WmsMoveMovementEffectivenessDto() { + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java new file mode 100644 index 0000000..f5f2c4a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-07-09 9:50 上午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出实体类") +public class WmsReceiptKanbanDto { + + @ApiParam(value = "供应商编号") + private String vendorNo; + + @ApiParam(value = "频次") + private String frequency; + + @ApiParam(value = "供应商名称") + private String verdorName; + + @ApiParam(value = "订单号") + private String orderNo; + + + @ApiParam(value = "道口") + private String dock; + + @ApiParam(value = "项目") + private String prodCfgTypeCode; + + @ApiParam(value = "窗口时间") + private String planDate; + + @ApiParam(value = "开始收货时间") + private String earliestReceTime; + + @ApiParam(value = "结束收货时间") + private String latestReceTime; + + @ApiParam(value = "收货状态") + private String receStatus; + + @ApiParam(value = "质检状态") + private String qcStatus; + + @ApiParam(value = "工厂代码") + private String organizeCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java new file mode 100644 index 0000000..ba061d6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +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; + +/** + * @Description :装车单打印输出model(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出实体类") +public class WmsStockSnDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "库位") + private String locateNo; + @ApiParam(value = "物料号") + private String partNo; + @ApiParam(value = "物料名称") + private String partNameRdd; + @ApiParam(value = "数量") + private Double qty; + @ApiParam(value = "生产批次") + private String dateCode; + + @ApiParam(value = "规格") + private String partSpec; + + @ApiParam(value = "存储区") + private String zoneNo; + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + } + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + } + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec, String zoneNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + this.zoneNo = zoneNo; + } + + public WmsStockSnDto() { + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java new file mode 100644 index 0000000..a1db922 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :供应商延期输出实体类(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("供应商延期输出实体类") +public class WmsSupplierExtensionDto { + + @ApiParam(value = "序号") + private Integer rn; + + @ApiParam(value = "供应商编号") + private String vendorNo; + + @ApiParam(value = "供应商编号") + private String vendorName; + + @ApiParam(value = "数量") + private Integer num; + + public WmsSupplierExtensionDto() { + + } + + public WmsSupplierExtensionDto(String vendorNo, Integer num, String vendorName) { + this.vendorNo = vendorNo; + this.num = num; + this.vendorName = vendorName; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java index ad84be5..47c76ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java @@ -16,6 +16,7 @@ import java.io.Serializable; @Data public class WmsTmsDriverDto extends BaseDto implements Serializable { + private static final long serialVersionUID = 1686388995931944419L; @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") private String driverNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java new file mode 100644 index 0000000..79878f0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description :装车单入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ +@Api("装车单批量入参") +@Data +public class WmsTmsShipBacthDto extends BaseDto implements Serializable { + private static final long serialVersionUID = -6901734563284429774L; + @ApiParam("装车单集合") + private List wmsTmsShipDtoList=new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index bdd8cc6..07661de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -17,6 +17,7 @@ import java.io.Serializable; @Data public class WmsTmsShipDto extends BaseDto implements Serializable { + private static final long serialVersionUID = -523839265877092396L; @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java new file mode 100644 index 0000000..d025df0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 中航WMS看板－仓库预警看板(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("中航WMS看板－仓库预警看板(出参)") +public class WmsWarehouseWarningDto { + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "存储区") + private String zoneNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "库存") + private Double qty; + + @ApiParam(value = "最大库存") + private Double maxqty; + + @ApiParam(value = "最小库存") + private Double minqty; + + @ApiParam(value = "库存状态") + private String stockStatus; + + @ApiParam(value = "库位") + private String locateNo; + + @ApiParam(value = "颜色") + private String color; + + public WmsWarehouseWarningDto(String partNo, String zoneNo, String partNameRdd, Double qty, Double maxqty, + Double minqty, String stockStatus, String locateNo, String color) { + this.partNo = partNo; + this.zoneNo = zoneNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.maxqty = maxqty; + this.minqty = minqty; + this.stockStatus = stockStatus; + this.locateNo = locateNo; + this.color = color; + } + + public WmsWarehouseWarningDto() { + + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index ab93720..249a42b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Table(name = "DROOLS_RULE_PERSISTENCE") @Api("系统动态业务规则") public class EngineRulePersistence extends BaseBean { + private static final long serialVersionUID = 5119552483383770556L; // 规则调用的唯一编号，例如：WMS_RECEIVE_0001 @Column(name = "RULE_NO", length = 50) private String ruleNo; @@ -39,7 +40,7 @@ public class EngineRulePersistence extends BaseBean { private String ruleName; // 规则的具体内容 @Lob - @Column(name = "RULE_CONTENT") + @Column(name = "RULE_CONTENT", columnDefinition = "TEXT") private String ruleContent; // 规则的描述，包含规则的用法，参数说明等 @Column(name = "RULE_REMARK", length = 2000) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java new file mode 100644 index 0000000..ed03f5e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @description 数据库实例字段模型 + * @author siliter.yuan + * @date 2020/04/16 + */ +@Data +@Api("数据库实例字段模型") +public class BasBeanFieldModel { + + @ApiParam("表名") + private String tableName; + + @ApiParam("表描述") + private String tableDesc; + + @ApiParam("字段英文名称") + private String fieldEnName; + + @ApiParam("字段类型") + public String fieldType; + + @ApiParam("字段描述") + private String fieldDesc; + + @ApiParam("实例类名") + public String entityName; + + @ApiParam("实例字段名称") + public String propertyName; + + @ApiParam("实例类全名") + public String entityClassName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java new file mode 100644 index 0000000..f49407c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SupplyTrackingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SupplyTrackingModel.java new file mode 100644 index 0000000..1ad7e14 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SupplyTrackingModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 收货追踪地图信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-02 + * @Modify: + **/ +@Data +@Api("收货追踪地图信息") +public class SupplyTrackingModel { + @ApiParam("供应商经纬度") + private String vendorMap; + + @ApiParam("收货仓库经纬度") + private String rcWarehouseMap; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java new file mode 100644 index 0000000..9fcf1fc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 自动过滤物流路线 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-07-01 + * @Modify: + **/ +@Data +@Api("自动过滤物流路线") +public class WmsAutoFilterRoutingRuleModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("料架车") + private String parentSpec; +} 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 new file mode 100644 index 0000000..a5a55d2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 零件自动采购单信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-18 + * @Modify: + **/ +@Data +@Api("零件自动采购单信息") +public class WmsAutoPurchasePartModel extends Pager { + @ApiParam("合同号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam(value = "单位") + private String unit; + + @ApiParam("物料数量") + private Integer qty; + + @ApiParam("Erp库存地") + private String erpWarehouse; + + @ApiParam("供应商编码") + private String vendorNo; + + @ApiParam("供应商名称") + private String vendorName; + + public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) { + this.partNo = partNo; + this.partName = partName; + this.qty = qty; + this.erpWarehouse = warehouse; + } + + public WmsAutoPurchasePartModel() { + + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java new file mode 100644 index 0000000..6b5d6b9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsAutoTaskLog; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-22 18:59 + * @Modify: + **/ +@Data +public class WmsAutoTaskModel { + + @ApiParam("业务类型") + private Integer busiType; + + @ApiParam("存储区") + private String zoneNo; + + @ApiParam("单据号") + private String orderNo; + + @ApiParam("物料集合") + private List partList; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("交易类型") + private String transTypeCode; + + @ApiParam("锁定库位") + private String lockLocacte; + + @ApiParam("锁定源库位") + private String srcLockLocacte; + + @ApiParam("方向") + private Integer direction; + + @ApiParam("货格") + private String packageNo; + + @ApiParam("锁定料车") + private String lockCar; + + @ApiParam("预存锁定料车") + private String prestoreLockCar; + + @ApiParam("物料对应的单据明细集合") + private Map partNoDetailsList; + + @ApiParam("锁定物料对应的条码") + private Map> partNoGroupListMap; + + @ApiParam("锁定条码") + private List lockStockSnList; + + @ApiParam("动作日志记录") + private WmsAutoTaskLog wmsAutoTaskLog; + + @ApiParam("任务生成数量") + private Double taskQty; + + @ApiParam("返回错误信息") + public String errorMsg; + + @ApiParam("策略代码") + public String strategyNo; + + @ApiParam("策略动作") + public String strategyAction; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java index bd413a9..30d2c3c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java @@ -18,6 +18,7 @@ import lombok.Data; @Api("供应商微服调用Model") public class WmsBasVendorModel extends BaseBean { + private static final long serialVersionUID = -4097250031510982530L; @ApiParam("供应商") private BasVendor basVendor; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 9cd45da..f9d9951 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -18,6 +18,7 @@ import java.util.List; @Api("数据权限Model") public class WmsDataAuthModel extends BaseBean { + private static final long serialVersionUID = -1830754107669382563L; @ApiParam("角色编号") private String roleCode; @@ -48,6 +49,9 @@ public class WmsDataAuthModel extends BaseBean { @ApiParam("业务类型列表") private List busiOperationTypeList; + @ApiParam("检测大类列表") + private List bhCheckTypeList; + @ApiParam( value = "新增操作", example = "0" diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java index e137f64..0e85791 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,26 +20,41 @@ public class WmsMoveInfoModel { @ApiParam(value = "操作时间") private String modifyDateTime; + @ApiParam(value = "物料号") private String partNo; + @ApiParam(value = "物料名称") private String partNameRdd; + @ApiParam(value = "交易类型") private String transTypeCode; + @ApiParam(value = "交易类型名称") private String transTypeName; + @ApiParam(value = "业务类型") - private String busiTypeCode; + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private Integer busiTypeCode; + @ApiParam(value = "处理数量") private String sumQty; + @ApiParam(value = "工厂代码") private String organizeCode; + + @ApiParam(value = "操作状态") - private String itemStatus; + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @ApiParam(value = "关联单号") + private String refSrc; + public WmsMoveInfoModel() { } - public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) { + public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer busiTypeCode, String sumQty, String organizeCode) { this.modifyDateTime = modifyDateTime; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java index dd2b411..5fe1327 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -14,6 +14,7 @@ import lombok.Data; @Api("未完成订单模型") public class WmsMoveUnfinishedOrderModel extends BaseBean{ + private static final long serialVersionUID = 363976915707604557L; @ApiParam("物料编码") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java new file mode 100644 index 0000000..f3bf975 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 子检测项 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-29 16:23 + * @Modify: + **/ +@Data +@Api("子检测项model") +public class WmsPartItemCheckModel { + + @ApiParam("子检测项代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemCode; + + @ApiParam("子检测项名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemName; + + @ApiParam("子检测箱值类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") + private Integer valueType; + + @ApiParam("检测值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double checkValue; + + @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isQualified; + + @ApiParam("标准值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer standard; + + @ApiParam("最大值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double max; + + @ApiParam("最小值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double min; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java index f842855..f375dfb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.wms.bean.BasVendor; import cn.estsh.i3plus.pojo.wms.bean.WmsPart; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -19,6 +18,7 @@ import lombok.Data; @Api("供应商微服调用Model") public class WmsPartModel extends BaseBean { + private static final long serialVersionUID = -4435519990466605445L; @ApiParam("物料") private WmsPart wmsPart; 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 536f46c..d5b5feb 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 @@ -18,6 +18,7 @@ import java.time.LocalTime; @Api("供应商收货看板") public class WmsPoAsnRecvModel extends BaseBean implements Comparable { + private static final long serialVersionUID = 7985236317993813219L; @ApiParam("订单号") private String orderNo; @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java new file mode 100644 index 0000000..db9f5bc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java @@ -0,0 +1,96 @@ +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 : 报工事务明细表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Api("报工事务明细表model") +public class WmsReportTransDetailModel extends BaseBean { + private static final long serialVersionUID = 1547988564672291041L; + @ApiParam(value = "报工产线") + private String lineNo; + + @ApiParam(value = "实际报工产线") + private String reportLine; + + @ApiParam(value = "班组名称") + private String shiftNo; + + @ApiParam(value = "班组描述") + private String shiftName; + + @ApiParam(value = "报工库区") + private String zoneNo; + + @ApiParam(value = "报工库位") + private String locateNo; + + @ApiParam(value = "报工条码") + private String reportSn; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "客户代码") + private String custNo; + + @ApiParam(value = "单位") + private String unit; + + @ApiParam(value = "数量") + private Double qty; + + @ApiParam(value = "供应商批次") + private String dateCode; + + @ApiParam(value = "包规") + private Double snp; + + @ApiParam(value = "收货批次") + private String lotNo; + + @ApiParam(value = "查询开始时间") + private String startDateTime; + + @ApiParam(value = "查询结束时间") + private String endDateTime; + + // , String createUser, String createDateTime + public WmsReportTransDetailModel(String organizeCode, String lineNo, String actualReportLine, String shiftNo, String shiftName, + String zoneNo, String locateNo, String sn, String partNo, String partNameRdd, String custNo, + String unit, Double qty, String dateCode, Double snp, String lotNo, String createDateTime) { + this.organizeCode = organizeCode; + this.lineNo = lineNo; + this.reportLine = actualReportLine; + this.shiftNo = shiftNo; + this.shiftName = shiftName; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.reportSn = sn; + this.partNo = partNo; + this.partName = partNameRdd; + this.custNo = custNo; + this.unit = unit; + this.qty = qty; + this.dateCode = dateCode; + this.snp = snp; + this.lotNo = lotNo; + this.createDatetime = createDateTime; + } + + public WmsReportTransDetailModel() { + + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java new file mode 100644 index 0000000..1d7b583 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java @@ -0,0 +1,55 @@ +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 : 报工事务汇总表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Api("报工事务汇总表model") +public class WmsReportTransMasterModel extends BaseBean { + private static final long serialVersionUID = 5696795930973637987L; + @ApiParam(value = "实体线") + private String lineNo; + + @ApiParam(value = "班组名称") + private String shiftNo; + + @ApiParam(value = "班组描述") + private String shiftName; + + @ApiParam(value = "报工库区") + private String zoneNo; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "报工数量") + private Double qty; + + public WmsReportTransMasterModel(String organizeCode, String lineNo, String shiftNo, String shiftName, + String zoneNo, String partNo, String partNameRdd, Double qty) { + this.organizeCode = organizeCode; + this.lineNo = lineNo; + this.shiftNo = shiftNo; + this.shiftName = shiftName; + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partName = partNameRdd; + this.qty = qty; + } + + public WmsReportTransMasterModel() { + + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java index 660d2a2..82f88b0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java @@ -5,8 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Entity; - /** * @Description : 静态盘点输出model * @Reference : @@ -15,10 +13,11 @@ import javax.persistence.Entity; * @Modify: **/ @Data -@Entity @Api("静态盘点查询输出model") public class WmsStaticCsModel extends BaseBean { - public WmsStaticCsModel(String staticStr,String orderNo, String locateNo, String sn, double qty ) { + private static final long serialVersionUID = 9039981061448266666L; + + public WmsStaticCsModel(String staticStr, String orderNo, String locateNo, String sn, double qty) { this.orderNo = orderNo; this.locateNo = locateNo; this.sn = sn; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java new file mode 100644 index 0000000..6e8535f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsTractics; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-15 13:21 + * @Modify: + **/ +@Data +@Api("策略返回model") +public class WmsStrategyModel { + + @ApiParam(value = "物料编号") + private String partNo; + + @ApiParam(value = "数量") + private Double qty; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam("策略对象") + public WmsTractics wmsTractics; + + @ApiParam("List结果集") + public List resultList; + + @ApiParam("List策略项名集") + public List strategyList; + + @ApiParam("返回错误信息") + public String errorMsg; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java new file mode 100644 index 0000000..0aef73a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; + +/** + * @Description :装车单打印输出model + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出model") +public class WmsTmsShippingExtDeatilModel { + + @ApiParam(value ="零件号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam(value ="零件名称") + private String partNameRdd; + + @ApiParam("需求数量") + private Double qty; + + @ApiParam("发运数量") + private Double shippQty; + + @ApiParam("箱数") + private Integer boxQty; + + @ApiParam("标准包装") + private Double snp; + + @ApiParam("收货数量") + private String receivedQuantity=""; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java new file mode 100644 index 0000000..2ab29c1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java @@ -0,0 +1,132 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExt; +import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description :装车单打印输出model(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出model") +public class WmsTmsShippingExtModel { + + @ApiParam(value = "移库单号") + private String moveNo=""; + + @ApiParam(value = "到货地点") + private String destination=""; + + @ApiParam(value = "接收人") + private String recUser=""; + + @ApiParam(value = "接收人电话") + private String recPhone=""; + + @ApiParam(value = "道口") + private String dockNo=""; + + @ApiParam(value = "承运商编号") + private String vendorNo=""; + + @ApiParam(value = "承运商名称RDD") + private String vendorName=""; + + @ApiParam(value = "驾驶员编号") + private String driverNo=""; + + @ApiParam(value = "驾驶员名称RDD") + private String driverName=""; + + @ApiParam(value = "驾驶员联系方式RDD") + private String phone=""; + + @ApiParam(value = "单据状态") + private Integer orderStatus=0; + + @ApiParam(value = "客户名称RDD") + private String custName=""; + + @ApiParam(value = "客户编号RDD") + private String custNo=""; + + @ApiParam(value = "车牌号RDD") + private String carNo=""; + + @ApiParam(value = "计划发车时间") + private String deliveryTime=""; + + @ApiParam(value = "要求到货时间") + private String arrivelTime=""; + + @ApiParam(value = " 申请部门") + private String depart=""; + + @ApiParam("物料编码") + private String partNo=""; + + @ApiParam("关联单号") + private String refOrderNo=""; + + @ApiParam("回执单地址") + private String pathUrl=""; + + @ApiParam("打印模板列表") + private List shipModels=new ArrayList<>(); + + //需求仓库-目的仓库 + @ApiParam("目的仓库") + private String descWarehouse=""; + + //承运商-物流供应商 + @ApiParam("物流供应商") + private String logisticsVendorNo=""; + + //运输方式-单据运输方式（维护内容） + @ApiParam("单据运输方式") + private Integer documentTransportMethod=0; + + //是否不良品调拨—调拨单录入字段 + @ApiParam("调拨单录入字段") + private String defectiveAllocation=""; + + @ApiParam("发运时间") + private String shippingTime=""; + + @ApiParam("发运人") + private String shippingUser=""; + + @ApiParam("下单日期") + private String orderDate=""; + + @ApiParam("模板编号") + private String templateNo=""; + + //装车单明细已物料区分 + @ApiParam("各个物料详情") + private List tmsShippingExtDeatilModels = new ArrayList<>(); + + public WmsTmsShippingExtModel() { + + } + + public WmsTmsShippingExtModel(WmsTmsShippingExt wmsTmsShippingExt) { + this.moveNo = wmsTmsShippingExt.getMoveNo(); + this.descWarehouse=wmsTmsShippingExt.getDescWarehouse(); + this.vendorName=wmsTmsShippingExt.getVendorName(); + this.documentTransportMethod=wmsTmsShippingExt.getDocumentTransportMethod(); + this.shippingTime=wmsTmsShippingExt.getCreateDatetime(); + this.shippingUser=wmsTmsShippingExt.getCreateUser(); + this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation(); + this.orderDate=wmsTmsShippingExt.getCreateDatetime(); + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java new file mode 100644 index 0000000..0d424ac --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java @@ -0,0 +1,79 @@ +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 : 供应商延迟到货明细表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Api("供应商延迟到货明细表model") +public class WmsVendorDelayDetailModel extends BaseBean { + + private static final long serialVersionUID = -1030326082916174340L; + @ApiParam(value = "单据编号") + private String orderNo; + + @ApiParam(value = "完成状态") + private Integer itemStatus; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "总数量") + private Double qty; + + @ApiParam(value = "预交日期") + private String planDate; + + @ApiParam(value = "预交时间") + private String planTime; + + @ApiParam(value = "收货日期") + private String recDate; + + @ApiParam(value = "收货时间") + private String recTime; + + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "供应商名称") + private String vendorName; + + @ApiParam(value = "查询开始时间") + private String startDateTime; + + @ApiParam(value = "查询结束时间") + private String endDateTime; + + public WmsVendorDelayDetailModel(String orderNo, Integer itemStatus, String partNo, String partName, Double qty, + String planDate, String planTime, String recDate, String recTime, String vendorNo, String vendorName, String organizeCode, String createDateTime) { + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.partNo = partNo; + this.partName = partName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.recDate = recDate; + this.recTime = recTime; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.organizeCode = organizeCode; + this.createDatetime = createDateTime; + } + + public WmsVendorDelayDetailModel() { + + } +} 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 new file mode 100644 index 0000000..a3fd7c8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -0,0 +1,46 @@ +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 : 供应商延迟到货汇总表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Api("供应商延迟到货汇总表model") +public class WmsVendorDelayMasterModel extends BaseBean { + + private static final long serialVersionUID = 1589775350017343999L; + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "供应商名称") + private String vendorName; + + @ApiParam(value = "延迟次数") + private Long delayCount; + + @ApiParam(value = "查询开始时间") + private String startDateTime; + + @ApiParam(value = "查询结束时间") + private String endDateTime; + + public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) { + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.delayCount = count; + this.organizeCode = organizeCode; + this.createDatetime = createDateTime; + } + + public WmsVendorDelayMasterModel() { + + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java new file mode 100644 index 0000000..31250fa --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.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.template.BasImportTemplateDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板明细数据操作仓库 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 10:00 + * @Modify: + **/ +@Repository +public interface BasImportTemplateDetailsRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java new file mode 100644 index 0000000..43201d5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.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.template.BasImportTemplate; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板数据操作仓库 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 10:00 + * @Modify: + **/ +@Repository +public interface BasImportTemplateRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java new file mode 100644 index 0000000..449fe2d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.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.EngineScriptPersistenceHistory; +import org.springframework.stereotype.Repository; + +@Repository +public interface EngineScriptPersistenceHistoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index de8bf6d..0870082 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; +import cn.estsh.i3plus.pojo.wms.bean.EngineScriptPersistence; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java index f6c8ef8..c271680 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.QadBop; +import org.springframework.stereotype.Repository; /** * @Description : @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.QadBop; * @CreateDate : 2020-01-09 15:06 * @Modify: **/ +@Repository public interface QadBopRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java new file mode 100644 index 0000000..c12772b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.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.QmsCheckType; +import org.springframework.stereotype.Repository; + +@Repository +public interface QmsCheckTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java new file mode 100644 index 0000000..8276f93 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.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.QmsStockSnExtBh; + +/** + * @Description : BH库存条码扩展表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 13:24 + * @Modify: + **/ +public interface QmsStockSnExtBhRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java new file mode 100644 index 0000000..f5cf661 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.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.QadBop; +import cn.estsh.i3plus.pojo.wms.bean.SodDet; +import org.springframework.stereotype.Repository; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +@Repository +public interface SodDetRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoForkCallBackDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoForkCallBackDetailsRepository.java new file mode 100644 index 0000000..0123583 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoForkCallBackDetailsRepository.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.WmsAutoForkCallBackDetails; +import org.springframework.stereotype.Repository; + + +/** + * @Description :北京海纳川回调任务明细 + * @Reference : + * @Author : puxiao.lioa + * @CreateDate : 2018-11-13 10:19 + * @Modify: + **/ +@Repository +public interface WmsAutoForkCallBackDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java new file mode 100644 index 0000000..4806018 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.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.WmsAutoStrategyDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : 自动化策略明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:34 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java new file mode 100644 index 0000000..d6200d8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.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.WmsAutoStrategyMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 自动化策略主表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:34 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java new file mode 100644 index 0000000..fba9918 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.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.WmsAutoStrategyMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:51 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoTaskLogRecRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoTaskLogRecRepository.java new file mode 100644 index 0000000..e571629 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoTaskLogRecRepository.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.WmsAutoTaskLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-23 21:46 + * @Modify: + **/ +@Repository +public interface WmsAutoTaskLogRecRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java new file mode 100644 index 0000000..9698716 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.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.WmsBhChildDetectionItem; +import org.springframework.stereotype.Repository; + +/** + * @Description : BH子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Repository +public interface WmsBhChildDetectionItemRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.java new file mode 100644 index 0000000..48e9727 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.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.WmsBomHistory; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsBomHistoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCoiRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCoiRepository.java new file mode 100644 index 0000000..23df52e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCoiRepository.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.WmsCoi; +import org.springframework.stereotype.Repository; + +/** + * @Description : COI对照表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-10 10:24 + * @Modify: + **/ +@Repository +public interface WmsCoiRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java new file mode 100644 index 0000000..986645f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.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.WmsCustWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description : 客户窗口时间 + * @Reference : + * @Author : jason + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Repository +public interface WmsCustWindowRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.java new file mode 100644 index 0000000..c930217 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.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.WmsCustomerPartShipping; +import org.springframework.stereotype.Repository; + +/** + * @Description : 客户物料发往地 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsCustomerPartShippingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java new file mode 100644 index 0000000..6d47563 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.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.WmsDocSoDetails; + +/** + * @Description : 销售订单明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 14:53 + * @Modify: + **/ +public interface WmsDocSoDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.java new file mode 100644 index 0000000..e09b4d7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.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.WmsDocSoMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 销售订单主表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 14:52 + * @Modify: + **/ +@Repository +public interface WmsDocSoMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java new file mode 100644 index 0000000..43c28ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.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.WmsHealthIndicatorLevel; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthIndicatorLevelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java new file mode 100644 index 0000000..c197b34 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.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.WmsHealthIndicator; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthIndicatorRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java new file mode 100644 index 0000000..833dfd2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.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.WmsHealthIndicatorResult; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthIndicatorResultRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java new file mode 100644 index 0000000..732a108 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.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.WmsHealthVariable; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthVariableRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java new file mode 100644 index 0000000..58f6f6a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.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.WmsHealthVariableResult; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthVariableResultRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsDetailsRepository.java new file mode 100644 index 0000000..f1a2c18 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsDetailsRepository.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.WmsLogisticExpenseRecordsDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流运费记录明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsLogisticExpenseRecordsDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsRepository.java new file mode 100644 index 0000000..a6dadd2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsRepository.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.WmsLogisticExpenseRecords; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流运费记录 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsLogisticExpenseRecordsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java new file mode 100644 index 0000000..9fa807f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.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.WmsLogisticsCosts; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流费用管理 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsLogisticsCostsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsFreightApprovalRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsFreightApprovalRepository.java new file mode 100644 index 0000000..61d89e0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsFreightApprovalRepository.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.WmsLogisticsFreightApproval; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流运费审批 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-05-14 15:17 + * @Modify: + **/ +@Repository +public interface WmsLogisticsFreightApprovalRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java new file mode 100644 index 0000000..17df50e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.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.WmsModeTransport; +import org.springframework.stereotype.Repository; + +/** + * @Description : 运输方式 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsModeTransportRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java new file mode 100644 index 0000000..5c0dbe7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.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.WmsPartCheckType; +import org.springframework.stereotype.Service; + +/** + * @Description : 物料检测大类 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Service +public interface WmsPartCheckTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.java new file mode 100644 index 0000000..9a00bb0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.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.WmsPartExtend; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-09 + * @Modify: + **/ +@Repository +public interface WmsPartExtendRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java new file mode 100644 index 0000000..4c6d2ec --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.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.WmsPartItemCheck; +import org.springframework.stereotype.Repository; + +/** + * @Description : 持久层物料子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Repository +public interface WmsPartItemCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java new file mode 100644 index 0000000..c6446a8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.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.WmsProviderFlag; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流供应商与发往地关系 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsProviderFlagRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.java new file mode 100644 index 0000000..9db9dd0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.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.WmsPurchasePlanHistory; +import org.springframework.stereotype.Repository; + +/** + * @Description : 采购计划历史dao层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-04-15 10:30 + * @Modify: + **/ +@Repository +public interface WmsPurchasePlanHistoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRfidOperateRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRfidOperateRecordRepository.java new file mode 100644 index 0000000..d36ff17 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRfidOperateRecordRepository.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.WmsRfidOperateRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : RFID条码操作记录表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-10 14:46 + * @Modify: + **/ +@Repository +public interface WmsRfidOperateRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java new file mode 100644 index 0000000..682a78e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.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.WmsSerialSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : 产品条码信息dao层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-05-23 11:00 + * @Modify: + **/ +@Repository +public interface WmsSerialSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java new file mode 100644 index 0000000..9430b0f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.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.WmsSerialSnTrans; +import org.springframework.stereotype.Repository; + +/** + * @Description : 产品条码事务表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-05-22 9:43 + * @Modify: + **/ +@Repository +public interface WmsSerialSnTransRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java new file mode 100644 index 0000000..57028b4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.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.WmsShortLogisticsCosts; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流费用管理(短途运输) + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsShortLogisticsCostsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.java new file mode 100644 index 0000000..73da0eb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.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.WmsSubPart; +import org.springframework.stereotype.Repository; + +/** + * @Description : 替代料 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Repository +public interface WmsSubPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSuspenStockSyncRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSuspenStockSyncRepository.java new file mode 100644 index 0000000..f4dd112 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSuspenStockSyncRepository.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.WmsSuspenStockSync; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-14 10:33 + * @Modify: + **/ +@Repository +public interface WmsSuspenStockSyncRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.java new file mode 100644 index 0000000..7882dad --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.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.WmsTestResultDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 检测结果明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-23 11:03 + * @Modify: + **/ +@Repository +public interface WmsTestResultDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.java new file mode 100644 index 0000000..8f8e536 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.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.WmsTestResultSummary; +import org.springframework.stereotype.Repository; + +/** + * @Description : 检测结果汇总表 + * @Reference : + * @Author : jimmy.z + * @CreateDate : 2020-04-23 11:03 + * @Modify: + **/ +@Repository +public interface WmsTestResultSummaryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java new file mode 100644 index 0000000..54c1aa5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.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.WmsThymeleaf; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter + * @CreateDate : 2020-05-11 09:17 + * @Modify: + **/ +@Repository +public interface WmsThymeleafRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTracticsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTracticsRepository.java new file mode 100644 index 0000000..d058755 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTracticsRepository.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.WmsTractics; +import org.springframework.stereotype.Repository; + +/** + * @Description : 策略表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-10 10:24 + * @Modify: + **/ +@Repository +public interface WmsTracticsRepository extends BaseRepository{ +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.java new file mode 100644 index 0000000..55676e3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.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.WmsVendorPlanner; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商计划员 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsVendorPlannerRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.java new file mode 100644 index 0000000..a0c3c6b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.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.WmsVendorRelation; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商父子关系 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsVendorRelationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.java new file mode 100644 index 0000000..1329841 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.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.WmsVendorWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商窗口时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsVendorWindowRepository 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 17793d9..0cbc776 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 @@ -11,14 +11,20 @@ import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; +import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate; +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 cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import java.util.*; +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; /** @@ -50,7 +56,11 @@ public class WmsHqlPack { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); } // 封装有效状态、删除状态、创建人和创建时间 - DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + if (StringUtil.isEmpty(bean.getIsValid())) { + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", hqlStr); + } else { + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr; @@ -188,6 +198,8 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringLikerPack(wmsPackage.getMemo(), "memo", packBean); + DdlPreparedPack.getStringLikerPack(wmsPackage.getLocateNo(), "locateNo", packBean); DdlPreparedPack.getNumEqualPack(wmsPackage.getPrintStatus(), "printStatus", packBean); DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo()==null?"":wmsPackage.getPackageNo()+"%", "packageNo", packBean); DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean); @@ -214,7 +226,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", 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); getStringBuilderPack(wmsDocMovementMaster, packBean); return packBean; @@ -272,6 +285,12 @@ public class WmsHqlPack { DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); } + //按创建时间查询单据信息 + if (StringUtils.isNotBlank(wmsPOMaster.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(), + wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + } + getStringBuilderPack(wmsPOMaster, result); return result; @@ -544,12 +563,11 @@ 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.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "locateNo", result); + DdlPreparedPack.getInPackArray(wmsLocate.getLocateNoArr(), "locateNo", result); } - // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); @@ -686,6 +704,12 @@ public class WmsHqlPack { DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result); } + //按创建时间查询单据信息 + if (StringUtils.isNotBlank(wmsASNMaster.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(), + wmsASNMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + } + getStringBuilderPack(wmsASNMaster, result); return result; @@ -1657,7 +1681,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); @@ -1733,13 +1758,13 @@ public class WmsHqlPack { * @param groupDataAuth * @return */ - public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth, String refSrc, String organizeCode) { + /*public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth, String refSrc, String organizeCode) { DdlPackBean result = new DdlPackBean(); Set>> entries = groupDataAuth.entrySet(); //拼sql entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); - /*for (Map.Entry> map : entries) { + *//*for (Map.Entry> map : entries) { String key = map.getKey(); List valueList = map.getValue(); @@ -1762,22 +1787,24 @@ public class WmsHqlPack { packMutilConditionHql(mapList, "PART_NO", "partNo", result); } } - }*/ + }*//* //转换封装后的hql - /*String packedHql = result.getPackedHql(); + *//*String packedHql = result.getPackedHql(); if(packedHql.startsWith(" or")){ packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; System.out.println(packedHql); } - result.setWhereAppend(packedHql);*/ + result.setWhereAppend(packedHql);*//* // 通用数据拼接 WmsDataAuth wmsDataAuth = new WmsDataAuth(); wmsDataAuth.setOrganizeCode(organizeCode); getStringBuilderPack(wmsDataAuth, result); return result; - } + }*/ + + /** * 把 List 中的一组数据重新封装到List中 @@ -1822,7 +1849,7 @@ public class WmsHqlPack { * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList, Map> groupDataAuth) { + /*public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList, Map> groupDataAuth) { DdlPackBean packBean = new DdlPackBean(); Set>> entries = groupDataAuth.entrySet(); //拼sql @@ -1842,13 +1869,13 @@ public class WmsHqlPack { } } //转换封装后的hql - /*String packedHql = packBean.getPackedHql(); + *//*String packedHql = packBean.getPackedHql(); if(packedHql.startsWith(" or")){ packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; System.out.println(packedHql); } - packBean.setWhereAppend(packedHql);*/ + packBean.setWhereAppend(packedHql);*//* DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean); @@ -1857,7 +1884,7 @@ public class WmsHqlPack { DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); return packBean; - } + }*/ /** * 根据条件查询dataAuth @@ -1889,6 +1916,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsTaskDetails(WmsTaskDetails taskDetails) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getInPackList(taskDetails.getOrganizeCodeList(), "organizeCode", result); getStringBuilderPack(taskDetails, result); return result; } @@ -2198,8 +2226,8 @@ public class WmsHqlPack { if (wmsProdCfgType != null) { DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); } - DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // getStringBuilderPack(wmsProdCfgType, result); return result; @@ -2243,6 +2271,119 @@ public class WmsHqlPack { } /** + * 物料扩展属性 + * + * @param partExtend + * @return + */ + public static DdlPackBean packHqlWmsPartExtendByPart(WmsPartExtend partExtend) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(partExtend.getPartNo(), "partNo", packBean); + getStringBuilderPack(partExtend, packBean); + + return packBean; + } + + /** + * 替代料 条件封装 + * + * @param subPart + * @return + */ + public static DdlPackBean packHqlWmsSubPartByPart(WmsSubPart subPart) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(subPart.getPartNo(), "partNo", packBean); + getStringBuilderPack(subPart, packBean); + + return packBean; + } + + public static DdlPackBean packHqlWmsScriptHistory(EngineScriptPersistenceHistory history) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(history.getScriptNo(), "scriptNo", packBean); + getStringBuilderPack(history, packBean); + + return packBean; + } + + /** + * 供应商窗口时间 条件封装 + * + * @param vendorWindow + * @return + */ + public static DdlPackBean packHqlWmsVendorWindow(WmsVendorWindow vendorWindow) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorWindow.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorWindow, packBean); + + return packBean; + } + + /** + * 供应商窗口时间 条件封装 + * + * @param custWindow + * @return + */ + public static DdlPackBean packHqlWmsCustWindow(WmsCustWindow custWindow) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(custWindow.getCustNo(), "custNo", packBean); + getStringBuilderPack(custWindow, packBean); + + return packBean; + } + + /** + * 客户物料发往地 条件封装 + * + * @param shipping + * @return + */ + public static DdlPackBean packHqlWmsCustomerPartShipping(WmsCustomerPartShipping shipping) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(shipping.getCustomerCode(), "customerCode", packBean); + getStringBuilderPack(shipping, packBean); + + return packBean; + } + + /** + * 供应商父子关系 条件封装 + * + * @param vendorPlanner + * @return + */ + public static DdlPackBean packHqlWmsVendorPlanner(WmsVendorPlanner vendorPlanner) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorPlanner.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorPlanner, packBean); + + return packBean; + } + + /** + * 供应商父子关系 条件封装 + * + * @param vendorRelation + * @return + */ + public static DdlPackBean packHqlWmsVendorRelation(WmsVendorRelation vendorRelation) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorRelation.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorRelation, packBean); + + return packBean; + } + + /** * 单位定义 * * @param wmsUnit @@ -2766,6 +2907,40 @@ public class WmsHqlPack { } /** + * 库区物料信息分页查询条件 + * + * @param itemCheck + * @return + */ + public static DdlPackBean packHqlWmsPartItemCheck(WmsPartItemCheck itemCheck) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(itemCheck.getPartNo(), "partNo", result); + + getStringBuilderPack(itemCheck, result); + + return result; + } + + /** + * BH子检测项分页查询条件 + * + * @param item + * @return + */ + public static DdlPackBean packHqlWmsBhChildDetectionItem(WmsBhChildDetectionItem item) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(item.getItemCheckCode(), "itemCheckCode", result); + DdlPreparedPack.getStringLikerPack(item.getItemCheckName(), "itemCheckName", result); + DdlPreparedPack.getStringEqualPack(item.getCheckTypeCode(), "checkTypeCode", result); + + getStringBuilderPack(item, result); + + return result; + } + + /** * 根据条件查询dataAuth * * @param wmsSnOperateRecord @@ -2810,7 +2985,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); - DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result); getStringBuilderPack(wmsFieldInfo, result); return result; } @@ -2921,4 +3096,380 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransportRule, result); return result; } + + /** + * 获取 DdlPackBean(三个基础) + * + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlWms(String organizeCode) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result; + } + + /** + * SO订单主表信息 分页查询 + * + * @param wmsDocSoMaster + * @return + */ + public static DdlPackBean packHqlWmsDocSoMaster(WmsDocSoMaster wmsDocSoMaster) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringRightLikerPack(wmsDocSoMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoMaster.getCustCode(), "custCode", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoMaster.getCustDeliveryCode(), "custDeliveryCode", result); + DdlPreparedPack.getNumEqualPack(wmsDocSoMaster.getOrderStatus(), "orderStatus", result); + getStringBuilderPack(wmsDocSoMaster, result); + + return result; + } + + /** + * SO订单明细表 分页查询 + * + * @param wmsDocSoDetails + * @return + */ + public static DdlPackBean packHqlWmsDocSoDetails(WmsDocSoDetails wmsDocSoDetails) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsDocSoDetails, result); + + return result; + } + + /** + * 导入模板信息分页查询条件 + * @param template + * @return + */ + public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result); + DdlPreparedPack.getStringLikerPack(template.getTemplateCode(), "templateCode", result); + DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result); + getStringBuilderPack(template, result); + return result; + } + + /** + * 导入模板明细信息分页查询条件 + * @param details + * @return + */ + public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result); + getStringBuilderPack(details, result); + return result; + } + + /** + * 检测结果汇总表 分页查询 + * + * @param wmsTestResultSummary + * @return + */ + public static DdlPackBean packHqWmsTestResultSummary(WmsTestResultSummary wmsTestResultSummary) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkStatus(), "reworkStatus", result); + if (wmsTestResultSummary.getIsQualified() != null) { + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getIsQualified(), "isQualified", result); + } + + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getBhCode(), "bhCode", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result); + if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(), + wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true); + } + + if (StringUtils.isNotBlank(wmsTestResultSummary.getModifyDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(), + wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true); + } + getStringBuilderPack(wmsTestResultSummary, result); + + return result; + } + + /** + * 检测结果明细表 分页查询 + * + * @param wmsTestResultDetails + * @return + */ + public static DdlPackBean packHqWmsTestResultDetails(WmsTestResultDetails wmsTestResultDetails) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result); + if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsTestResultDetails.getCreateDateTimeStart(), + wmsTestResultDetails.getCreateDateTimeEnd(), "createDatetime", result, true); + } + + if (StringUtils.isNotBlank(wmsTestResultDetails.getModifyDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsTestResultDetails.getModifyDateTimeStart(), + wmsTestResultDetails.getModifyDateTimeEnd(), "modifyDateTime", result, true); + } + + + getStringBuilderPack(wmsTestResultDetails, result); + + return result; + } + + /** + * 根据条件分页查询物料检测大类 + * + * @param checkType + * @return + */ + public static DdlPackBean packHqlWmsPartCheckType(WmsPartCheckType checkType) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(checkType.getCheckTypeCode(), "checkTypeCode", result); + getStringBuilderPack(checkType, result); + return result; + } + + /** + * 模板信息分页查询条件 + * @param thymeleaf + * @return + */ + public static DdlPackBean packHqlWmsThymeleaf(WmsThymeleaf thymeleaf) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(thymeleaf.getTlCode(), "tlCode", result); + DdlPreparedPack.getStringLikerPack(thymeleaf.getTlDesc(), "tlDesc", result); + getStringBuilderPack(thymeleaf, result); + return result; + } + + /** + * 仓库健康指标信息分页查询条件 + * @param healthIndicator + * @return + */ + public static DdlPackBean packHqlWmsHealthIndicator(WmsHealthIndicator healthIndicator) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(healthIndicator.getIndicatorCode(), "indicatorCode", result); + DdlPreparedPack.getStringLikerPack(healthIndicator.getIndicatorName(), "indicatorName", result); + DdlPreparedPack.getStringLikerPack(healthIndicator.getGroupName(), "groupName", result); + getStringBuilderPack(healthIndicator, result); + return result; + } + + /** + * 仓库健康指标分级信息分页查询条件 + * @param healthIndicatorLevel + * @return + */ + public static DdlPackBean packHqlWmsHealthIndicatorLevel(WmsHealthIndicatorLevel healthIndicatorLevel) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(healthIndicatorLevel.getIndicatorCode(), "indicatorCode", result); + getStringBuilderPack(healthIndicatorLevel, result); + return result; + } + + /** + * 仓库健康指标分级信息分页查询条件 + * @param wmsHealthVariable + * @return + */ + public static DdlPackBean packHqlWmsHealthVariable(WmsHealthVariable wmsHealthVariable) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsHealthVariable.getVariableCode(), "variableCode", result); + DdlPreparedPack.getStringLikerPack(wmsHealthVariable.getVariableName(), "variableName", result); + getStringBuilderPack(wmsHealthVariable, result); + return result; + } + + /** + * 仓库健康指标测算结果信息查询条件 + * @param healthIndicatorResult + * @return + */ + public static DdlPackBean packHqlWmsHealthIndicatorResult(WmsHealthIndicatorResult healthIndicatorResult) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getIndicatorCode(), "indicatorCode", result); + DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getCreateDatetime(), "createDatetime", result); + getStringBuilderPack(healthIndicatorResult, result); + return result; + } + + /** + * 仓库健康指标变量测算结果信息查询条件 + * @param healthVariableResult + * @return + */ + public static DdlPackBean packHqlWmsHealthVariableResult(WmsHealthVariableResult healthVariableResult) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(healthVariableResult.getVariableCode(), "variableCode", result); + getStringBuilderPack(healthVariableResult, result); + return result; + } + + /** + * 物流运费记录明细查询条件 + * + * @param logisticExpenseRecordsDetails 物流运费记录明细 + * @return + */ + public static DdlPackBean packHqlLogisticExpenseRecordsDetails(WmsLogisticExpenseRecordsDetails logisticExpenseRecordsDetails) { + DdlPackBean result = WmsHqlPack.packHqlWms(logisticExpenseRecordsDetails.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(logisticExpenseRecordsDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(logisticExpenseRecordsDetails.getPartName(), "partName", result); + DdlPreparedPack.getStringEqualPack(logisticExpenseRecordsDetails.getOrderNo(), "orderNo", result); + getStringBuilderPack(logisticExpenseRecordsDetails, result); + return result; + } + + /** + * 物流运费记录查询条件 + * + * @param logisticExpenseRecords 物流运费记录 + * @return + */ + public static DdlPackBean packHqlLogisticExpenseRecords(WmsLogisticExpenseRecords logisticExpenseRecords) { + DdlPackBean result = WmsHqlPack.packHqlWms(logisticExpenseRecords.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getLogisticsVendorNo(), "logisticsVendorNo", result); + DdlPreparedPack.getNumEqualPack(logisticExpenseRecords.getTransportType(), "transportType", result); + DdlPreparedPack.getNumEqualPack(logisticExpenseRecords.getBusiType(), "busiType", result); + DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getShippingFlag(), "shippingFlag", result); + DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getOrderNo(), "orderNo", result); + getStringBuilderPack(logisticExpenseRecords, result); + return result; + } + + + + /** + * 产品条码事务查询条件 + * + * @param wmsSerialSnTrans + * @return + */ + public static DdlPackBean packHqlWmsSerialSnTrans(WmsSerialSnTrans wmsSerialSnTrans) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsSerialSnTrans.getBatchNo(), "batchNo", packBean); + DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(), "transType", packBean); + getStringBuilderPack(wmsSerialSnTrans, packBean); + return packBean; + } + + /** + * 装车单 传输类 + * + * @param model + * @return + */ + public static DdlPackBean packHqlTmsShip(WmsTmsShipDto model) { + + DdlPackBean packBean = WmsHqlPack.packHqlWms(model.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(model.getOrderStatus(), "orderStatus", packBean); + DdlPreparedPack.getStringEqualPack(model.getMoveNo(), "moveNo", packBean); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.FALSE}, + new String[]{"createDatetime"}, packBean); + return packBean; + } + + /** + * BH检测大类表查询条件 + * + * @param qmsStockSnExtBh + * @return + */ + public static DdlPackBean packHqlQmsStockSnExtBh(QmsStockSnExtBh qmsStockSnExtBh) { + + DdlPackBean packBean = new DdlPackBean(); +/* DdlPreparedPack.getStringEqualPack(qmsStockSnExtBh.getBatchNo(), "batchNo", packBean); + DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(),"transType",packBean); + getStringBuilderPack(wmsSerialSnTrans, packBean);*/ + return packBean; + } + + /** + * 自动化策略主表 分页查询 + * + * @param wmsAutoStrategyMaster + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyMaster(WmsAutoStrategyMaster wmsAutoStrategyMaster) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyMaster.getStrategyNo(), "strategyNo", result); + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyMaster.getStrategyName(), "strategyName", result); + DdlPreparedPack.getNumEqualPack(wmsAutoStrategyMaster.getStrategyType(), "strategyType", result); + DdlPreparedPack.getStringEqualPack(wmsAutoStrategyMaster.getRoutingCode(), "routingCode", result); + if (StringUtils.isNotBlank(wmsAutoStrategyMaster.getStartEffectDate()) && StringUtils.isNotBlank(wmsAutoStrategyMaster.getEndEffectDate())) { + result.setWhereAppend(result.getWhereAppend() + " and (startEffectDate >= '"+wmsAutoStrategyMaster.getStartEffectDate()+"' and endEffectDate <= '"+wmsAutoStrategyMaster.getEndEffectDate()+"' )"); + } + + getStringBuilderPack(wmsAutoStrategyMaster, result); + + return result; + } + + /** + * 自动化策略明细表 分页查询 + * + * @param wmsAutoStrategyDetail + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyDetail(WmsAutoStrategyDetail wmsAutoStrategyDetail) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyDetail.getAutoStrategyNo(), "autoStrategyNo", result); + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyDetail.getStrategyItemNo(), "strategyItemNo", result); + + getStringBuilderPack(wmsAutoStrategyDetail, result); + + return result; + } + + /** + * 自动化策略方法 分页查询 + * + * @param WmsAutoStrategyMethod + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyMethod(WmsAutoStrategyMethod WmsAutoStrategyMethod) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getNumEqualPack(WmsAutoStrategyMethod.getStrategyAction(), "strategyAction", result); + DdlPreparedPack.getStringLikerPack(WmsAutoStrategyMethod.getStrategyMethod(), "strategyMethod", result); + DdlPreparedPack.getStringLikerPack(WmsAutoStrategyMethod.getStrategySpec(), "strategySpec", result); + + getStringBuilderPack(WmsAutoStrategyMethod, result); + + return result; + } } diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5fcd08a..15d36cd 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 ff1cd2d..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,8 @@ modules/i3plus-pojo-aps modules/i3plus-pojo-lac modules/i3plus-pojo-ptl + modules/i3plus-pojo-ics + modules/i3plus-pojo-mdm @@ -58,7 +60,20 @@ io.springfox springfox-swagger2 2.9.2 + + + io.swagger + swagger-models + + + + + io.swagger + swagger-models + 1.5.21 + + io.springfox springfox-swagger-ui diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,11 +6,11 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ #sonar.java.binaries=target # Encoding of the source code. Default is default system encoding -sonar.sourceEncoding=UTF-8 \ No newline at end of file +sonar.sourceEncoding=UTF-8