Merge remote-tracking branch 'origin/dev' into dev

yun-zuoyi
汪云昊 4 years ago
commit 718466b8df

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -25,6 +27,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ACTION_MODULE")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("作业组件")
public class AndonActionModule extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ACTION_MODULE_GROUP")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("组件集")
public class AndonActionModuleGroup extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ACTION_MODULE_PARAM")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("组件参数")
public class AndonActionModuleParam extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ACTION_ROUTE")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("作业流程")
public class AndonActionRoute extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ACTOR")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ACTOR信息")
public class AndonActor extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ACTOR_RULE")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ACTOR消息类型配置")
public class AndonActorRule extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api(value = "ANDON_呼叫原因")
public class AndonAlarmCause extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,6 +30,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯子类型")
public class AndonAlarmDetailType extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,6 +30,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_呼叫通知配置")
public class AndonAlarmResponseCfg extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ALARM_ROUTE")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯作业流程配置")
public class AndonAlarmRoute extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯作业流程组件参数")
public class AndonAlarmRouteModuleParam extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ALARM_TYPE")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯类型")
public class AndonAlarmType extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -25,6 +27,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_AREA_ALARM_TYPE")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("区域安灯类型")
public class AndonAreaAlarmType extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="ANDON_BROADCAST")
@Api("安灯广播")
public class AndonBroadCast extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="ANDON_BROADCAST_CFG")
@Api("生产区域")
public class AndonBroadCastCfg extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_工作单元呼叫原因配置")
public class AndonCellAlarmCause extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_工作单元事件原因配置")
public class AndonCellEventCause extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_工作单元处理方法配置")
public class AndonCellEventMethod extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_工作单元事件现象")
public class AndonCellEventPhenomenon extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.Interceptor;
import org.hibernate.annotations.DynamicInsert;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_工位分组配置")
public class AndonCellGroupCfg extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -25,6 +27,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="ANDON_CONFIG")
@Api(value="系统配置")
public class AndonConfig extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_自处理配置")
public class AndonDisposalCfg extends BaseBean implements Serializable {

@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("Andon自处理维护配置")
public class AndonDisposalMaintenCfg extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api(value = "ANDON_事件原因")
public class AndonEventCause extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api(value = "ANDON_事件处理方法")
public class AndonEventMethod extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -29,6 +31,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_事件现象")
public class AndonEventPhenoMenon extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -34,6 +36,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯队列")
public class AndonHaltCfg extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_停机类型")
public class AndonHaltType extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON知识库")
public class AndonKnowledgeBase extends BaseManageQueue implements Serializable {

@ -8,6 +8,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.apache.commons.beanutils.BeanUtils;
import org.hibernate.annotations.DynamicInsert;
@ -41,6 +43,7 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯队列")
public class AndonManageQueue extends BaseManageQueue implements Serializable {

@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -36,6 +38,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("去去去去去去去去去安灯记录")
public class AndonManageRecord extends BaseManageQueue implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("通知记录")
public class AndonMessageRecord extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_MESSAGE_TYPE")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("消息类型")
public class AndonMessageType extends BaseBean implements Serializable {

@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -30,6 +32,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯PLC控制")
public class AndonPLC extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -34,6 +36,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯PLC监控记录")
public class AndonPLCRecord extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -25,6 +27,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="ANDON_PLC_COLOR_CFG")
@Api(value="PLC三色灯控制")
public class AndonPlcColorCfg extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -25,6 +27,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="ANDON_MANAGE_ATTACH")
@Api(value="安灯附属表")
public class AndonQueueAttach extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,6 +30,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("通知方式")
public class AndonResponse extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,6 +30,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯通知对象")
public class AndonResponseObject extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,6 +30,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_上升流程配置")
public class AndonRiteRoute extends BaseBean implements Serializable {

@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,6 +30,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ANDON_上升配置明细")
public class AndonRiteRouteDetail extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ROUTE_MODULE_PARAM")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("流程组件参数")
public class AndonRouteModuleParam extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -27,6 +29,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ROUTE_STATUS")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("流程状态")
public class AndonRouteStatus extends BaseBean implements Serializable {

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -22,6 +24,7 @@ import java.io.Serializable;
@DynamicUpdate
@Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD")
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("流程状态异常记录")
public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable {

@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -31,6 +33,7 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean implements Serializable {

@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -31,6 +33,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="MES_EQUIPMENT")
@Api("生产设备")
public class MesEquipment extends BaseBean implements Serializable {

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -26,6 +28,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="MES_SHIFT")
@Api("班次信息")
public class MesShift extends BaseBean implements Serializable {

@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -30,6 +32,7 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_WORK_CELL")
@Api("工作单元")
public class MesWorkCell extends BaseBean implements Serializable {

@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -30,6 +32,7 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_WORK_CENTER")
@Api("工作中心")
public class MesWorkCenter extends BaseBean implements Serializable {

@ -2099,7 +2099,8 @@ public class MesEnumUtil {
MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"),
MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"),
MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"),
MES_JISA(640, "jisaExcelService", "JISA导入");
MES_JISA(640, "jisaExcelService", "JISA导入"),
MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入");
private int value;
private String service;
@ -3126,6 +3127,41 @@ public class MesEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_STEP_PARAM_IS_NEED {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
MES_STEP_PARAM_IS_NEED(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -3702,8 +3738,7 @@ public class MesEnumUtil {
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
REDO(60, "重做"),
CLOSE(90, "关闭"),
;
CLOSE(90, "关闭");
private int value;
private String description;
@ -5584,6 +5619,7 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum VALUE_TYPE {
MANUAL_ASSIGNMENT("10", "手工赋值"),
SPEL_EXPRESSION("20", "spel表达式"),
FUNCTION_ASSIGNMENT("30", "函数赋值"),

@ -18,7 +18,8 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_CHECK_DATA_TYPE {
ALL_DATA(1, "所有数据"),
LAST_DATA(2, "最后一条数据");
LAST_DATA(2, "最后一条数据"),
ALL_DATA_AND_LAST_DATA(3, "所有数据且最后一条数据必须合格");
private int value;
private String description;
@ -354,7 +355,7 @@ public class MesPcnEnumUtil {
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
PCN_SYS_ALL_LANGUAGE_URL(220, "PCN_SYS_ALL_LANGUAGE_URL", "PCN_SYS_ALL_LANGUAGE_URL"),
PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"),
SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes");
@ -456,7 +457,8 @@ public class MesPcnEnumUtil {
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"),
SCAN_CT_NO_TYPE("SCAN_CT_NO_TYPE", "料架号扫描校验类型值");
private String value;
private String description;
@ -2681,7 +2683,8 @@ public class MesPcnEnumUtil {
ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"),
ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"),
TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"),
MESSAGE_POOL("messagePool", "消息池");
MESSAGE_POOL("messagePool", "消息池"),
FORCE_LOGOUT("forceLogout", "websocket强制下线");
private String value;
private String description;
@ -6009,6 +6012,7 @@ public class MesPcnEnumUtil {
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {

@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class SwebEnumUtil {
/**
* (ASN,PO,MOVE,QC)
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_MASTER_STATUS {
@ -142,8 +142,7 @@ public class SwebEnumUtil {
public enum ORDER_SN_STATUS {
CREATE(10, "N", "创建"),
RECEIPTED(20, "R", "已完成"),
CANCEL(30, "C", "行取消"),
PRINTED(40, "C", "已打印");
CANCEL(30, "C", "行取消");
private int value;
private String code;
@ -189,6 +188,126 @@ public class SwebEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MOVEMENT_MASTER_STATUS {
CREATE(10, "CREATE", "新建"),
PRINTED(20, "PRINTED", "已打印"),
DELIVERY(30, "DELIVERY", "已发货");
private int value;
private String code;
private String description;
MOVEMENT_MASTER_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static int codeOf(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MOVEMENT_DETAILS_STATUS {
CREATE(10, "CREATE", "新建"),
PRINTED(20, "PRINTED", "已打印"),
DELIVERY(30, "DELIVERY", "已发货");
private int value;
private String code;
private String description;
MOVEMENT_DETAILS_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static int codeOf(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* PO
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

@ -801,7 +801,7 @@ public class WmsEnumUtil {
SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR
SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货(DMR)"),//默认DMR
CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
@ -869,8 +869,9 @@ public class WmsEnumUtil {
WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
OTHER_IN(730, "OTHER_IN", "其它入库"),
OTHER_OUT(740, "OTHER_OUT", "其它出库"),
COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"),
SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR
private int value;
private String code;
@ -1655,6 +1656,11 @@ public class WmsEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -5096,6 +5102,7 @@ public class WmsEnumUtil {
public enum WORK_ORDER_PLAN_STATUS {
CREATE(10, "CREATE", "创建"),
PLANNED(20, "PLANNED", "处理中"),
FINISH(25, "FINISH", "已完成"),
CLOSE(30, "CLOSE", "已关闭");
private int value;
@ -5140,6 +5147,59 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
* 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_PLAN_TYPE {
REPORT(10, "REPORT", "生产报工"),
PACKING(20, "PACKING", "打箱包装");
private int value;
private String code;
private String description;
WORK_ORDER_PLAN_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;
}
}
/**
*
* 2

@ -86,7 +86,7 @@ public class DdlPreparedPack {
* @param isShowTime
*/
public static void timeBuilder(String date, String columnName, DdlPackBean packBean, Boolean showTaday, boolean isShowTime) {
if (date != null && date.trim().length() > 0) {
if (date != null && date.trim().length() > 2) {
String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
if (date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) {
//只有一个逗号

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -1,105 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\14 19:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_DISMENTLE_RECORD")
@Api("物料拆解表")
public class IfDismantleRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -6010207359066736962L;
@Column(name = "DISMANTLE_ID")
@ApiParam("拆解编号")
private String dismantleId;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "PARENT_PART_NO")
@ApiParam("产品物料编码")
private String parentPartNo;
@Column(name = "PARENT_PART_NAME")
@ApiParam("产品物料名称")
private String parentPartName;
@Column(name = "SN")
@ApiParam("产品条码")
private String sn;
@Column(name = "QTY")
@ApiParam("产品数量")
private Double qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")
private BigDecimal dismantleQty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料编码")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("子物料名称")
private String itemPartName;
@Column(name = "OK_QTY")
@ApiParam("合格数")
private BigDecimal okQty;
@Column(name = "MISS_QTY")
@ApiParam("缺失数")
private BigDecimal missQty;
@Column(name = "SCRAP_QTY")
@ApiParam("报废数")
private BigDecimal scrapQty;
@Column(name = "LOT_NO")
@ApiParam("批次")
private String lotNo;
@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;
}

@ -1,100 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PACKAGE_DETAIL")
@Api("包装明细表")
public class IfPackageDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -1873101288426218272L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@Column(name = "LOT_NO")
@ApiParam("包装批次")
private String lotNo;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编号2")
private String packageNo2;
@Column(name = "PACKAGE_NO3")
@ApiParam("包装编号3")
private String packageNo3;
@Column(name = "PACKAGE_NO4")
@ApiParam("包装编号4")
private String packageNo4;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
}

@ -1,88 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\15 10:12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PRODUCT_OFF_LINE")
@Api("生产报工表")
public class IfProductOffLine extends BaseBean implements Serializable {
private static final long serialVersionUID = 200629529131241418L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "UNIT")
@ApiParam("单位")
private String unit;
@Column(name = "LOT_NO")
@ApiParam("生产批次")
private String lotNo;
@Column(name = "FIX_LOT_NO")
@ApiParam("特殊批次")
private String fixLotNo;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

@ -1,48 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION")
@Api("mes系统业务动作")
public class MesAction extends BaseBean implements Serializable {
private static final long serialVersionUID = -6451213228967727835L;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "ACTION_NAME")
@ApiParam("动作名称")
private String actionName;
@Column(name = "ACTION_TYPE")
@ApiParam("动作类型")
private Integer actionType;
public int getActionTypeVal() {
return this.actionType == null ? 0 : this.actionType;
}
}

@ -1,40 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION_IF")
@Api("动作接口配置")
public class MesActionIf extends BaseBean implements Serializable {
private static final long serialVersionUID = -5058215339453766620L;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

@ -1,49 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION_METHOD")
@Api("系统业务动作方法")
public class MesActionMethod extends BaseBean implements Serializable {
private static final long serialVersionUID = 6249418690993577108L;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "METHOD_CODE")
@ApiParam("方法代码")
private String methodCode;
@Column(name = "SEQ")
@ApiParam("序号")
private Integer seq;
public int getSeqVal() {
return this.seq == null ? 0 : this.seq;
}
}

@ -1,59 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean implements Serializable {
private static final long serialVersionUID = 1047604067591557689L;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "AREA_NAME")
@ApiParam("区域名称")
private String areaName;
@Transient
@ApiParam(value = "子集列表")
private List<MesWorkCenter> childTreeList;
@Transient
@ApiParam(value = "名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value = "父节点", access = "父节点", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

@ -1,90 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :BOM
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOM")
@Api("BOM清单")
public class MesBom extends BaseBean implements Serializable {
private static final long serialVersionUID = -1772273641263268564L;
@Column(name = "PART_NO")
@ApiParam("父零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("父零件名称")
private String partName;
@Column(name = "UNIT")
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子零件")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("子零件名称")
private String itemPartName;
@Column(name = "ITEM_UNIT")
@ApiParam(value = "子零件单位")
private String itemUnit;
@Column(name = "ITEM_QTY")
@ColumnDefault("0")
@ApiParam(value = "子零件数量", example = "0")
private Double itemQty;
@Column(name = "BOM_VERSION")
@ApiParam(value = "BOM版本")
private String bomVersion;
@Column(name = "EFF_START_TIME")
@ApiParam(value = "生效时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effStartTime;
@Column(name = "EFF_END_TIME")
@ApiParam(value = "失效时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effEndTime;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
public double getitemQtyVal() {
return this.itemQty == null ? 0.0d : this.itemQty;
}
}

@ -1,45 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/16 0016 - 15:09
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CACHA_QUEUE")
@Api("MES缓存队列")
public class MesCachaQueue extends BaseBean implements Serializable {
private static final long serialVersionUID = 8272649623030195332L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "CACHA_TYPE")
@ApiParam("缓存类型")
private String cachaType;
}

@ -1,79 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Version;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : Wynne.Lu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED")
@Api("工位投料信息")
public class MesCellFeed extends BaseBean implements Serializable {
private static final long serialVersionUID = 2412657464618960515L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name = "RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("特殊批次")
private Double rawQty;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")
// public Integer lockVersion;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
}

@ -1,74 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED_RECORD")
@Api("工位投料履历信息")
public class MesCellFeedRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971379489107783L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name = "RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("原材料数量")
private Double rawQty;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
}

@ -1,56 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : crish
* @CreateDate : 2019-06-04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CONFIG")
@Api("mes配置表")
public class MesConfig extends BaseBean implements Serializable {
private static final long serialVersionUID = -5759669472714287000L;
@Column(name = "CFG_CODE")
@ApiParam("配置代码")
private String cfgCode;
@Column(name = "CFG_NAME")
@ApiParam("配置名称")
private String cfgName;
@Column(name = "CFG_TYPE")
@ApiParam("配置类型")
private String cfgType;
@Column(name = "CFG_KEY")
@ApiParam("配置key")
private String cfgKey;
@Column(name = "CFG_VALUE")
@ApiParam("配置value")
private String cfgValue;
@Column(name = "CFG_VAULE_DESC")
@ApiParam("配置value描述")
private String cfgValueDesc;
}

@ -1,40 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUST_PROD_LINE")
@Api("客户产线代码")
public class MesCustProdLine extends BaseBean implements Serializable {
private static final long serialVersionUID = 3049432665592161513L;
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name = "CUST_PROD_LINE_NAME")
@ApiParam("客户产线名称")
private String custProdLineName;
}

@ -1,56 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes
* @Reference :
* @Author : crish
* @CreateDate : 2019-04-22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUSTOMER")
@Api("客户信息")
public class MesCustomer extends BaseBean implements Serializable {
private static final long serialVersionUID = 167635887082538926L;
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
@Column(name = "CUSTOMER_NAME")
@ApiParam("客户名称")
private String customerName;
@Column(name = "BRIEF_TEXT")
@ApiParam("客户简称")
private String briefText;
@Column(name = "ADDRESS")
@ApiParam("客户地址")
private String address;
@Column(name = "CONTACT")
@ApiParam("客户联系人")
private String contact;
@Column(name = "TELEPHONE")
@ApiParam("客户电话")
private String telephone;
}

@ -1,49 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes
* @Reference :
* @Author : yiming.gu
* @CreateDate : 2019-05-20
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUSTOMER_PART")
@Api("客户零件关系")
public class MesCustomerPart extends BaseBean implements Serializable {
private static final long serialVersionUID = -4731252848471949263L;
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "CUSTOMER_PART_NO")
@ApiParam("客户零件号")
private String customerPartNo;
@Column(name = "CUSTOMER_PART_NAME")
@ApiParam("客户零件描述")
private String customerPartName;
}

@ -1,71 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/24 7:12 PM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DATA_OBJECT")
@Api("数据对象")
public class MesDataObject extends BaseBean implements Serializable {
private static final long serialVersionUID = -1419262751765770535L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@Column(name = "DS_CODE")
@ApiParam("数据源代码")
private String dsCode;
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@Column(name = "FIELD_PK")
@ApiParam("主键")
private String fieldPk;
@Column(name = "READ_FLAG_VALUE")
@ApiParam("读取标志值")
private String readFlagValue;
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "SELF_ADDITION")
@ApiParam("自增列")
private String selfAddition;
@Column(name = "SELF_ADDITION_VALUE")
@ApiParam("自增列值")
private Long selfAdditionValue;
}

@ -1,82 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/24 7:17 PM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DATASOURCE")
@Api("地址清单")
public class MesDatasource extends BaseBean implements Serializable {
private static final long serialVersionUID = -7387559860198655900L;
@Column(name = "DS_CODE")
@ApiParam("数据源代码")
private String dsCode;
@Column(name = "DS_NAME")
@ApiParam("数据源名称")
private String dsName;
@Column(name = "DS_TYPE")
@ApiParam("数据源类型")
private String dsType;
@Column(name = "DS_HOST")
@ApiParam("主机")
private String dsHost;
@Column(name = "DS_PORT")
@ApiParam("端口")
private Integer dsPort;
@Column(name = "DS_USER")
@ApiParam("用户名")
private String dsUser;
@Column(name = "DS_PASSWORD")
@ApiParam("密码")
private String dsPassword;
@Column(name = "DS_DB_NAME")
@ApiParam("数据库名称")
private String dsDbName;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Override
public String toString() {
return "MesDatasource{" +
"dsCode='" + dsCode + '\'' +
", dsName='" + dsName + '\'' +
", dsType='" + dsType + '\'' +
", dsHost='" + dsHost + '\'' +
", dsPort=" + dsPort +
", dsUser='" + dsUser + '\'' +
", dsPassword='" + dsPassword + '\'' +
", dsDbName='" + dsDbName + '\'' +
", equipmentCode='" + equipmentCode + '\'' +
'}';
}
}

@ -1,81 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:25
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT")
@Api("缺陷表")
public class MesDefect extends BaseBean implements Serializable {
private static final long serialVersionUID = -6771813937279359333L;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "DEFECT_TYPE")
@ApiParam("缺陷类型")
private String defectType;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "DEFECT_FLAG_VALUE")
@ApiParam("缺陷标识值")
private String defectFlagValue;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private String defectActionType;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;
@Transient
@ApiParam("缺陷位置")
private String defectLocation;
@Transient
@ApiParam("缺陷类型子集")
private List<MesDefect> mesDefectList;
public MesDefect() {
}
public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) {
this.defectCode = defectCode;
this.defectName = defectName;
this.defectType = defectType;
this.defectTypeName = defectTypeName;
}
}

@ -1,44 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:28
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT_CAUSE")
@Api("缺陷原因表")
public class MesDefectCause extends BaseBean implements Serializable {
private static final long serialVersionUID = -3867250593038812861L;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因名称")
private String dcName;
@Column(name = "DC_TYPE")
@ApiParam("缺陷原因类型")
private String dcType;
}

@ -1,80 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 19:53
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("不良信息记录表")
public class MesDefectRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -2828208776424343584L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置")
private String defectLocation;
@Column(name = "SIDE_LOCATION")
@ApiParam("面位")
private String sideLocation;
@Column(name = "REPAIR_STATUS")
@ApiParam("维修状态")
private Integer repairStatus;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
private List<MesDefect> mesDefectList;
}

@ -1,97 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 15:03
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DISMANTLE_RECORD", indexes = {
@Index(columnList = "SN"),
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("物料拆解记录表")
public class MesDismantleRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -7924346039878218038L;
@Column(name = "DISMANTLE_ID")
@ApiParam("拆解编号")
private String dismantleId;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "PARENT_PART_NO")
@ApiParam("产品物料编码")
private String parentPartNo;
@Column(name = "PARENT_PART_NAME")
@ApiParam("产品物料名称")
private String parentPartName;
@Column(name = "SN")
@ApiParam("产品条码")
private String sn;
@Column(name = "QTY")
@ApiParam("产品数量")
private Double qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")
private BigDecimal dismantleQty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料编码")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("子物料名称")
private String itemPartName;
@Column(name = "OK_QTY")
@ApiParam("合格数")
private BigDecimal okQty;
@Column(name = "MISS_QTY")
@ApiParam("缺失数")
private BigDecimal missQty;
@Column(name = "SCRAP_QTY")
@ApiParam("报废数")
private BigDecimal scrapQty;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Transient
private String serialNumber;
}

@ -1,53 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/9/23 18:47
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_ALARM_RECORD", indexes = {
@Index(columnList = "WORK_CENTER_CODE")
})
@Api("设备自动报警记录表")
public class MesEquAlarmRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1675134362612851879L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "ALARM_LEVEL")
@ApiParam("报警等级")
private Integer alarmLevel;
@Column(name = "ALARM_START_TIME")
@ApiParam("报警开始时间")
private String alarmStartTime;
@Column(name = "ALARM_STOP_TIME")
@ApiParam("报警开始时间")
private String alarmStopTime;
}

@ -1,97 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQUIPMENT")
@Api("生产设备")
public class MesEquipment extends BaseBean implements Serializable {
private static final long serialVersionUID = 7269069290035250108L;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name = "EQUIPMENT_NAME")
@ApiParam("设备名称")
private String equipmentName;
@Column(name = "STATUS")
@ApiParam("设备状态")
private Integer status;
@Column(name = "EQUIPMENT_TYPE")
@ApiParam("设备类型")
private Integer equipmentType;
@Column(name = "EQUIPMENT_CATEGORY")
@ApiParam("设备类别")
private String equipmentCategory;
@Column(name = "EQUIPMENT_MODEL")
@ApiParam("型号")
private String equipmentModel;
@Column(name = "EQUIPMENT_SPEC")
@ApiParam("规格")
private String equipmentSpec;
@Column(name = "EQUIPMENT_MAKER")
@ApiParam("制造商")
private String equipmentMaker;
@Column(name = "RELEASE_DATE")
@ApiParam("出厂日期")
private String releaseDate;
@Column(name = "RECEIVE_DATE")
@ApiParam("接收日期")
private String receiveDate;
@Column(name = "ENABLE_DATE")
@ApiParam("启用日期")
private String enableDate;
@Column(name = "CONNECT_TYPE")
@ApiParam("连接类型")
private Integer connectType;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
@ApiParam(value = "名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value = "父节点", access = "父节点", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

@ -1,93 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/7/30 9:30 AM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesEsop extends BaseBean implements Serializable {
private static final long serialVersionUID = -4869646502033099294L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "STEP_CODE")
@ApiParam("工步代码")
private String stepCode;
@Column(name = "STEP_SEQ")
@ApiParam("工步序号")
private Integer stepSeq;
@Column(name = "FILE_ID")
@ApiParam("文件id")
private Long fileId;
@Transient
@ApiParam("文件名称")
private String fileName;
@Transient
@ApiParam("文件URL")
private String fileUrl;
@Transient
@ApiParam("组名")
private String groupName;
@Transient
@ApiParam("文件原名")
private String fileOriginName;
@Transient
@ApiParam("文件大小")
private String fileSize;
@Transient
@ApiParam("文件类型名称")
private String fileType;
@Transient
@ApiParam("同步标记")
private Integer syncTag = 0;
}

@ -1,52 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EVENT")
@Api("系统业务事件")
public class MesEvent extends BaseBean implements Serializable {
private static final long serialVersionUID = -5604724665202938464L;
@Column(name = "EVENT_CODE")
@ApiParam("事件代码")
private String eventCode;
@Column(name = "EVENT_NAME")
@ApiParam("事件名称")
private String eventName;
@Column(name = "EVENT_TYPE")
@ApiParam("事件类型")
private Integer eventType;
@Column(name = "BUTTON_CODE")
@ApiParam("按钮代码")
private String buttonCode;
public int getEventTypeVal() {
return this.eventType == null ? 0 : this.eventType;
}
}

@ -1,54 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EVENT_ACTION")
@Api("系统业务事件动作")
public class MesEventAction extends BaseBean implements Serializable {
private static final long serialVersionUID = 3964084375279916831L;
@Column(name = "EVENT_CODE")
@ApiParam("事件代码")
private String eventCode;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "SEQ")
@ApiParam("序号")
private Integer seq;
public int getSeqVal() {
return this.seq == null ? 0 : this.seq;
}
}

@ -1,47 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/10 8:37 PM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FI_CFG")
@Api("首检件配置")
public class MesFiCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 1791614973371037158L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private Double fiQty;
}

@ -1,59 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/12/4 1:28
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FILE")
@Api("文件表")
public class MesFile extends BaseBean implements Serializable {
private static final long serialVersionUID = 7017379708394714424L;
@Column(name = "FILE_NAME")
@ApiParam("文件名称")
private String fileName;
@Column(name = "FILE_URL")
@ApiParam("文件URL")
private String fileUrl;
@Column(name = "GROUP_NAME")
@ApiParam("组名")
private String groupName;
@Column(name = "FILE_ORIGIN_NAME")
@ApiParam("文件原名")
private String fileOriginName;
@Column(name = "FILE_SIZE")
@ApiParam("文件大小")
private String fileSize;
@Column(name = "FILE_TYPE")
@ApiParam("文件类型名称")
private String fileType;
@Column(name = "SYNC_TAG")
@ApiParam("同步标记")
private Integer syncTag = 0;
}

@ -1,65 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : crish
* @CreateDate : 2019-05-15
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_KP_DATA")
@Api("生产区域")
public class MesKpData extends BaseBean implements Serializable {
private static final long serialVersionUID = -3332582267186642790L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "KEY_DATA_CODE")
@ApiParam("关键数据代码")
private String keyDataCode;
@Column(name = "KEY_DATA_NAME")
@ApiParam("关键数据名称")
private String keyDataName;
@Column(name = "KEY_DATA_COUNT")
@ApiParam("关键数据数量")
private Integer keyDataCount;
@Column(name = "UPPER_LIMIT")
@ApiParam("数据上限")
private Double upperLimit;
@Column(name = "LOWER_LIMIT")
@ApiParam("数据下限")
private Double lowerLimit;
@Transient
@ApiParam("扭矩值")
private Double torqueValue;
@Transient
@ApiParam("是否在范围之内")
private Boolean ok;
}

@ -1,95 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-16-17:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_KPSN_RULE")
@Api("关键件条码校验规则")
public class MesKpsnRule extends BaseBean implements Serializable {
private static final long serialVersionUID = 8238308232531730720L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "LENGTH")
@ApiParam("长度")
private Integer length;
@Column(name = "FROM1")
@ApiParam("起始1")
private Integer from1;
@Column(name = "TO1")
@ApiParam("至1")
private Integer to1;
@Column(name = "FIX1")
@ApiParam("内容1")
private String fix1;
@Column(name = "FROM2")
@ApiParam("起始2")
private Integer from2;
@Column(name = "TO2")
@ApiParam("至2")
private Integer to2;
@Column(name = "FIX2")
@ApiParam("内容2")
private String fix2;
@Column(name = "TYPE")
@ApiParam("类型")
private String type;
@Column(name = "BIND_RULE")
@ApiParam("绑定规则")
private Integer bandRule;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public int getLengthVal() {
return this.length == null ? 0 : this.length;
}
public int getFrom1Val() {
return this.from1 == null ? 0 : this.from1;
}
public int getTo1Val() {
return this.to1 == null ? 0 : this.to1;
}
public int getFrom2Val() {
return this.from2 == null ? 0 : this.from2;
}
public int getTo2Val() {
return this.to2 == null ? 0 : this.to2;
}
}

@ -1,54 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : crish
* @CreateDate : 2019-08-18 11:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LABEL_TEMPLATE")
@Api(value = "打印模板", description = "打印模板")
public class MesLabelTemplate extends BaseBean implements Serializable {
private static final long serialVersionUID = 3797103812377146878L;
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;
@Column(name = "TEMPLATE_NAME")
@ApiParam(value = "模板名称")
private String templateName;
@Lob
@Column(name = "TEMPLATE_CONTENT")
@ApiParam(value = "模板内容")
private String templateContent;
// 参数拼接,多参数都好分隔,后台在做处理
@ApiParam(value = "模板参数拼接")
@Transient
private String paramsPack;
@Transient
@ApiParam(value = "模板id对应的模板参数")
private List<MesLabelTemplateParam> labelTemplateParamList;
}

@ -1,55 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : crish
* @CreateDate : 2019-08-18 11:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LABEL_TEMPLATE_PARAM")
@Api(value = "打印模板参数", description = "打印模板参数")
public class MesLabelTemplateParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -3595706874099358555L;
@Column(name = "TEMPLATE_ID")
@ApiParam(value = "模板ID", access = "模板ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;
@Column(name = "TEMPLATE_PARAM")
@ApiParam(value = "模板参数")
private String templateParam;
@Lob
@Column(name = "TEMPLATE_PARAM_TEXT")
@ApiParam(value = "模板参数描述")
private String templateParamText;
// 参数拼接,多参数都好分隔,后台在做处理
@ApiParam(value = "模板参数值")
@Transient
private String templateParamValue;
}

@ -1,55 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_METHOD")
@Api("系统业务方法")
public class MesMethod extends BaseBean implements Serializable {
private static final long serialVersionUID = -3629909409034083767L;
@Column(name = "METHOD_CODE")
@ApiParam("方法代码")
private String methodCode;
@Column(name = "METHOD_NAME")
@ApiParam("方法名称")
private String methodName;
@Column(name = "CALL_CLASS")
@ApiParam("具体实现类")
private String callClass;
/**
* 10-20-ResultBean
*/
@Column(name = "METHOD_TYPE")
@ApiParam("方法类型")
private Integer methodType;
public int getMethodTypeVal() {
return this.methodType == null ? 0 : this.methodType;
}
}

@ -1,52 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/1/8 0008 - 17:11
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_MONITOR_TASK")
@Api("监听任务")
public class MesMonitorTask extends BaseBean implements Serializable {
private static final long serialVersionUID = -8614480099840448294L;
@Column(name = "TASK_NO")
@ApiParam("任务编号")
private String taskNo;
@Column(name = "TASK_NAME")
@ApiParam("任务名称")
private String taskName;
@Column(name = "TASK_OBJECT_TYPE")
@ApiParam("任务对象类型")
private Integer taskObjectType;
@Column(name = "TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
@Column(name = "TASK_EXCEPTION_DESC")
@ApiParam("异常描述")
private String taskExceptionDesc;
}

@ -1,48 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/1/8 0008 - 17:19
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_MONITOR_TASK_DETAIL")
@Api("监听任务明细")
public class MesMonitorTaskDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -4811270359386960747L;
@Column(name = "TASK_NO")
@ApiParam("任务编号")
private String taskNo;
@Column(name = "DATA_OBJECT_NO")
@ApiParam("数据对象编号")
private String dataObjectNo;
// @Column(name = "STORE_OBJECT_CODE")
// @ApiParam("存储对象代码")
// private String storeObjectCode;
//
// @Column(name = "STORE_FIELD_CODE")
// @ApiParam("存储字段代码")
// private String storeFieldCode;
}

@ -1,60 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/8/22 5:59 PM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_NUMBER_RULE")
@Api("条码生成规则")
public class MesNumberRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -4039194855353751178L;
@Column(name = "RULE_CODE")
@ApiParam("规则代码")
private String ruleCode;
@Column(name = "RULE_DESC")
@ApiParam("规则描述")
private String ruleDesc;
@Column(name = "PREFIX")
@ApiParam("前缀")
private String prefix;
@Column(name = "NUMBER_RULE")
@ApiParam("编码规则")
private String numberRule;
@Column(name = "SERIALNO_LENGTH")
@ApiParam("序号长度")
private Integer serialnoLength;
@Column(name = "SERIALNO_INCREMENT")
@ApiParam("增量")
private Integer serialnoIncrement;
@Column(name = "IS_CYCLE")
@ApiParam("最大值后循环")
private Integer isCycle;
}

@ -1,49 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Version;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/8/23 9:14 AM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_NUMBER_SERIALNO")
@Api("编码序号")
public class MesNumberSerialno extends BaseBean implements Serializable {
private static final long serialVersionUID = -3024166851634742872L;
@Column(name = "CURRENT_NUMBER_PREFIX")
@ApiParam("当前编号前缀")
private String currentNumberPrefix;
@Column(name = "CURRENT_SERIALNO")
@ApiParam("当前序号")
private Integer currentSerialno;
@Column(name = "CURRENT_NUMBER")
@ApiParam("当前编号")
private String currentNumber;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
}

@ -1,60 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/24 7:14 PM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_OBJECT_CFG")
@Api("对象结构")
public class MesObjectCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -3640782210450491835L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "FIELD_CODE")
@ApiParam("字段代码")
private String fieldCode;
@Column(name = "FIELD_NAME")
@ApiParam("字段名称")
private String fieldName;
@Column(name = "FIELD_TYPE")
@ApiParam("字段类型")
private String fieldType;
@Column(name = "FIELD_LENGTH")
@ApiParam("列长度")
private Integer fieldLength;
@Column(name = "POJO_ATTR")
@ApiParam("对应的pojo属性")
private String pojoAttr;
@Column(name = "IS_SAVE")
@ApiParam("是否保存 1存 2不存")
private Integer isSave;
}

@ -1,62 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :PLC
* @Reference :
* @Author : Crish
* @CreateDate : 2019-05-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
@Deprecated
public class MesPLCConfigure extends BaseBean implements Serializable {
private static final long serialVersionUID = 8274445475806774L;
@Column(name = "IP")
@ApiParam("设备ip")
private String ipAddress;
@Column(name = "CHANNEL_NAME")
@ApiParam("通道名称")
private String channelName;
@Column(name = "DEVICE_NAME")
@ApiParam("设备地址")
private String deviceName;
@Column(name = "TAG_NAME")
@ApiParam("标签地址")
private String tagName;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
}

@ -1,99 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACK_SPEC")
@Api("包装规格")
public class MesPackSpec extends BaseBean implements Serializable {
private static final long serialVersionUID = -788654193624068327L;
@Column(name = "SPEC_CODE")
@ApiParam("包装规格代码")
private String specCode;
@Column(name = "SPEC_NAME")
@ApiParam("包装规格名称")
private String specName;
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "包装数量", example = "0")
private Double qty;
@Column(name = "QTY2")
@ColumnDefault("0")
@ApiParam(value = "包装数量2", example = "0")
private Double qty2;
@Column(name = "QTY3")
@ColumnDefault("0")
@ApiParam(value = "包装数量3", example = "0")
private Double qty3;
@Column(name = "QTY4")
@ColumnDefault("0")
@ApiParam(value = "包装数量4", example = "0")
private Double qty4;
@Column(name = "IS_MIXED")
@ApiParam("是否混包")
private Integer isMixed;
@Column(name = "IS_MIXED2")
@ApiParam("是否混包2")
private Integer isMixed2;
@Column(name = "IS_MIXED3")
@ApiParam("是否混包3")
private Integer isMixed3;
@Column(name = "IS_MIXED4")
@ApiParam("是否混包4")
private Integer isMixed4;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
public int getIsMixedVal() {
return this.isMixed == null ? 0 : this.isMixed;
}
public int getIsMixed2Val() {
return this.isMixed2 == null ? 0 : this.isMixed2;
}
public int getIsMixed3Val() {
return this.isMixed3 == null ? 0 : this.isMixed3;
}
public int getIsMixed4Val() {
return this.isMixed4 == null ? 0 : this.isMixed4;
}
}

@ -1,119 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/18 1:26
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
}
)
@Api("包装规格")
public class MesPackage extends BaseBean implements Serializable {
private static final long serialVersionUID = 2292859018089339608L;
@Column(name = "PACKAGE_NO", nullable = false)
@ApiParam("包装编号")
private String packageNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "PACK_SPEC_QTY")
@ApiParam("包装规格数量")
private Double packSpecQty;
@Column(name = "UNIT")
@ApiParam("单位")
private String unit;
@Column(name = "LOT_NO")
@ApiParam("批号")
private String lotNo;
@Column(name = "FIX_LOT_NO")
@ApiParam("特殊批号")
private String fixLotNo;
@Column(name = "PACK_SPEC")
@ApiParam("包装规格")
private String packSpec;
@Column(name = "IS_SEALED")
@ApiParam("是否封箱")
private Integer isSealed;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态10未打印 20已打印")
private Integer printStatus;
@Column(name = "PACK_LEVEL")
@ApiParam("包装层级 1-第一层2-第二层3-第三层4-第四层")
private Integer packLevel;
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
@Transient
@ApiParam("打印状态文字")
private String printStrStatus;
@Transient
@ApiParam("打印缓存id")
private String printId;
public MesPackage() {
}
public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
this.packageNo = packageNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.packSpecQty = packSpecQty;
}
}

@ -1,63 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/18 2:55
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
}
)
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 8162606304720621672L;
@Column(name = "PACKAGE_NO", nullable = false)
@ApiParam("包装编码")
private String packageNo;
@Column(name = "SERIAL_NUMBER", nullable = false)
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("物料编号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编码2")
private String packageNo2;
@Column(name = "PACKAGE_NO3")
@ApiParam("包装编码3")
private String packageNo3;
@Column(name = "PACKAGE_NO4")
@ApiParam("包装编码4")
private String packageNo4;
}

@ -1,58 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/18 3:23
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装履历表")
public class MesPackageTravel extends BaseBean implements Serializable {
private static final long serialVersionUID = -2808747095415676213L;
@Column(name = "PACKAGE_NO")
@ApiParam("包装编码")
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "OP_TYPE")
@ApiParam("操作类型")
private Integer opType;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编码2")
private String packageNo2;
@Column(name = "PACKAGE_NO3")
@ApiParam("包装编码3")
private String packageNo3;
@Column(name = "PACKAGE_NO4")
@ApiParam("包装编码4")
private String packageNo4;
}

@ -1,93 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART")
@Api("物料信息")
public class MesPart extends BaseBean implements Serializable {
private static final long serialVersionUID = 3936033255397936854L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name = "BRIEF_TEXT")
@ApiParam("零件简称")
private String briefText;
@Column(name = "PART_SPEC")
@ApiParam("零件规格")
private String partSpec;
@Column(name = "CATEGORY_CODE1")
@ApiParam("分类1")
private String categoryCode1;
@Column(name = "CATEGORY_CODE2")
@ApiParam("分类2")
private String categoryCode2;
@Column(name = "CATEGORY_CODE3")
@ApiParam("分类3")
private String categoryCode3;
@Column(name = "UNIT")
@ApiParam("单位")
private String unit;
@Column(name = "PACK_SPEC_CODE")
@ApiParam("包装规格代码")
private String packSpecCode;
@Column(name = "DEFAULT_WORK_CENTER")
@ApiParam("默认工作中心")
private String defaultWorkCenter;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCategoryCode;
@Column(name = "PROCESS_MATCH_TYPE")
@ApiParam("过程编码匹配类型")
private Integer processMatchType;
@Column(name = "PACKAGE_MATCH_TYPE")
@ApiParam("包装编码匹配类型")
private Integer packageMatchType;
@Column(name = "PRODUCT_MATCH_TYPE")
@ApiParam("产品编码匹配类型")
private Integer productMatchType;
@Transient
@ApiParam("分类名称")
private String categoryName;
}

@ -1,44 +0,0 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_CATEGORY")
@Api("零件种类")
public class MesPartCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = 9076081904146489470L;
@Column(name = "CATEGORY_CODE")
@ApiParam("分类代码")
private String categoryCode;
@Column(name = "CATEGORY_NAME")
@ApiParam("分类名称")
private String categoryName;
@Column(name = "CATEGORY_TYPE")
@ApiParam("分类类型")
private String categoryType;
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save