Merge branch 'test'
crish
6 years ago
commit
18161e8191
@ -0,0 +1,48 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :动态设置时间与副资源相关的配置
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
|
||||
@Api("副资源设置时间")
|
||||
public class AssistResourceSetTime extends BaseAPS {
|
||||
@Column(name="RES_CODE")
|
||||
@ApiParam(value ="资源编码")
|
||||
private String resCode;
|
||||
|
||||
@Column(name="TYPE")
|
||||
@ApiParam(value ="副资源使用类型")
|
||||
private USE_TYPE type;
|
||||
|
||||
@Column(name="PREV_RESOURCE")
|
||||
@ApiParam(value ="前资源编码")
|
||||
private String prevResource;
|
||||
|
||||
@Column(name="POST_RESOURCE")
|
||||
@ApiParam(value ="后资源编码")
|
||||
private String postResource;
|
||||
|
||||
@Column(name="TIME")
|
||||
@ApiParam(value ="设置时间")
|
||||
private String time;
|
||||
|
||||
@Column(name="PRIORITY")
|
||||
@ApiParam(value ="优先级")
|
||||
private int priority;
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_CALC;
|
||||
import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_TYPE;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :动态设置时间设置
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "APS_DYNAMIC_SET_TIME")
|
||||
@Api("动态设置时间")
|
||||
public class DynamicSetTime extends BaseAPS {
|
||||
@Column(name="RES_CODE")
|
||||
@ApiParam(value ="资源代码")
|
||||
private String resCode;
|
||||
|
||||
@Column(name="TYPE")
|
||||
@ApiParam(value ="应用工作计划类型")
|
||||
private DYNAMIC_SET_TYPE type;
|
||||
|
||||
@Column(name="CONSIDER_ASS_RES")
|
||||
@ApiParam(value ="是否启用副资源动态设置时间")
|
||||
private Boolean considerAssRes;
|
||||
|
||||
@Column(name="CONSIDER_MATERIAL")
|
||||
@ApiParam(value ="是否启用物料动态设置时间")
|
||||
private Boolean considerMaterial;
|
||||
|
||||
@Column(name="ASS_RES_CALC")
|
||||
@ApiParam(value ="副资源动态设置计算方式")
|
||||
private DYNAMIC_SET_CALC assResCalc;
|
||||
|
||||
@Column(name="MATERIAL_CALC")
|
||||
@ApiParam(value ="物料动态设置时间计算方式")
|
||||
private DYNAMIC_SET_CALC materialCalc;
|
||||
|
||||
@Column(name="STATIC_CALC")
|
||||
@ApiParam(value ="与静态设置时间计算方式")
|
||||
private DYNAMIC_SET_CALC staticCalc;
|
||||
|
||||
@Column(name="PRIORITY")
|
||||
@ApiParam(value ="优先级")
|
||||
private int priority;
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :动态设置时间与物料相关的配置
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "APS_MATERIAL_SET_TIME")
|
||||
@Api("物料设置时间")
|
||||
public class MaterialSetTime extends BaseAPS {
|
||||
@Column(name="RES_CODE")
|
||||
@ApiParam(value ="资源编码")
|
||||
private String resCode;
|
||||
|
||||
@Column(name="PREV_MATERIAL")
|
||||
@ApiParam(value ="前物料编码")
|
||||
private String prevMaterial;
|
||||
|
||||
@Column(name="POST_MATERIAL")
|
||||
@ApiParam(value ="后物料编码")
|
||||
private String postMaterial;
|
||||
|
||||
@Column(name="TIME")
|
||||
@ApiParam(value ="设置时间")
|
||||
private String time;
|
||||
|
||||
@Column(name="PRIORITY")
|
||||
@ApiParam(value ="优先级")
|
||||
private int priority;
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum DYNAMIC_SET_CALC {
|
||||
MIN, // 取最小值
|
||||
MAX, // 取最大值
|
||||
SUM // 求和
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum DYNAMIC_SET_TYPE {
|
||||
PREV_SET, // 只对前设置影响
|
||||
POST_SET, // 只对后设置影响
|
||||
ALL // 对前后设置都产生影响
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum EFFICIENCY_EFFECT {
|
||||
NONE(0),
|
||||
PREV_SET(1),
|
||||
PRODUCE(2),
|
||||
POST_SET(4);
|
||||
|
||||
private int _value;
|
||||
|
||||
EFFICIENCY_EFFECT(int value){
|
||||
_value = value;
|
||||
}
|
||||
|
||||
public int value() {
|
||||
return this._value;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :工作计划包含的时间类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum PLAN_TYPE {
|
||||
PREV_SET,
|
||||
PRODUCE,
|
||||
POST_SET,
|
||||
LOCK
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum RESOURCE_LOCK_TYPE {
|
||||
NONE, // 不锁定
|
||||
PRODUCE_BEGIN, // 与后工序生产开始时刻有关
|
||||
PRODUCE_END // 与后工序生产结束时刻有关
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EFurnacePlan {
|
||||
WorkPlans
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.AssistResourceSetTime;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface AssistResourceSetTimeRepository extends CrudRepository<AssistResourceSetTime, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.DynamicSetTime;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface DynamicSetTimeRepository extends CrudRepository<DynamicSetTime, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface FurnacePlanRepository extends CrudRepository<FurnacePlan, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.MaterialSetTime;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface MaterialSetTimeRepository extends CrudRepository<MaterialSetTime, Long> {
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="FurnacePlan">
|
||||
<Relation field="WorkPlans" name="WorkPlan" reverse="FurnacePlan" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -1,9 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="WorkPlan">
|
||||
<Relation field="Work" name="Work" reverse="WorkPlan" type="ONE_TO_ONE" owner="true">
|
||||
</Relation>
|
||||
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="AssPlans" name="WorkPlan" type="ONE_TO_MULTI" owner="false">
|
||||
<Relation field="WorkResource" name="WorkResource" type="ONE_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="false">
|
||||
</Relation>
|
||||
<Relation field="PrevPlan" name="WorkPlan" reverse="PostPlan" type="MULTI_TO_MULTI" owner="false">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,95 @@
|
||||
package cn.estsh.i3plus.pojo.lac.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Lob;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-18 下午6:04
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="LAC_COMMAND_STACK_RECORD")
|
||||
@Api(value="适配记录",description = "适配记录")
|
||||
public class LacCommandStackRecord extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = -2775980024345181459L;
|
||||
|
||||
@Column(name="commandStackId")
|
||||
@ApiParam(value ="指令集ID" , example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long commandStackId;
|
||||
|
||||
@Column(name="COMMAND_STACK_NAME_RDD")
|
||||
@ApiParam(value ="指令集名称")
|
||||
private String commandStackNameRdd;
|
||||
|
||||
@Column(name="COMMAND_STACK_CODE_RDD")
|
||||
@ApiParam(value ="指令集代码")
|
||||
private String commandStackCodeRdd;
|
||||
|
||||
@Column(name="COMMAND_STACK_TYPE_ID")
|
||||
@ApiParam(value ="指令集类型")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long commandStackTypeId;
|
||||
|
||||
@Column(name="STEP_INDEX")
|
||||
@ApiParam(value ="当前步骤")
|
||||
private Integer stepIndex;
|
||||
|
||||
@Column(name="STEP_NUM")
|
||||
@ApiParam(value ="步骤总数")
|
||||
private Integer stepNum;
|
||||
|
||||
@Column(name="TASK_COMPLETE_NUM")
|
||||
@ApiParam(value ="任务完成数量")
|
||||
private Integer taskCompleteNum;
|
||||
|
||||
@Column(name="TASK_NUM")
|
||||
@ApiParam(value ="任务总数")
|
||||
private Integer taskNum;
|
||||
|
||||
@Lob
|
||||
@Column(name="INPUT_PARAMETER")
|
||||
@ApiParam(value ="执行入参")
|
||||
private String inputParameter;
|
||||
|
||||
@Column(name="STACK_START_TIME")
|
||||
@ApiParam(value ="执行开始时间")
|
||||
private String stackStartTime;
|
||||
|
||||
@Column(name="STACK_END_TIME")
|
||||
@ApiParam(value ="执行结束时间")
|
||||
private String stackEndTime;
|
||||
|
||||
@Column(name="STACK_SPEND")
|
||||
@ApiParam(value ="执行耗时")
|
||||
private Integer stackSpend;
|
||||
|
||||
@Column(name="STACK_STATUS")
|
||||
@ApiParam(value ="执行状态")
|
||||
private Integer stackStatus;
|
||||
|
||||
@Column(name="EXECUTION_DESCRIPTION")
|
||||
@ApiParam(value ="执行说明")
|
||||
private String executionDescription;
|
||||
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package cn.estsh.i3plus.pojo.lac.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-22 下午3:29
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="LAC_COMMAND_STACK_TYPE")
|
||||
@Api(value="指令集类型",description = "指令集类型")
|
||||
public class LacCommandStackType extends BaseBean {
|
||||
|
||||
|
||||
@Column(name="TYPE_NAME")
|
||||
@ApiParam(value ="类型名称")
|
||||
private String typeName;
|
||||
|
||||
@Column(name="TYPE_REF_NUM")
|
||||
@ApiParam(value ="适配器使用数量")
|
||||
private Integer typeRefNum;
|
||||
|
||||
@Column(name="TYPE_DESCRIPTION")
|
||||
@ApiParam(value ="类型描述")
|
||||
private String typeDescription;
|
||||
|
||||
}
|
||||
@ -0,0 +1,106 @@
|
||||
package cn.estsh.i3plus.pojo.lac.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Lob;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-18 下午6:04
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="LAC_LOG_TASK")
|
||||
@Api(value="适配任务记录",description = "适配任务记录")
|
||||
public class LacLogTask extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 674009105885048131L;
|
||||
@Column(name="commandStackId")
|
||||
@ApiParam(value ="指令集ID" , example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long commandStackId;
|
||||
|
||||
@Column(name="COMMAND_STACK_NAME_RDD")
|
||||
@ApiParam(value ="指令集名称")
|
||||
private String commandStackNameRdd;
|
||||
|
||||
@Column(name="COMMAND_STACK_CODE_RDD")
|
||||
@ApiParam(value ="指令集代码")
|
||||
private String commandStackCodeRdd;
|
||||
|
||||
@Column(name="COMMAND_STACK_TYPE_ID")
|
||||
@ApiParam(value ="指令集类型")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long commandStackTypeId;
|
||||
|
||||
@Column(name="STEP_ID")
|
||||
@ApiParam(value ="步骤ID" , example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long stepId;
|
||||
|
||||
@Column(name="STEP_NAME_RDD")
|
||||
@ApiParam(value ="步骤名称")
|
||||
private String stepNameRdd;
|
||||
|
||||
@Column(name="STEP_SEQUENCE")
|
||||
@ApiParam(value ="步骤顺序")
|
||||
private String stepSequence;
|
||||
|
||||
@Column(name="TASK_ID")
|
||||
@ApiParam(value ="任务ID" , example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long taskId;
|
||||
|
||||
@Column(name="TASK_NAME_RDD")
|
||||
@ApiParam(value ="任务名称")
|
||||
private String taskNameRdd;
|
||||
|
||||
@Column(name="TASK_NAME_TYPE")
|
||||
@ApiParam(value ="任务类型")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long taskNameType;
|
||||
|
||||
@Column(name="adapterId")
|
||||
@ApiParam(value ="适配器ID" , example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long adapterId;
|
||||
|
||||
@Lob
|
||||
@Column(name="INPUT_PARAMETER")
|
||||
@ApiParam(value ="任务入参")
|
||||
private String inputParameter;
|
||||
|
||||
@Column(name="TASK_START_TIME")
|
||||
@ApiParam(value ="任务开始时间")
|
||||
private String taskStartTime;
|
||||
|
||||
@Column(name="TASK_END_TIME")
|
||||
@ApiParam(value ="任务结束时间")
|
||||
private String taskEndTime;
|
||||
|
||||
@Column(name="TASK_SPEND")
|
||||
@ApiParam(value ="任务耗时")
|
||||
private Integer taskSpend;
|
||||
|
||||
@Column(name="TASK_STATUS")
|
||||
@ApiParam(value ="任务状态")
|
||||
private Integer taskStatus;
|
||||
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
package cn.estsh.i3plus.pojo.lac.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Lob;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-18 下午6:04
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="LAC_LOG_TASK_DETAIL")
|
||||
@Api(value="适配任务记录明细",description = "适配任务记录明细")
|
||||
public class LacLogTaskDetail extends BaseBean {
|
||||
|
||||
|
||||
private static final long serialVersionUID = -4918694502072594064L;
|
||||
@Column(name="commandStackId")
|
||||
@ApiParam(value ="指令集ID" , example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long commandStackId;
|
||||
|
||||
@Column(name="COMMAND_STACK_TYPE_ID")
|
||||
@ApiParam(value ="指令集类型")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long commandStackTypeId;
|
||||
|
||||
@Column(name="STEP_ID")
|
||||
@ApiParam(value ="步骤ID" , example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long stepId;
|
||||
|
||||
@Column(name="TASK_ID")
|
||||
@ApiParam(value ="任务ID" , example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long taskId;
|
||||
|
||||
@Column(name="TASK_NAME_TYPE")
|
||||
@ApiParam(value ="任务类型")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long taskNameType;
|
||||
|
||||
@Column(name="adapterId")
|
||||
@ApiParam(value ="适配器ID" , example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long adapterId;
|
||||
|
||||
@Column(name="TASK_START_TIME")
|
||||
@ApiParam(value ="任务开始时间")
|
||||
private String taskStartTime;
|
||||
|
||||
@Column(name="TASK_END_TIME")
|
||||
@ApiParam(value ="任务结束时间")
|
||||
private String taskEndTime;
|
||||
|
||||
@Lob
|
||||
@Column(name="INPUT_PARAMETER")
|
||||
@ApiParam(value ="任务入参")
|
||||
private String inputParameter;
|
||||
|
||||
@Lob
|
||||
@Column(name="INPUT_PARAMETER_BODY")
|
||||
@ApiParam(value ="任务入参处理完成后")
|
||||
private String inputParameterBody;
|
||||
|
||||
@Lob
|
||||
@Column(name="OUTPUT_PARAMETER")
|
||||
@ApiParam(value ="任务出参")
|
||||
private String outputParameter;
|
||||
|
||||
@Lob
|
||||
@Column(name="OUTPUT_PARAMETER_BODY")
|
||||
@ApiParam(value ="任务出参处理后")
|
||||
private String outputParameterBody;
|
||||
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package cn.estsh.i3plus.pojo.lac.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-22 下午3:32
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="LAC_TASK_TYPE")
|
||||
@Api(value="任务类型",description = "任务类型")
|
||||
public class LacTaskType extends BaseBean {
|
||||
|
||||
@Column(name="TYPE_NAME")
|
||||
@ApiParam(value ="类型名称")
|
||||
private String typeName;
|
||||
|
||||
@Column(name="TYPE_REF_NUM")
|
||||
@ApiParam(value ="适配器使用数量")
|
||||
private Integer typeRefNum;
|
||||
|
||||
@Column(name="TYPE_DESCRIPTION")
|
||||
@ApiParam(value ="类型描述")
|
||||
private String typeDescription;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.lac.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-22 下午5:19
|
||||
* @Modify:
|
||||
**/
|
||||
public interface LacCommandStackRecordRepository extends BaseRepository<LacCommandStackRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.lac.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-22 下午5:19
|
||||
* @Modify:
|
||||
|
||||
**/
|
||||
public interface LacCommandStackTypeRepository extends BaseRepository<LacCommandStackType, Long> {
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.lac.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-22 下午5:19
|
||||
* @Modify:
|
||||
|
||||
**/
|
||||
public interface LacLogTaskDetailRepository extends BaseRepository<LacLogTaskDetail, Long> {
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.lac.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.lac.bean.LacLogTask;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-22 下午5:19
|
||||
* @Modify:
|
||||
|
||||
**/
|
||||
public interface LacLogTaskRepository extends BaseRepository<LacLogTask, Long> {
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.lac.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.lac.bean.LacTaskType;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-22 下午5:19
|
||||
* @Modify:
|
||||
|
||||
**/
|
||||
public interface LacTaskTypeRepository extends BaseRepository<LacTaskType, Long> {
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
package cn.estsh.i3plus.pojo.lac.sqlpack;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.lac.bean.*;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 19-10-22 下午5:34
|
||||
* @Modify:
|
||||
**/
|
||||
public class LacHqlPack {
|
||||
|
||||
private LacHqlPack() {
|
||||
}
|
||||
|
||||
public static DdlPackBean packHqlLacTaskType(LacTaskType bean){
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
|
||||
|
||||
return ddlPackBean;
|
||||
}
|
||||
|
||||
public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
|
||||
|
||||
return ddlPackBean;
|
||||
}
|
||||
|
||||
public static DdlPackBean packHqlLacLogTask(LacLogTask bean){
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
|
||||
|
||||
return ddlPackBean;
|
||||
}
|
||||
|
||||
public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
|
||||
|
||||
return ddlPackBean;
|
||||
}
|
||||
|
||||
public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
|
||||
|
||||
return ddlPackBean;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\10\24 22:04
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MesDefectModel {
|
||||
|
||||
private String defectCode;
|
||||
|
||||
@ApiParam("缺陷名称")
|
||||
private String defectName;
|
||||
|
||||
@ApiParam("缺陷类型")
|
||||
private String defectType;
|
||||
|
||||
@Transient
|
||||
@ApiParam("缺陷分类子集")
|
||||
private List<MesDefect> mesDefectList;
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\10\18 19:15
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("mes 物料BOM")
|
||||
public class MesPartBomModel {
|
||||
|
||||
@ApiParam("物料编号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("数量")
|
||||
private Integer qty;
|
||||
|
||||
public MesPartBomModel() {
|
||||
|
||||
}
|
||||
|
||||
public MesPartBomModel(String partNo, String partName, Integer qty) {
|
||||
this.partNo = partNo;
|
||||
this.partName = partName;
|
||||
this.qty = qty;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\10\24 22:04
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MesProcessBomModel {
|
||||
|
||||
private Long id;
|
||||
@ApiParam("子物料编码")
|
||||
private String itemPartNo;
|
||||
@ApiParam("子物料名称")
|
||||
private String itemPartName;
|
||||
@ApiParam("产品数量")
|
||||
private Double qty;
|
||||
private Integer isValid;
|
||||
private Integer isDeleted;
|
||||
private String organizeCode;
|
||||
private Integer isFeed;
|
||||
private String workCenterCode;
|
||||
private String workCellCode;
|
||||
@ApiParam("拆解数")
|
||||
private Double dismantleQty;
|
||||
|
||||
@ApiParam("产品物料编码")
|
||||
private String parentPartNo;
|
||||
@ApiParam("产品物料名称")
|
||||
private String parentPartName;
|
||||
@ApiParam("合格数")
|
||||
private Integer okQty;
|
||||
@ApiParam("缺失数")
|
||||
private Integer missQty;
|
||||
@ApiParam("报废数")
|
||||
private Integer scrapQty;
|
||||
|
||||
public MesProcessBomModel() {
|
||||
|
||||
}
|
||||
|
||||
public MesProcessBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) {
|
||||
this.id = id;
|
||||
this.itemPartNo = itemPartNo;
|
||||
this.itemPartName = itemPartName;
|
||||
this.qty = qty;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.organizeCode = organizeCode;
|
||||
this.isFeed = isFeed;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.parentPartNo = parentPartNo;
|
||||
this.parentPartName = parentPartName;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\10\24 22:05
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MesProdBindRecordModel {
|
||||
private Long id;
|
||||
private String itemPartNo;
|
||||
private String itemPartName;
|
||||
private Double qty;
|
||||
private Integer isValid;
|
||||
private Integer isDeleted;
|
||||
private String organizeCode;
|
||||
private Integer isFeed;
|
||||
private String workCenterCode;
|
||||
private String workCellCode;
|
||||
private String kpSn;
|
||||
@ApiParam("拆解数")
|
||||
private Double dismantleQty;
|
||||
|
||||
@ApiParam("产品物料编码")
|
||||
private String parentPartNo;
|
||||
@ApiParam("产品物料名称")
|
||||
private String parentPartName;
|
||||
@ApiParam("合格数")
|
||||
private Integer okQty;
|
||||
@ApiParam("缺失数")
|
||||
private Integer missQty;
|
||||
@ApiParam("报废数")
|
||||
private Integer scrapQty;
|
||||
public MesProdBindRecordModel() {
|
||||
|
||||
}
|
||||
|
||||
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
|
||||
this.id = id;
|
||||
this.itemPartNo = itemPartNo;
|
||||
this.itemPartName = itemPartName;
|
||||
this.qty = qty;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.organizeCode = organizeCode;
|
||||
this.isFeed = isFeed;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.kpSn = kpSn;
|
||||
this.parentPartNo = parentPartNo;
|
||||
this.parentPartName = parentPartName;
|
||||
this.dismantleQty = dismantleQty;
|
||||
}
|
||||
|
||||
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) {
|
||||
this.id = id;
|
||||
this.itemPartNo = itemPartNo;
|
||||
this.itemPartName = itemPartName;
|
||||
this.qty = qty;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.organizeCode = organizeCode;
|
||||
this.isFeed = isFeed;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.kpSn = kpSn;
|
||||
this.parentPartNo = parentPartNo;
|
||||
this.parentPartName = parentPartName;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import 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 : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_EQU_TASK_REPAIR_RECORD")
|
||||
@Api("设备维修作业记录")
|
||||
public class MesEquTaskRepairRecord extends BaseBean {
|
||||
|
||||
@Column(name = "TASK_NO")
|
||||
@ApiParam("作业任务编号")
|
||||
private String taskNo;
|
||||
|
||||
@Column(name = "TASK_TYPE")
|
||||
@ApiParam("作业类型")
|
||||
private Integer taskType;
|
||||
|
||||
@Column(name = "EQUIPMENT_CODE")
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@Column(name = "EQUIPMENT_NAME")
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@Column(name = "FP_CODE")
|
||||
@ApiParam("故障现象")
|
||||
private String fpCode;
|
||||
|
||||
@Column(name = "FC_CODE")
|
||||
@ApiParam("故障原因")
|
||||
private String fcCode;
|
||||
|
||||
@Column(name = "FM_CODE")
|
||||
@ApiParam("处理方法")
|
||||
private String fmCode;
|
||||
|
||||
@Column(name = "FINAL_RESULT")
|
||||
@ApiParam("整体结果")
|
||||
private Integer finalResult;
|
||||
|
||||
@Column(name = "MEMO")
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.Transient;
|
||||
|
||||
/**
|
||||
* @Description :设备点检保养作业记录
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_EQU_TASK_STANDARD_RECORD")
|
||||
@Api("设备点检保养作业记录")
|
||||
public class MesEquTaskStandardRecord extends BaseBean {
|
||||
|
||||
@Column(name = "TASK_NO")
|
||||
@ApiParam("作业任务编号")
|
||||
private String taskNo;
|
||||
|
||||
@Column(name = "TASK_TYPE")
|
||||
@ApiParam("作业类型")
|
||||
private Integer taskType;
|
||||
|
||||
@Column(name = "EQUIPMENT_CODE")
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@Column(name = "EQUIPMENT_NAME")
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@Column(name = "ACTION_ITEM")
|
||||
@ApiParam("操作项")
|
||||
private String actionItem;
|
||||
|
||||
@Column(name = "ACTION_STANDARD")
|
||||
@ApiParam("操作标准")
|
||||
private String actionStandard;
|
||||
|
||||
@Column(name = "ACTION_GUIDE")
|
||||
@ApiParam("操作指导")
|
||||
private String actionGuide;
|
||||
|
||||
@Column(name = "CHECK_VALUE")
|
||||
@ApiParam("检测值")
|
||||
private String checkValue;
|
||||
|
||||
@Column(name = "CHECK_RESULT")
|
||||
@ApiParam("判定结果")
|
||||
private Integer checkResult;
|
||||
|
||||
@Column(name = "FINAL_RESULT")
|
||||
@ApiParam("整体结果")
|
||||
private Integer finalResult;
|
||||
|
||||
@Column(name = "MEMO")
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @Description : mes同步设备安灯维修任务model
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-10 17:16
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("mes同步设备安灯维修任务model")
|
||||
public class AndonEquRepairModel extends BaseBean {
|
||||
|
||||
@ApiParam(value = "安灯队列编号")
|
||||
public String andonOrderNo;
|
||||
|
||||
@ApiParam(value = "工作中心代码")
|
||||
public String workCenterCode;
|
||||
|
||||
@ApiParam(value = "工作中心名称")
|
||||
public String workCenterNameRdd;
|
||||
|
||||
@ApiParam(value = "工作单元名称")
|
||||
public String workCellNameRdd;
|
||||
|
||||
@ApiParam(value = "工作单元代码")
|
||||
public String workCellCode;
|
||||
|
||||
@ApiParam(value = "设备代码")
|
||||
public String equipmentCode;
|
||||
|
||||
@ApiParam(value = "设备名称")
|
||||
public String equipmentNameRdd;
|
||||
|
||||
@ApiParam(value = "安灯状态代码")
|
||||
public String statusCode;
|
||||
|
||||
@ApiParam(value="解决时间",example = "2018-01-01 01:00:00")
|
||||
public String resetTime;
|
||||
|
||||
@ApiParam(value = "呼叫原因代码")
|
||||
public String acCode;
|
||||
|
||||
@ApiParam(value = "呼叫原因描述")
|
||||
public String acNameRdd;
|
||||
|
||||
@ApiParam(value = "呼叫具体原因")
|
||||
public String acDesc;
|
||||
|
||||
@ApiParam(value = "事件原因代码")
|
||||
public String ecCode;
|
||||
|
||||
@ApiParam(value = "事件原因描述")
|
||||
public String ecNameRdd;
|
||||
|
||||
@ApiParam(value = "事件具体原因")
|
||||
public String ecDesc;
|
||||
|
||||
@ApiParam(value = "事件方法代码")
|
||||
public String emCode;
|
||||
|
||||
@ApiParam(value = "事件方法描述")
|
||||
public String emNameRdd;
|
||||
|
||||
@ApiParam(value = "事件具体方法")
|
||||
public String emDesc;
|
||||
|
||||
@ApiParam(value = "事件现象代码")
|
||||
private String epmCode;
|
||||
|
||||
@ApiParam(value = "事件现象描述")
|
||||
private String epmNameRdd;
|
||||
|
||||
@ApiParam(value = "组织名称")
|
||||
private String organizeNameRdd;
|
||||
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 用于产线运行情况数据
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-10-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ProductBiModel {
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作中心名称")
|
||||
private String workCenterName;
|
||||
|
||||
@ApiParam("生产区域代码")
|
||||
private String areaCode;
|
||||
|
||||
@ApiParam("运行状态")
|
||||
private Integer runningStatus;
|
||||
|
||||
@ApiParam(value = "物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam(value = "物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam(value = "计划数量")
|
||||
private double planQty;
|
||||
|
||||
@ApiParam(value = "产量")
|
||||
private double outputQty;
|
||||
|
||||
@ApiParam(value = "完成率")
|
||||
private double CompleteRate;
|
||||
|
||||
@ApiParam(value = "合格数量")
|
||||
private double passQty;
|
||||
|
||||
@ApiParam(value = "不良数量")
|
||||
private double ngQty;
|
||||
|
||||
@ApiParam(value = "合格率")
|
||||
private double passRate;
|
||||
|
||||
@ApiParam(value = "不良率")
|
||||
private double ngRate;
|
||||
|
||||
@ApiParam("客户代码")
|
||||
private String customerCode;
|
||||
|
||||
@ApiParam("客户名称")
|
||||
private String customerName;
|
||||
|
||||
@ApiParam("x坐标内容")
|
||||
private List<String> xAxis;
|
||||
|
||||
@ApiParam("图表显示的数据")
|
||||
private List<ProductBiSeriesModel> series;
|
||||
|
||||
public double getCompleteRate() {
|
||||
if(this.planQty != 0) {
|
||||
this.CompleteRate = outputQty / planQty;
|
||||
} else {
|
||||
this.CompleteRate = 0;
|
||||
}
|
||||
return this.CompleteRate;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 用于产线运行情况数据
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-10-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ProductBiSeriesModel {
|
||||
@ApiParam("名称")
|
||||
private String name;
|
||||
@ApiParam("类型")
|
||||
private String type;
|
||||
@ApiParam("显示的数据")
|
||||
private List<Double> data;
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskRepairRecord;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesEquTaskRepairRecordRepository extends BaseRepository<MesEquTaskRepairRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskStandardRecord;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesEquTaskStandardRecordRepository extends BaseRepository<MesEquTaskStandardRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.pojo.model.andon;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: mes定时获取安灯安灯任务信息请求DTO
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-10-25-14:40
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class AndonManageQueueSyncModel{
|
||||
|
||||
@ApiParam("同步时间")
|
||||
private String syscTime;
|
||||
|
||||
@ApiParam("安灯状态")
|
||||
private List<Object> statusList;
|
||||
|
||||
@ApiParam("组织代码")
|
||||
private String organizeCode;
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 物料清单模板
|
||||
* @Reference :
|
||||
* @author: jessica.chen
|
||||
* @date: 2019/10/22 17:10
|
||||
* @Modify:
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Api(value="领料单模板",description = "领料单模板")
|
||||
public class WmsBomTemplate extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 2167743108452607611L;
|
||||
|
||||
@ApiParam(value = "父物料号")
|
||||
@AnnoOutputColumn
|
||||
private String partNo;
|
||||
|
||||
@ApiParam(value = "父物料描述")
|
||||
@AnnoOutputColumn
|
||||
private String partName;
|
||||
|
||||
@ApiParam(value = "父计量单位")
|
||||
@AnnoOutputColumn
|
||||
private String unit;
|
||||
|
||||
@ApiParam(value = "父级数量")
|
||||
@AnnoOutputColumn
|
||||
private Double qty;
|
||||
|
||||
@ApiParam(value = "子物料号")
|
||||
@AnnoOutputColumn
|
||||
private String itemPartNo;
|
||||
|
||||
@ApiParam(value = "子物料描述")
|
||||
@AnnoOutputColumn
|
||||
private String itemPartName;
|
||||
|
||||
@ApiParam(value = "子计量单位")
|
||||
@AnnoOutputColumn
|
||||
private String itemUnit;
|
||||
|
||||
@ApiParam(value = "子用量")
|
||||
@AnnoOutputColumn
|
||||
private Double itemQty;
|
||||
|
||||
@ApiParam(value = "BOM编号")
|
||||
@AnnoOutputColumn
|
||||
private String bomNum;
|
||||
|
||||
@ApiParam(value = "BOM版本号")
|
||||
@AnnoOutputColumn
|
||||
private String bomVersion;
|
||||
|
||||
@ApiParam(value = "有效起始日期")
|
||||
@AnnoOutputColumn
|
||||
private String effStartTime;
|
||||
|
||||
@ApiParam(value = "有效截止日期")
|
||||
@AnnoOutputColumn
|
||||
private String effEndTime;
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue