Merge remote-tracking branch 'origin/test' into test
许心洁
6 years ago
commit
176d5d22f9
@ -0,0 +1,89 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 安灯主界面Model
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-11-22-13:44
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class AndonMenuInterfaceModel{
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作中心名称")
|
||||
private String workCenterName;
|
||||
|
||||
@ApiParam("产线运行状态")
|
||||
private String workCenterStatus;
|
||||
|
||||
@ApiParam("安灯类型")
|
||||
private String alarmCode;
|
||||
|
||||
@ApiParam("安灯类型名称")
|
||||
private String alarmName;
|
||||
|
||||
@ApiParam("故障总时长 单位：分钟")
|
||||
private Long exceptionTime = 0L;
|
||||
|
||||
@ApiParam("当前安灯类型故障时长 单位：分钟")
|
||||
private Long currentExceptionTime = 0L;
|
||||
|
||||
@ApiParam("当前安灯类型故障比例")
|
||||
private Double proportion = 0D;
|
||||
|
||||
@ApiParam("当前工厂的产线故障统计")
|
||||
private List<AndonMenuInterfaceModel> andonWorkcenterList;
|
||||
|
||||
@ApiParam("当前产线的所有故障统计")
|
||||
private List<AndonBoardModel> alarmBrokenInfoList;
|
||||
|
||||
@ApiParam("当前产线的未解决故障统计")
|
||||
private List<AndonBoardModel> pendingSolveBrokenInfoList;
|
||||
|
||||
@ApiParam("当前产线的响应时长top10")
|
||||
private List<AndonBoardModel> responseInfoList;
|
||||
|
||||
@ApiParam("当前产线的解决时长top10")
|
||||
private List<AndonBoardModel> solveInfoList;
|
||||
|
||||
@ApiParam("当前产线的异常时长top10")
|
||||
private List<AndonBoardModel> exceptionInfoList;
|
||||
|
||||
@ApiParam("当前产线的站点状态统计")
|
||||
private List<CellGroupStatusModel> andonCellGroupStatusList;
|
||||
|
||||
public double getExceptionTimeVal() {
|
||||
return exceptionTime == null ? 0 : exceptionTime;
|
||||
}
|
||||
|
||||
public double getCurrentExceptionTimeVal() {
|
||||
return currentExceptionTime == null ? 0 : currentExceptionTime;
|
||||
}
|
||||
|
||||
public double getProportionVal() {
|
||||
return proportion == null ? 0 : proportion;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "AndonMenuInterfaceModel{" +
|
||||
"workCenterCode='" + workCenterCode + '\'' +
|
||||
", workCenterName='" + workCenterName + '\'' +
|
||||
", workCenterStatus='" + workCenterStatus + '\'' +
|
||||
", alarmCode='" + alarmCode + '\'' +
|
||||
", alarmName='" + alarmName + '\'' +
|
||||
", exceptionTime=" + exceptionTime +
|
||||
", currentExceptionTime=" + currentExceptionTime +
|
||||
", proportion=" + proportion +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
/**
|
||||
* @Description: 站点统计分组model
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-11-22-16:02
|
||||
* @Modify:
|
||||
**/
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工位分组配置model
|
||||
*/
|
||||
@Data
|
||||
public class CellGroupStatusModel{
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("安灯类型")
|
||||
private String groupCode;
|
||||
|
||||
@ApiParam("安灯类型名称")
|
||||
private String groupName;
|
||||
|
||||
@ApiParam("安灯类型名称")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("安灯类型名称")
|
||||
private String workCellName;
|
||||
|
||||
@ApiParam("站点运行状态")
|
||||
private String cellGroupStatus;
|
||||
|
||||
@ApiParam(value = "横坐标")
|
||||
private Float horizontalAxis = 0f;
|
||||
|
||||
@ApiParam(value = "纵坐标")
|
||||
private Float verticalAxis = 0f;
|
||||
|
||||
@ApiParam(value = "异常图片")
|
||||
private String abnormalSrc;
|
||||
|
||||
@ApiParam(value = "正常图片")
|
||||
private String normalSrc;
|
||||
|
||||
@ApiParam("当前站点下的工位故障统计")
|
||||
private List<AndonBoardModel> andonBoardModelList;
|
||||
}
|
||||
@ -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,13 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
public class StatisticReportReponse {
|
||||
private List<String> headers = new ArrayList<>();
|
||||
private List<Map<String, String>> datas = new ArrayList<>();
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPartObject;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\25 15:07
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesPartObjectRepository extends BaseRepository<MesPartObject, Long> {
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean.iotio;
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
@ -0,0 +1,61 @@
|
||||
package cn.estsh.i3plus.pojo.wms.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.UniqueConstraint;
|
||||
|
||||
/**
|
||||
* @Description : 附件表
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2019-11-26 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_FILE",
|
||||
uniqueConstraints = {@UniqueConstraint(columnNames = {"FILE_NAME", "REF_SRC", "REF_TYPE"})})
|
||||
@Api("附件信息")
|
||||
public class WmsFile extends BaseBean{
|
||||
|
||||
private static final long serialVersionUID = 9214639813072592712L;
|
||||
@Column(name="FILE_NAME")
|
||||
@ApiParam("文件名称")
|
||||
private String fileName;
|
||||
|
||||
@Column(name="FILE_SIZE")
|
||||
@ApiParam(value = "文件大小(KB)", example = "0")
|
||||
private Integer fileSize = 0;
|
||||
|
||||
@Column(name="FILE_TYPE")
|
||||
@ApiParam("文件类型")
|
||||
private String fileType;
|
||||
|
||||
@Column(name="RESOURCE_ID")
|
||||
@ApiParam("资源编号")
|
||||
private String resourceId;
|
||||
|
||||
@Column(name="FILE_URL")
|
||||
@ApiParam("下载地址")
|
||||
private String fileUrl;
|
||||
|
||||
@Column(name="REF_SRC")
|
||||
@ApiParam("关联单据编号")
|
||||
private String refSrc;
|
||||
|
||||
@Column(name = "REF_TYPE")
|
||||
@ApiParam(value = "关联单据类型")
|
||||
private String refType;
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
package cn.estsh.i3plus.pojo.wms.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 : gcj
|
||||
* @CreateDate : 2019-11-27 16:06
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_PICK_COUNT")
|
||||
@Api("供应商物料每月数量")
|
||||
public class WmsPickCount extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 4849044986767609486L;
|
||||
@Column(name = "YEAR")
|
||||
@ApiParam(value = "年")
|
||||
private String year;
|
||||
|
||||
@Column(name = "MONTH")
|
||||
@ApiParam(value = "月")
|
||||
private String month;
|
||||
|
||||
@Column(name = "VENDOR_NO")
|
||||
@ApiParam(value = "供应商编码")
|
||||
private String vendorNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam(value = "物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam(value = "数量")
|
||||
private Double qty;
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsFile;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jessica,chen
|
||||
* @CreateDate : 2019-11-27 14:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsFileRepository extends BaseRepository<WmsFile, Long> {
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsPickCount;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :对象持久层仓用方法控制(拣货数量)
|
||||
* @Reference :
|
||||
* @Author : hansen.ke
|
||||
* @CreateDate : 2018-11-06 13:40
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsPickCountRepository extends BaseRepository<WmsPickCount, Long>{
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue