I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of frank.yu/i3plus-pojo into dev

Browse Source
yun-zuoyi
王林 4 years ago committed by nancy.li
parent fd45bcfdf7 e178bb8c67
commit 03aefdfd9b
7 changed files with 191 additions and 19 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java
Unescape Escape View File

@ -22,7 +22,7 @@ public class DefectRecordModel implements Serializable {
@ApiParam("不良处理类型")
private Integer defectActionType;
@ApiParam("不良处理类型Name")
@ApiParam("不良处理类型名称")
private String defectActionTypeName;
@ApiParam("缺陷名称")
@ -31,7 +31,7 @@ public class DefectRecordModel implements Serializable {
@ApiParam("缺陷位置")
private String defectLocation;
@ApiParam("缺陷位置")
@ApiParam("缺陷位置名称")
private String defectLocationName;
@ApiParam(value = "创建用户")

10
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@ -13,16 +14,14 @@ import java.io.Serializable;
* @date 2020/12/18 17:16
**/
@Data
@NoArgsConstructor
@ApiModel("产品履历报表-料箱信息")
public class PackageTravelModel implements Serializable {
private static final long serialVersionUID = -7031472442162953544L;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("料箱编号")
@ -37,7 +36,7 @@ public class PackageTravelModel implements Serializable {
@ApiParam("料箱状态")
private String useStatus;
@ApiParam("料箱状态Name")
@ApiParam("料箱状态名称")
private String useStatusName;
@ApiParam("物料码")
@ -55,10 +54,9 @@ public class PackageTravelModel implements Serializable {
@ApiParam("执行动作")
private Integer opType;
@ApiParam("执行动作Name")
@ApiParam("执行动作名称")
private String opTypeName;
@ApiParam("执行时间")
private String createDatetime;

65
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java
Unescape Escape View File

@ -0,0 +1,65 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author yumingxing
* @version 1.0
* @date 2020/12/24 18:57
**/
@Data
@NoArgsConstructor
@ApiModel("生产统计明细")
public class ProductDetailResult {
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("零件号")
private String partNo;
@ApiParam("零件描述")
private String partNameRdd;
@ApiParam("生产线")
private String workCenterCode;
@ApiParam("工序")
private String processCode;
@ApiParam("工序名称")
private String processName;
@ApiParam("条码状态")
private String qcStatus;
@ApiParam(value = "创建用户")
public String createUser;
@ApiParam(value = "创建日期")
public String createDatetime;
@ApiParam(value = "修改人")
public String modifyUser;
@ApiParam(value = "修改日期")
public String modifyDatetime;
public ProductDetailResult(String serialNumber, String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.serialNumber = serialNumber;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workCenterCode = workCenterCode;
this.processCode = processCode;
this.processName = processName;
this.qcStatus = qcStatus;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

56
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java
Unescape Escape View File

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* @author yumingxing 生产总数
* @version 1.0
* @date 2020/12/24 18:57
**/
@Data
@NoArgsConstructor
public class ProductResult {
@ApiParam("工作单元")
private String workCellCode;
@ApiParam("零件号")
private String partNo;
@ApiParam("零件描述")
private String partNameRdd;
@ApiParam("生产线")
private String workCenterCode;
@ApiParam("工序")
private String processCode;
@ApiParam("工序名称")
private String processName;
@ApiParam("生产总数")
private long totalProduction;
@ApiParam("合格数")
private long qualified;
@ApiParam("冻结数")
private long unqualified;
@ApiParam("报废数")
private long scrap;
@ApiParam("合格率")
private BigDecimal qualifiedRate;
@ApiParam("冻结率")
private BigDecimal unqualifiedRate;
@ApiParam("报废率")
private BigDecimal scrapRate;
public ProductResult(String workCellCode,String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) {
this.workCellCode = workCellCode;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workCenterCode = workCenterCode;
this.processCode = processCode;
this.processName = processName;
this.qualified = qualified;
this.unqualified = unqualified;
this.scrap = scrap;
}
}

29
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java
Unescape Escape View File

@ -0,0 +1,29 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* 生产统计
* @author yumingxing
* @version 1.0
* @date 2020/12/24 16:13
**/
@Data
public class ProductStatisticsQueryModel {
@ApiParam("生产线")
private String workCenterCode;
@ApiParam("工序")
private String processCode;
@ApiParam("零件号")
private String partNo;
@ApiParam("开始日期")
private String modifyStartDate;
@ApiParam("结束日期")
private String modifyEndDate;
@ApiParam("质量状态")
private String qcStatus;
@ApiParam("过程条码")
private String serialNumber;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java
Unescape Escape View File

@ -7,14 +7,12 @@ import lombok.Data;
import java.util.List;
/**
* 全工序报废率-查询条件-model
* @author yumingxing
* @version 1.0
* @date 2020/12/21 10:10
**/
@Data
@ApiModel("全工序报废率-查询条件")
public class ProcessScrapRateQueryModel {
public class ReportQueryModel {
@ApiParam("工序")
private List<String> processCodeList;

42
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java
Unescape Escape View File

@ -1,7 +1,12 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 报废占比柏拉图Model
@ -10,17 +15,38 @@ import lombok.Data;
* @date 2020/12/23 15:09
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel("报废占比柏拉图")
public class ScrapOfPlatoModel {
@ApiParam("缺陷数")
private String numberOfDefects;
@ApiParam("缺陷类型")
private String defectType;
@ApiParam("缺陷类型名称")
private String defectTypeName;
@ApiParam("项目")
private String prodCfgTypeCode;
@ApiParam("零件号")
private String partNo;
@ApiParam("项目")
private String prodCfgTypeCode;
@ApiParam("缺陷代码")
private String defectCode;
@ApiParam("缺陷名称")
private String defectName;
@ApiParam("缺陷数")
private long numberOfDefects;
@ApiParam("工作单元")
private String workCellCode;
@ApiParam("报废率")
private BigDecimal scrapRate;
@ApiParam("报废占比")
private BigDecimal scrapRatio;
@ApiParam("柏拉图报废占比")
private BigDecimal scrapRatioPlato;
public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) {
this.partNo = partNo;
this.prodCfgTypeCode = prodCfgTypeCode;
this.defectCode = defectCode;
this.defectName = defectName;
this.numberOfDefects = numberOfDefects;
this.workCellCode = workCellCode;
}
}

Write Preview
Loading…
Cancel
Save