Merge remote-tracking branch 'origin/dev' into dev
wei.peng
6 years ago
commit
699276777a
@ -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,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,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,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;
|
||||
}
|
||||
Loading…
Reference in New Issue