Merge remote-tracking branch 'origin/dev' into dev
gcj
6 years ago
commit
1d0c03ba9c
@ -0,0 +1,18 @@
|
||||
package cn.estsh.i3plus.pojo.aps.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* @Description : 用于注解不需要进行导入导出的bean对象
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-11-29
|
||||
* @Modify:
|
||||
**/
|
||||
@Target(ElementType.TYPE)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface ExcludeImportExport {
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package cn.estsh.i3plus.pojo.aps.annotation;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.validator.MainKeyValidator;
|
||||
|
||||
import javax.validation.Constraint;
|
||||
import javax.validation.Payload;
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* @Description : 主键校验注解
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-11-29
|
||||
* @Modify:
|
||||
**/
|
||||
@Target({ElementType.TYPE})
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Constraint(validatedBy={MainKeyValidator.class})
|
||||
public @interface MainKey {
|
||||
String message() default "主键重复";
|
||||
Class<?>[] groups() default {};
|
||||
Class<? extends Payload>[] payload() default {};
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 返回给界面的Bean对象信息
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-11-29
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class BeanModel {
|
||||
private String key;
|
||||
private String name;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class GanttLineModel {
|
||||
private long id;
|
||||
private long source;
|
||||
private long target;
|
||||
private int type;
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.aps.validator;
|
||||
|
||||
public interface InsertGroup {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.aps.validator;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
|
||||
import javax.validation.ConstraintValidator;
|
||||
import javax.validation.ConstraintValidatorContext;
|
||||
|
||||
public class MainKeyValidator implements ConstraintValidator<MainKey, BaseBean> {
|
||||
@Override
|
||||
public boolean isValid(BaseBean bean, ConstraintValidatorContext constraintValidatorContext) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
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 java.util.List;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\28 19:50
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class DefectModel {
|
||||
|
||||
private Long id;
|
||||
|
||||
@ApiParam("缺陷代码")
|
||||
private String defectCode;
|
||||
|
||||
@ApiParam("缺陷名称")
|
||||
private String defectName;
|
||||
|
||||
@ApiParam("缺陷类型")
|
||||
private String defectType;
|
||||
|
||||
@ApiParam("缺陷类型名称")
|
||||
private String defectTypeName;
|
||||
|
||||
@ApiParam("缺陷位置")
|
||||
private String defectLocation;
|
||||
|
||||
@ApiParam("缺陷类型子集")
|
||||
private List<DefectModel> mesDefectList;
|
||||
public DefectModel() {
|
||||
|
||||
}
|
||||
|
||||
public DefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) {
|
||||
this.id = id;
|
||||
this.defectCode = defectCode;
|
||||
this.defectName = defectName;
|
||||
this.defectType = defectType;
|
||||
this.defectTypeName = defectTypeName;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,116 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\29 11:34
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class QcCheckDataModel {
|
||||
|
||||
private Long id;
|
||||
public String organizeCode;
|
||||
public String createUser;
|
||||
public String createDatetime;
|
||||
|
||||
@ApiParam("检测id")
|
||||
private String checkId;
|
||||
|
||||
@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 checkValue;
|
||||
|
||||
@ApiParam("判定结果")
|
||||
private String checkResult;
|
||||
|
||||
@ApiParam("产品条码")
|
||||
private String sn;
|
||||
|
||||
@ApiParam("产品数量")
|
||||
private Integer qty;
|
||||
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@ApiParam("工单号")
|
||||
private String orderNo;
|
||||
|
||||
@ApiParam("客户代码")
|
||||
private String custCode;
|
||||
|
||||
@ApiParam("班次")
|
||||
private String shiftCode;
|
||||
|
||||
@ApiParam("班组")
|
||||
private String shiftGroupName;
|
||||
|
||||
@ApiParam("班长")
|
||||
private String squadLeader;
|
||||
|
||||
@ApiParam("工作单元名称")
|
||||
private String workCellName;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partNoName;
|
||||
|
||||
public QcCheckDataModel() {
|
||||
|
||||
}
|
||||
|
||||
public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partNoName) {
|
||||
this.id = id;
|
||||
this.organizeCode = organizeCode;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.checkId = checkId;
|
||||
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.checkValue = checkValue;
|
||||
this.checkResult = checkResult;
|
||||
this.sn = sn;
|
||||
this.qty = qty;
|
||||
this.memo = memo;
|
||||
this.orderNo = orderNo;
|
||||
this.custCode = custCode;
|
||||
this.shiftCode = shiftCode;
|
||||
this.shiftGroupName = shiftGroupName;
|
||||
this.squadLeader = squadLeader;
|
||||
this.workCellName = workCellName;
|
||||
this.partNoName = partNoName;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue