Merge remote-tracking branch 'origin/dev' into dev
袁津哲
5 years ago
commit
cad6b7ad89
@ -0,0 +1,67 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.Transient;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author wangjie
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("流程状态异常记录")
|
||||
public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -4046192879130584866L;
|
||||
|
||||
@Column(name = "ROUTE_CODE")
|
||||
@ApiParam("流程代码")
|
||||
private String routeCode;
|
||||
|
||||
@Column(name = "STATUS_CODE")
|
||||
@ApiParam("状态代码")
|
||||
private String statusCode;
|
||||
|
||||
@Column(name = "ANDON_ORDER_NO")
|
||||
@ApiParam(value = "安灯队列编号")
|
||||
public String andonOrderNo;
|
||||
|
||||
@Column(name = "ERROR_DESC")
|
||||
@ApiParam(value = "失败描述")
|
||||
public String errorDesc;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam(value = "工作中心")
|
||||
public String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam(value = "工作中心")
|
||||
public String workCellCode;
|
||||
|
||||
@Column(name = "ALARM_CODE")
|
||||
@ApiParam(value = "安灯类型")
|
||||
public String alarmCode;
|
||||
|
||||
@Column(name = "SOURCE_TYPE")
|
||||
@ApiParam(value = "安灯来源类型")
|
||||
private String sourceType;
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonActionModuleParamRepository extends BaseRepository<AndonActionModuleParam, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonActionModuleRepository extends BaseRepository<AndonActionModule, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonAlarmRouteModuleParamRepository extends BaseRepository<AndonAlarmRouteModuleParam, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-30 11:05
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-11-12-14:24
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonMessageTypeRepository extends BaseRepository<AndonMessageType, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatusErrorRecord;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonRouteStatusErrorRecordRepository extends BaseRepository<AndonRouteStatusErrorRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonRouteStatusRepository extends BaseRepository<AndonRouteStatus, Long> {
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: jessica.chen
|
||||
* @CreateDate: 2019\11\15 10:01
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_QC_ORDER_ACCESSORY")
|
||||
@Api("MES_检验单附件")
|
||||
public class MesQcOrderAccessory extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 2648132773643541110L;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("质检单号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "ACCESSORY_NAME")
|
||||
@ApiParam("附件名称")
|
||||
private String accessoryName;
|
||||
|
||||
@Column(name = "ACCESSORY_URL")
|
||||
@ApiParam("附件路径")
|
||||
private String accessoryUrl;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderAccessory;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\18 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesQcOrderAccessoryRepository extends BaseRepository<MesQcOrderAccessory, Long> {
|
||||
}
|
||||
@ -0,0 +1,88 @@
|
||||
package cn.estsh.i3plus.pojo.platform.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description : 数据对象
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2019-02-27 10:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="SYS_DATA_SOURCE")
|
||||
@Api(value="数据对象")
|
||||
public class SysDataSource extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = -3116421427693381484L;
|
||||
@Column(name="SOFT_TYPE")
|
||||
@ApiParam(value ="产品类型")
|
||||
private Integer softType;
|
||||
|
||||
public String getSoftTypeTxt() {
|
||||
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
|
||||
}
|
||||
|
||||
@Column(name="SOURCE_NAME")
|
||||
@ApiParam(value ="数据源名称")
|
||||
private String sourceName;
|
||||
|
||||
@Column(name="SOURCE_CODE")
|
||||
@ApiParam(value ="数据源编码")
|
||||
private String sourceCode;
|
||||
|
||||
@Column(name="SOURCE_STATUS")
|
||||
@ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在")
|
||||
private Integer sourceStatus;
|
||||
public String getSourceStatusTxt() {
|
||||
return softType == null ? null : CommonEnumUtil.DATA_SOURCE_STATUS.valueOfDescription(sourceStatus);
|
||||
}
|
||||
|
||||
@Column(name="SOURCE_TYPE")
|
||||
@ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE")
|
||||
private Integer sourceType;
|
||||
public String getSourceTypeTxt() {
|
||||
return softType == null ? null : CommonEnumUtil.DATA_SOURCE_TYPE.valueOfDescription(sourceType);
|
||||
}
|
||||
|
||||
|
||||
@Column(name="SOURCE_HOST")
|
||||
@ApiParam(value ="数据源连接地址")
|
||||
private String sourceHost;
|
||||
|
||||
@Column(name="SOURCE_PORT")
|
||||
@ApiParam(value ="数据源端口")
|
||||
private Integer sourcePort;
|
||||
|
||||
@Column(name="SOURCE_DATA_BASE_NAME")
|
||||
@ApiParam(value ="数据库名称")
|
||||
private String sourceDataBaseName;
|
||||
|
||||
@Column(name="SOURCE_USER_NAME")
|
||||
@ApiParam(value ="数据库用户名称")
|
||||
private String sourceUserName;
|
||||
|
||||
@Column(name="SOURCE_PASSWORD")
|
||||
@ApiParam(value ="数据库用户密码")
|
||||
private String sourcePassword;
|
||||
|
||||
@Column(name="SOURCE_DESCRIPTION")
|
||||
@ApiParam(value ="数据源描述")
|
||||
private String sourceDescription;
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.platform.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysDataSource;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-5-11 上午11:05
|
||||
* @Modify:
|
||||
**/
|
||||
public interface SysDataSourceRepository extends BaseRepository<SysDataSource, Long> {
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.wms.engine.script;
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.wms.engine.script;
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
Loading…
Reference in New Issue