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

需求变更报表修改

Browse Source
yun-zuoyi
yumingxing 4 years ago
parent 6f1257b3d2
commit ca708c3f2d
7 changed files with 232 additions and 68 deletions
Show Stats Download Patch File Download Diff File

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

@ -0,0 +1,38 @@
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;
/**
* 产品工序过程查询-条件
* @author yumingxing
* @version 1.0
* @date 2021/1/10 11:02
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel("产品工序过程查询-条件")
public class ConditionQueryModel {
@ApiParam("项目名称")
private String prodCfgTypeCode;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("开始时间")
private String modifyStartTime;
@ApiParam("结束时间")
private String modifyEndTime;
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam("质量状态")
private Integer qcStatus;
}

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

@ -13,17 +13,22 @@ import java.io.Serializable;
* @date 2020/12/18 15:16
**/
@Data
@ApiModel("产品履历报表-缺陷信息")
@ApiModel("产品工序过程查询-缺陷信息")
public class DefectRecordModel implements Serializable {
private static final long serialVersionUID = 4994719388513997046L;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("不良处理类型")
private Integer defectActionType;
@ApiParam("工序名称")
private String processName;
@ApiParam("不良处理类型名称")
private String defectActionTypeName;
@ApiParam("质量代码")
private Integer qcStatus;
@ApiParam("质量状态")
private String qcStatusName;
@ApiParam("缺陷名称")
private String defectName;
@ -34,10 +39,28 @@ public class DefectRecordModel implements Serializable {
@ApiParam("缺陷位置名称")
private String defectLocationName;
@ApiParam(value = "创建用户")
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam(value = "执行人")
public String createUser;
@ApiParam(value = "创建日期")
@ApiParam(value = "扫描时间")
public String createDatetime;
public DefectRecordModel(String workCenterCode, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
this.workCenterCode = workCenterCode;
this.processName = processName;
this.qcStatus = qcStatus;
this.defectName = defectName;
this.defectLocation = defectLocation;
this.customerPartNo = customerPartNo;
this.serialNumber = serialNumber;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
}

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

@ -20,57 +20,61 @@ public class PackageTravelModel implements Serializable {
private static final long serialVersionUID = -7031472442162953544L;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("过程条码")
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam("料箱编号")
private String ctNo;
@ApiParam("CMS零件号")
private String partNo;
@ApiParam("包装号")
private String packageNo;
@ApiParam("CMS标签号")
private String qrCode;
@ApiParam("料箱类型")
private String cnCode;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("料箱状态")
private String useStatus;
@ApiParam("工序名称")
private String processName;
@ApiParam("料箱状态名称")
private String useStatusName;
@ApiParam("料架类型")
private String ctCode;
@ApiParam("物料码")
private String partNo;
@ApiParam("料架编号")
private String ctNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("进炉模式")
private String modelNo;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("工序信息")
private String processCode;
@ApiParam("炉内料架位置")
private String fnLocationNo;
@ApiParam("执行动作")
private Integer opType;
@ApiParam("层位置")
private String ctLocationNo;
@ApiParam("执行动作名称")
private String opTypeName;
@ApiParam("层内零件位置")
private String ctLocationPartNo;
@ApiParam("执行时间")
private String createDatetime;
public PackageTravelModel(String serialNumber, String ctNo, String packageNo, String cnCode, String useStatus, String partNo, String partNameRdd, String workCenterCode, String processCode, Integer opType, String createDatetime) {
@ApiParam("执行时间")
private String createUser;
public PackageTravelModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) {
this.customerPartNo = customerPartNo;
this.serialNumber = serialNumber;
this.ctNo = ctNo;
this.packageNo = packageNo;
this.cnCode = cnCode;
this.useStatus = useStatus;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qrCode = qrCode;
this.workCenterCode = workCenterCode;
this.processCode = processCode;
this.opType = opType;
this.processName = processName;
this.ctCode = ctCode;
this.ctNo = ctNo;
this.modelNo = modelNo;
this.fnLocationNo = fnLocationNo;
this.ctLocationNo = ctLocationNo;
this.createDatetime = createDatetime;
this.createUser = createUser;
}
}

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

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @author yumingxing
* @version 1.0
* @date 2021/1/9 14:29
**/
@ApiModel("项目号零件号")
@Data
public class ProdCustPartModel {
@ApiParam("项目号")
private String prodCfgTypeCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("客户零件号")
private String customerPartNo;
public ProdCustPartModel(String prodCfgTypeCode, String partNo, String customerPartNo) {
this.prodCfgTypeCode = prodCfgTypeCode;
this.partNo = partNo;
this.customerPartNo = customerPartNo;
}
}

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

@ -0,0 +1,62 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* 产品履历报表-产品信息
* @author yumingxing
* @version 1.0
* @date 2020/12/18 15:16
**/
@Data
@ApiModel("产品工序过程查询-条件查询页面")
public class ProductSnConditionModel implements Serializable {
private static final long serialVersionUID = 3154899794523800804L;
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("CMS零件号")
private String partNo;
@ApiParam("项目名称")
private String prodCfgTypeCode;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("工序名称")
private String processName;
@ApiParam("工位名称")
private String workCellName;
@ApiParam(value = "扫码时间")
public String createDatetime;
@ApiParam("质量状态")
private Integer qcStatus;
@ApiParam("质量状态Name")
private String qcStatusName;
public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterCode, String processName, String workCellName, String createDatetime, Integer qcStatus) {
this.serialNumber = serialNumber;
this.customerPartNo = customerPartNo;
this.partNo = partNo;
this.prodCfgTypeCode = prodCfgTypeCode;
this.workCenterCode = workCenterCode;
this.processName = processName;
this.workCellName = workCellName;
this.createDatetime = createDatetime;
this.qcStatus = qcStatus;
}
}

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

@ -19,44 +19,50 @@ public class ProductSnModel implements Serializable {
private static final long serialVersionUID = 5217363746963291483L;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("条码状态")
private Integer snStatus;
@ApiParam("条码状态Name")
private String snStatusName;
@ApiParam("质量状态")
private Integer qcStatus;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("质量状态Name")
private String qcStatusName;
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam("物料码")
@ApiParam("CMS零件号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("CMS标签号")
private String qrCode;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("流程代码")
private String routeCode;
@ApiParam("工序名称")
private String processName;
@ApiParam("工位名称")
private String workCellName;
@ApiParam("当前工序")
private String processCode;
@ApiParam(value = "执行人")
public String createUser;
@ApiParam("条码类型")
private Integer snType;
@ApiParam(value = "扫码时间")
public String createDatetime;
@ApiParam("条码类型Name")
private String snTypeName;
@ApiParam("质量代码")
private Integer qcStatus;
@ApiParam("质量状态")
private String qcStatusName;
@ApiParam(value = "执行时间")
public String modifyDatetime;
public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String workCellName, String createUser, String createDatetime, Integer qcStatus) {
this.customerPartNo = customerPartNo;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.qrCode = qrCode;
this.workCenterCode = workCenterCode;
this.processName = processName;
this.workCellName = workCellName;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.qcStatus = qcStatus;
}
}

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

@ -20,9 +20,6 @@ public class ReportQueryModel {
@ApiParam("项目号")
private List<String> prodCfgTypeCodeList;
/**
* 零件号取物料号
*/
@ApiParam("零件号")
private List<String> partNoList;
@ -38,4 +35,7 @@ public class ReportQueryModel {
@ApiParam("姓名")
private String userName;
@ApiParam("单个工序")
private String singleProcessCode;
}

Write Preview
Loading…
Cancel
Save