|
|
@ -14,52 +14,83 @@ import java.time.LocalDateTime;
|
|
|
|
@ExcelIgnoreUnannotated
|
|
|
|
@ExcelIgnoreUnannotated
|
|
|
|
public class UnqualifiedNotificationRespVO {
|
|
|
|
public class UnqualifiedNotificationRespVO {
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "自增字段,唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "11880")
|
|
|
|
@Schema(description = "自增字段,唯一", requiredMode = Schema.RequiredMode.REQUIRED)
|
|
|
|
@ExcelProperty("自增字段,唯一")
|
|
|
|
|
|
|
|
private Long id;
|
|
|
|
private Long id;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "编号,唯一")
|
|
|
|
@Schema(description = "编号,唯一")
|
|
|
|
@ExcelProperty("编号,唯一")
|
|
|
|
@ExcelProperty("品质异常通知编号")
|
|
|
|
private String code;
|
|
|
|
private String code;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "质检类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
|
|
|
|
@Schema(description = "质检类型", requiredMode = Schema.RequiredMode.REQUIRED)
|
|
|
|
@ExcelProperty(value = "质检类型", converter = DictConvert.class)
|
|
|
|
@ExcelProperty(value = "质检类型", converter = DictConvert.class)
|
|
|
|
@DictFormat("biz_inspection_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
|
|
|
|
@DictFormat("biz_inspection_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
|
|
|
|
private String type;
|
|
|
|
private String type;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "单据状态 已保存|已送审|已审核 1|2|3", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
|
|
|
@Schema(description = "生产订单号")
|
|
|
|
@ExcelProperty(value = "单据状态 已保存|已送审|已审核 1|2|3", converter = DictConvert.class)
|
|
|
|
@ExcelProperty("生产订单号")
|
|
|
|
@DictFormat("biz_unqualified_notification_status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
|
|
|
|
private String projectCode;
|
|
|
|
private Integer notificationStatus;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "项目订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26682")
|
|
|
|
@Schema(description = "客户名称")
|
|
|
|
@ExcelProperty("项目订单id")
|
|
|
|
@ExcelProperty("客户名称")
|
|
|
|
private Long projectId;
|
|
|
|
private String customerName;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "子项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28456")
|
|
|
|
@Schema(description = "产品编号")
|
|
|
|
@ExcelProperty("子项目id")
|
|
|
|
@ExcelProperty("产品编号")
|
|
|
|
private Long projectSubId;
|
|
|
|
private String projectSubCode;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "车间id", example = "21454")
|
|
|
|
@Schema(description = "产品名称")
|
|
|
|
@ExcelProperty("车间id")
|
|
|
|
@ExcelProperty("产品名称")
|
|
|
|
private Long workshopId;
|
|
|
|
private String projectSubName;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "工序id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14739")
|
|
|
|
@Schema(description = "生产车间")
|
|
|
|
@ExcelProperty("工序id")
|
|
|
|
@ExcelProperty("生产车间")
|
|
|
|
private Long procedureId;
|
|
|
|
private String workshopName;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "责任工序")
|
|
|
|
|
|
|
|
@ExcelProperty("责任工序")
|
|
|
|
|
|
|
|
private String procedureName;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "检验数量")
|
|
|
|
|
|
|
|
@ExcelProperty("检验数量")
|
|
|
|
|
|
|
|
private Integer checkAmount;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "异常数量", requiredMode = Schema.RequiredMode.REQUIRED)
|
|
|
|
@Schema(description = "异常数量")
|
|
|
|
@ExcelProperty("异常数量")
|
|
|
|
@ExcelProperty("异常数量")
|
|
|
|
private Integer amount;
|
|
|
|
private Integer amount;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "责任人", requiredMode = Schema.RequiredMode.REQUIRED)
|
|
|
|
@Schema(description = "责任人")
|
|
|
|
@ExcelProperty("责任人")
|
|
|
|
@ExcelProperty("责任人")
|
|
|
|
private Long owner;
|
|
|
|
private String ownerName;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "情况描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
|
|
|
|
@Schema(description = "情况描述")
|
|
|
|
@ExcelProperty("情况描述")
|
|
|
|
@ExcelProperty("情况描述")
|
|
|
|
private String remark;
|
|
|
|
private String remark;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "解决方案描述")
|
|
|
|
|
|
|
|
@ExcelProperty("解决方案描述")
|
|
|
|
|
|
|
|
private String solutionContent;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "处罚意见")
|
|
|
|
|
|
|
|
@ExcelProperty("处罚意见")
|
|
|
|
|
|
|
|
private String punishmentOpinion;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "创建时间")
|
|
|
|
|
|
|
|
@ExcelProperty("创建时间")
|
|
|
|
|
|
|
|
private LocalDateTime createTime;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "审核时间")
|
|
|
|
|
|
|
|
@ExcelProperty("审核时间")
|
|
|
|
|
|
|
|
private LocalDateTime auditTime;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "质检人")
|
|
|
|
|
|
|
|
@ExcelProperty("质检人")
|
|
|
|
|
|
|
|
private String creatorName;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "单据状态 已保存|已送审|已审核 1|2|3")
|
|
|
|
|
|
|
|
@ExcelProperty(value = "单据状态", converter = DictConvert.class)
|
|
|
|
|
|
|
|
@DictFormat("biz_unqualified_notification_status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
|
|
|
|
|
|
|
|
private Integer notificationStatus;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "审核人")
|
|
|
|
@Schema(description = "审核人")
|
|
|
|
@ExcelProperty("审核人")
|
|
|
|
@ExcelProperty("审核人")
|
|
|
|
private Long auditor;
|
|
|
|
private Long auditor;
|
|
|
@ -69,32 +100,28 @@ public class UnqualifiedNotificationRespVO {
|
|
|
|
@DictFormat("biz_unqualified_notification_opinion") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
|
|
|
|
@DictFormat("biz_unqualified_notification_opinion") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
|
|
|
|
private String auditOpinion;
|
|
|
|
private String auditOpinion;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "状态,1表示正常,2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
|
|
|
|
|
|
|
@ExcelProperty("状态,1表示正常,2表示禁用")
|
|
|
|
|
|
|
|
private Integer status;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
|
|
|
|
|
|
|
@ExcelProperty("创建时间")
|
|
|
|
|
|
|
|
private LocalDateTime createTime;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "审核时间")
|
|
|
|
@Schema(description = "项目订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26682")
|
|
|
|
@ExcelProperty("审核时间")
|
|
|
|
private Long projectId;
|
|
|
|
private LocalDateTime auditTime;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "项目名称")
|
|
|
|
@Schema(description = "子项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28456")
|
|
|
|
private String projectName;
|
|
|
|
private Long projectSubId;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "项目编号")
|
|
|
|
@Schema(description = "车间id", example = "21454")
|
|
|
|
private String projectCode;
|
|
|
|
private Long workshopId;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "客户名称")
|
|
|
|
@Schema(description = "工序id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14739")
|
|
|
|
private String customerName;
|
|
|
|
private Long procedureId;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "子项目编号")
|
|
|
|
@Schema(description = "责任人")
|
|
|
|
private String projectSubName;
|
|
|
|
private Long owner;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "子项目编号")
|
|
|
|
@Schema(description = "状态,1表示正常,2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
|
|
|
private String projectSubCode;
|
|
|
|
private Integer status;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "项目名称")
|
|
|
|
|
|
|
|
private String projectName;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "零件名称")
|
|
|
|
@Schema(description = "零件名称")
|
|
|
|
private String materialName;
|
|
|
|
private String materialName;
|
|
|
@ -114,37 +141,16 @@ public class UnqualifiedNotificationRespVO {
|
|
|
|
@Schema(description = "系统单位")
|
|
|
|
@Schema(description = "系统单位")
|
|
|
|
private String unit;
|
|
|
|
private String unit;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "工序名称")
|
|
|
|
|
|
|
|
private String procedureName;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "审核人名称")
|
|
|
|
@Schema(description = "审核人名称")
|
|
|
|
private String auditorName;
|
|
|
|
private String auditorName;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "责任人名称")
|
|
|
|
|
|
|
|
private String ownerName;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "创建人名称")
|
|
|
|
|
|
|
|
private String creatorName;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "异常统计数量")
|
|
|
|
@Schema(description = "异常统计数量")
|
|
|
|
private String statisticAmount;
|
|
|
|
private String statisticAmount;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "车间名称")
|
|
|
|
|
|
|
|
private String workshopName;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "文件附件")
|
|
|
|
@Schema(description = "文件附件")
|
|
|
|
private String fileUrl;
|
|
|
|
private String fileUrl;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "生产数量")
|
|
|
|
@Schema(description = "生产数量")
|
|
|
|
private Integer productAmount;
|
|
|
|
private Integer productAmount;
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "检验数量")
|
|
|
|
|
|
|
|
private Integer checkAmount;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "解决方案")
|
|
|
|
|
|
|
|
private String solutionContent;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Schema(description = "处罚意见")
|
|
|
|
|
|
|
|
private String punishmentOpinion;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|