Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
汪云昊
6 years ago
commit
f2c0c1206a
@ -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,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,97 @@
|
||||
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;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\10\12 16:33
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_QC_CHECK_DATA")
|
||||
@Api("质量过程检测数据")
|
||||
public class MesQcCheckData extends BaseBean {
|
||||
|
||||
@Column(name = "CHECK_ID")
|
||||
@ApiParam("检测id")
|
||||
private String checkId;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "CHECK_TYPE")
|
||||
@ApiParam("检测类型")
|
||||
private Integer checkType;
|
||||
|
||||
@Column(name = "CHECK_ITEM")
|
||||
@ApiParam("检测项")
|
||||
private String checkItem;
|
||||
|
||||
@Column(name = "CHECK_STANDARD")
|
||||
@ApiParam("检测标准")
|
||||
private String checkStandard;
|
||||
|
||||
@Column(name = "CHECK_GUIDE")
|
||||
@ApiParam("检测指导")
|
||||
private String checkGuide;
|
||||
|
||||
@Column(name = "CHECK_FREQUENCY")
|
||||
@ApiParam("频率")
|
||||
private String checkFrequency;
|
||||
|
||||
@Column(name = "CHECK_VALUE")
|
||||
@ApiParam("检测值")
|
||||
private String checkValue;
|
||||
|
||||
@Column(name = "CHECK_RESULT")
|
||||
@ApiParam("判定结果")
|
||||
private String checkResult;
|
||||
|
||||
@Column(name = "SN")
|
||||
@ApiParam("产品条码")
|
||||
private String sn;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("产品数量")
|
||||
private Integer qty;
|
||||
|
||||
@Column(name = "MEMO")
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("工单号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "CUST_CODE")
|
||||
@ApiParam("客户代码")
|
||||
private String custCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPartObject;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\25 15:07
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesPartObjectRepository extends BaseRepository<MesPartObject, Long> {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\25 13:50
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesQcCheckDataRepository extends BaseRepository<MesQcCheckData, Long> {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesRepairRecord;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\25 13:39
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesRepairRecordRepository extends BaseRepository<MesRepairRecord, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue