Merge branch 'dev' into test
jokelone
5 years ago
commit
5ed822c4d3
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class GanttDragModel {
|
||||
private Long workId;
|
||||
private Long resId;
|
||||
private Long targetResId;
|
||||
private Long targetWorkId;
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 甘特图分页查询参数
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-11-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("甘特图分页查询参数")
|
||||
public class GanttEventRequest {
|
||||
private Long[] resourceIds;
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date begin;
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date end;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class GanttOrderModel {
|
||||
private Long id;
|
||||
private String code;
|
||||
private String name;
|
||||
private List<GanttOrderModel> children = new ArrayList<>();
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class GanttPlanModel {
|
||||
private Long resourceId;
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date startDate;
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date endDate;
|
||||
private String cls;
|
||||
private String eventColor;
|
||||
private String name;
|
||||
private Long workId;
|
||||
private List<Long> resIds;
|
||||
private Boolean draggable;
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package cn.estsh.i3plus.pojo.aps.validator;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
|
||||
public interface IMainKeyValidatorImpl {
|
||||
boolean isValid(BaseBean bean);
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.aps.validator;
|
||||
|
||||
public interface UpdateGroup {
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @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 {
|
||||
|
||||
@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;
|
||||
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @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 {
|
||||
|
||||
@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;
|
||||
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Lob;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :JIS发运模式
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-12-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PATTERN_JIS")
|
||||
@Api("JIS发运模式")
|
||||
public class MesPatternJis extends BaseBean {
|
||||
|
||||
@Column(name = "PATTERN_NO")
|
||||
@ApiParam("模式编号")
|
||||
private String patternNo;
|
||||
|
||||
@Column(name = "PATTERN_NAME")
|
||||
@ApiParam("模式名称")
|
||||
private String patternName;
|
||||
|
||||
@Lob
|
||||
@Column(name = "RULE")
|
||||
@ApiParam("规则")
|
||||
private String rule;
|
||||
|
||||
@Column(name = "PATTERN_DESC")
|
||||
@ApiParam("描述")
|
||||
private String patternDesc;
|
||||
|
||||
@Column(name = "TOP_NO")
|
||||
@ApiParam("一次显示TOP数")
|
||||
private Integer topNo;
|
||||
|
||||
@Column(name = "HANDLE_NO")
|
||||
@ApiParam("一次处理套数")
|
||||
private Integer handleNo;
|
||||
|
||||
@Column(name = "PATTERN_TYPE")
|
||||
@ApiParam("模式类型")
|
||||
private Integer patternType;
|
||||
|
||||
@Column(name = "SCAN_TYPE")
|
||||
@ApiParam("是否按主队列顺序扫描")
|
||||
private Integer scanType;
|
||||
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :产品配置明细
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PROD_CFG_DETAIL")
|
||||
@Api("产品配置明细")
|
||||
public class MesProdCfgDetail extends BaseBean {
|
||||
@Column(name = "PROD_CFG_CODE")
|
||||
@ApiParam("产品配置代码")
|
||||
private String prodCfgCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "IS_VIRTUAL")
|
||||
@ApiParam("是否虚零件")
|
||||
private Integer isVirtual;
|
||||
|
||||
@Transient
|
||||
@ApiParam("零件名称")
|
||||
private String partName;
|
||||
|
||||
public int getIsVirtualVal() {
|
||||
return this.isVirtual == null ? 0 : this.isVirtual;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-26-10:25
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PRODUCE_CATEGORY")
|
||||
@Api("系统业务动作")
|
||||
public class MesProduceCategory extends BaseBean {
|
||||
|
||||
@Column(name = "PRODUCE_CTGY_CODE")
|
||||
@ApiParam("产品类型代码")
|
||||
private String produceCategoryCode;
|
||||
|
||||
@Column(name = "PRODUCE_CTGY_NAME")
|
||||
@ApiParam("产品类型名称")
|
||||
private String produceCategoryName;
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :JIS发运队列
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-12-24
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_QUEUE_JIS")
|
||||
@Api("JIS发运队列")
|
||||
public class MesQueueJis extends BaseBean {
|
||||
|
||||
@Column(name = "JIS_NO")
|
||||
@ApiParam("主队列编号")
|
||||
private String jisNo;
|
||||
|
||||
@Column(name = "PROD_CFG_CODE")
|
||||
@ApiParam("产品配置代码")
|
||||
private String prodCfgCode;
|
||||
|
||||
@Column(name = "VIN_CODE")
|
||||
@ApiParam("vin")
|
||||
private String vinCode;
|
||||
|
||||
@Column(name = "CAR_NO")
|
||||
@ApiParam("车号")
|
||||
private String carNo;
|
||||
|
||||
@Column(name = "SEQ")
|
||||
@ApiParam("排序")
|
||||
private Double seq;
|
||||
|
||||
@Column(name = "STATUS")
|
||||
@ApiParam("状态")
|
||||
private Integer status;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :JIS发运队列明细
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-12-24
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_QUEUE_JIS_DETAIL")
|
||||
@Api("JIS发运队列明细")
|
||||
public class MesQueueJisDetail extends BaseBean {
|
||||
|
||||
@Column(name = "JIS_NO")
|
||||
@ApiParam("主队列编号")
|
||||
private String jisNo;
|
||||
|
||||
@Column(name = "PROD_CFG_CODE")
|
||||
@ApiParam("产品配置代码")
|
||||
private String prodCfgCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name = "STATUS")
|
||||
@ApiParam("状态")
|
||||
private Integer status;
|
||||
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : zcg
|
||||
* @Date : 2020/1/10 0010 - 15:28
|
||||
*/
|
||||
@Data
|
||||
@Api("数据采集Model")
|
||||
public class DataAcquisitionModel {
|
||||
|
||||
@ApiParam("对象代码")
|
||||
private String objectCode;
|
||||
|
||||
@ApiParam("对象名称")
|
||||
private String objectName;
|
||||
|
||||
@ApiParam("字段代码")
|
||||
private String fieldCode;
|
||||
|
||||
@ApiParam("字段名称")
|
||||
private String fieldName;
|
||||
|
||||
@ApiParam("字段值")
|
||||
private String fieldValue;
|
||||
//
|
||||
// @ApiParam("组号")
|
||||
// private String groupNo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,80 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2020\1\13 17:23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class QcCheckStandardModel {
|
||||
|
||||
private Long id;
|
||||
|
||||
@ApiParam("物料编码")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("检测类型")
|
||||
private Integer checkType;
|
||||
|
||||
@ApiParam("检测项")
|
||||
private String checkItem;
|
||||
|
||||
@ApiParam("检测标准")
|
||||
private String checkStandard;
|
||||
|
||||
@ApiParam("检测指导")
|
||||
private String checkGuide;
|
||||
|
||||
@ApiParam("频率")
|
||||
private String checkFrequency;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("检测结果")
|
||||
private String checkResult;
|
||||
|
||||
@ApiParam("检测值")
|
||||
private String checkValue;
|
||||
|
||||
@ApiParam("检测项类型")
|
||||
private String checkItemType;
|
||||
|
||||
@ApiParam("检测项类型名称")
|
||||
private String checkItemTypeName;
|
||||
|
||||
private List<MesQcCheckStandard> childQcList;
|
||||
|
||||
public QcCheckStandardModel() {
|
||||
}
|
||||
|
||||
public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard
|
||||
, String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) {
|
||||
this.id = id;
|
||||
this.partNo = partNo;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.checkType = checkType;
|
||||
this.checkItem = checkItem;
|
||||
this.checkStandard = checkStandard;
|
||||
this.checkGuide = checkGuide;
|
||||
this.checkFrequency = checkFrequency;
|
||||
this.partName = partName;
|
||||
this.checkItemType = checkItemType;
|
||||
this.checkItemTypeName = checkItemTypeName;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,76 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class QueueJisModel implements Serializable {
|
||||
|
||||
@ApiParam("主队列编号")
|
||||
private String jisNo;
|
||||
|
||||
@ApiParam("vin")
|
||||
private String vinCode;
|
||||
|
||||
@ApiParam("车号")
|
||||
private String carNo;
|
||||
|
||||
@ApiParam("排序")
|
||||
private Double seq;
|
||||
|
||||
@ApiParam("状态")
|
||||
private Integer status;
|
||||
|
||||
@ApiParam("产品配置代码")
|
||||
private String prodCfgCode;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@ApiParam("产品类型代码")
|
||||
private String produceCategoryCode;
|
||||
|
||||
@ApiParam("明细状态")
|
||||
private Integer detailStatus;
|
||||
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("状态名称")
|
||||
private String statusName;
|
||||
|
||||
@ApiParam("明细状态名称")
|
||||
private String detailStatusName;
|
||||
|
||||
public String getStatusName() {
|
||||
return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status);
|
||||
}
|
||||
|
||||
public String getDetailStatusName() {
|
||||
return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus);
|
||||
}
|
||||
|
||||
public QueueJisModel() {
|
||||
}
|
||||
|
||||
public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) {
|
||||
this.jisNo = jisNo;
|
||||
this.vinCode = vinCode;
|
||||
this.carNo = carNo;
|
||||
this.seq = seq;
|
||||
this.status = status;
|
||||
this.prodCfgCode = prodCfgCode;
|
||||
this.partNo = partNo;
|
||||
this.partNameRdd = partNameRdd;
|
||||
this.produceCategoryCode = produceCategoryCode;
|
||||
this.detailStatus = detailStatus;
|
||||
this.serialNumber = serialNumber;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
@Data
|
||||
@Api("工步返回信息")
|
||||
public class StepResult<T> {
|
||||
|
||||
private boolean isCompleted;
|
||||
|
||||
private T data;
|
||||
|
||||
private Collection<T> dataCollection;
|
||||
|
||||
private String msg;
|
||||
|
||||
public static StepResult getSuccessComplete() {
|
||||
return new StepResult(true);
|
||||
}
|
||||
|
||||
public static StepResult getNonComplete() {
|
||||
return new StepResult(false);
|
||||
}
|
||||
|
||||
public static StepResult getSuccessComplete(String msg) {
|
||||
return new StepResult(true, msg);
|
||||
}
|
||||
|
||||
public static StepResult getNonComplete(String msg) {
|
||||
return new StepResult(false, msg);
|
||||
}
|
||||
|
||||
public static <T> StepResult<T> getSuccessData(T data, String msg) {
|
||||
return new StepResult<>(true, data, msg);
|
||||
}
|
||||
|
||||
public static <T> StepResult<T> getSuccessData(Collection<T> data, String msg) {
|
||||
return new StepResult<T>(true, data, msg);
|
||||
}
|
||||
|
||||
private StepResult() {
|
||||
}
|
||||
|
||||
private StepResult(boolean isCompleted) {
|
||||
this.isCompleted = isCompleted;
|
||||
}
|
||||
|
||||
private StepResult(boolean isCompleted, String msg) {
|
||||
this.isCompleted = isCompleted;
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public StepResult(boolean isCompleted, T data, String msg) {
|
||||
this.isCompleted = isCompleted;
|
||||
this.data = data;
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public StepResult(boolean isCompleted, Collection<T> dataCollection, String msg) {
|
||||
this.isCompleted = isCompleted;
|
||||
this.dataCollection = dataCollection;
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTaskDetail;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : zcg
|
||||
* @Date : 2020/1/8 0008 - 18:42
|
||||
*/
|
||||
@Repository
|
||||
public interface MesMonitorTaskDetailRepository extends BaseRepository<MesMonitorTaskDetail, Long> {
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTask;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : zcg
|
||||
* @Date : 2020/1/8 0008 - 18:43
|
||||
*/
|
||||
@Repository
|
||||
public interface MesMonitorTaskRepository extends BaseRepository<MesMonitorTask,Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-12-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesPatternJisRepository extends BaseRepository<MesPatternJis, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfgDetail;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProdCfgDetailRepository extends BaseRepository<MesProdCfgDetail, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCategory;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-26-10:28
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProduceCategoryRepository extends BaseRepository<MesProduceCategory, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJisDetail;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-12-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesQueueJisDetailRepository extends BaseRepository<MesQueueJisDetail, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJis;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-12-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesQueueJisRepository extends BaseRepository<MesQueueJis, Long> {
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.mes.annotation;
|
||||
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/12/25 1:45 下午
|
||||
* @Description:
|
||||
**/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target({ElementType.TYPE})
|
||||
@Documented
|
||||
public @interface ElasticSearch {
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.mes.annotation;
|
||||
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/12/25 1:45 下午
|
||||
* @Description:
|
||||
**/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target({ElementType.FIELD})
|
||||
@Documented
|
||||
public @interface Json4Es {
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @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 {
|
||||
|
||||
@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;
|
||||
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
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 : 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 {
|
||||
|
||||
@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;
|
||||
|
||||
@Transient
|
||||
@ApiParam("任务名称")
|
||||
private String taskName;
|
||||
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Lob;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :JIS发运模式
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-12-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PATTERN_JIS")
|
||||
@Api("JIS发运模式")
|
||||
public class MesPatternJis extends BaseBean {
|
||||
|
||||
@Column(name = "PATTERN_NO")
|
||||
@ApiParam("模式编号")
|
||||
private String patternNo;
|
||||
|
||||
@Column(name = "PATTERN_NAME")
|
||||
@ApiParam("模式名称")
|
||||
private String patternName;
|
||||
|
||||
@Lob
|
||||
@Column(name = "RULE")
|
||||
@ApiParam("规则")
|
||||
private String rule;
|
||||
|
||||
@Column(name = "PATTERN_DESC")
|
||||
@ApiParam("描述")
|
||||
private String patternDesc;
|
||||
|
||||
@Column(name = "TOP_NO")
|
||||
@ApiParam("一次显示TOP数")
|
||||
private Integer topNo;
|
||||
|
||||
@Column(name = "HANDLE_NO")
|
||||
@ApiParam("一次处理套数")
|
||||
private Integer handleNo;
|
||||
|
||||
@Column(name = "PATTERN_TYPE")
|
||||
@ApiParam("模式类型")
|
||||
private Integer patternType;
|
||||
|
||||
@Column(name = "SCAN_TYPE")
|
||||
@ApiParam("是否按主队列顺序扫描")
|
||||
private Integer scanType;
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue