From 050e14604f1634696496814985c86faff41bd94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 22 Nov 2024 09:07:23 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=93=81?= =?UTF-8?q?=E8=B4=A8=E5=8D=95=E6=8A=A5=E5=91=8A=E7=B1=BB=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/domain/QualityOrderReport.java | 243 ++++++++++++++++-- 1 file changed, 217 insertions(+), 26 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReport.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReport.java index 4fbc151f..0141d4b1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReport.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReport.java @@ -22,6 +22,15 @@ public class QualityOrderReport extends BaseEntity /** 品质单报告Id */ private Long qualityOrderReportId; + /** 品质单报告单号 */ + private String qualityOrderReportCode; + + /** 关联订单号 */ + private String relatedOrderCode; + + /** 品质报告单类型 */ + private String qualityOrderReportType; + /** 品质单号 */ @Excel(name = "品质单号") private String qualityOrderCode; @@ -46,16 +55,29 @@ public class QualityOrderReport extends BaseEntity @Excel(name = "生产订单数") private Integer makeTotal; - /** 委内已完成数 */ - @Excel(name = "委内已完成数") - private Integer makeInNum; - /** 实际到货数量 */ - @Excel(name = "实际到货数量") - private Integer actualArriveNum; + /** 原实际到货数量 */ + @Excel(name = "检验数") + private int checkNum; + + //交付质检时间 + @JsonFormat(pattern = "yyyy-MM-dd") + private Date deliveryInspectionTime; + + /** 入库单号 */ + @Excel(name = "入库单号") + private String inStorageCode; + + /** 品质单订单类型 */ + @Excel(name = "品质单订单类型") + private String qualityOrderType; + + /** 品质单入库类型 */ + @Excel(name = "品质单入库类型") + private String qualityStorageStatus; /** 品质已合格数 */ - @Excel(name = "品质已合格数") + @Excel(name = "合格数") private Integer qualityHasqualifiedNum; /** ok允收数 */ @@ -88,7 +110,7 @@ public class QualityOrderReport extends BaseEntity private String processBadGrade; /** 不良数量 */ - @Excel(name = "不良数量") + @Excel(name = "不良数") private Integer processBadNum; /** 不合格报告url */ @@ -98,6 +120,40 @@ public class QualityOrderReport extends BaseEntity /*不合格数集合*/ List unqualifiedDataList; + //品质报告单包含出货设备ID集合 + List qualityReportDeviceIds; + + @Excel(name = "使用状态") + private String useStatus; + + @Excel(name = "审核状态") + private String auditStatus; + + /** 流程实例ID */ + private String instanceId; + + /** 流程实例类型 */ + private String instanceType; + + /** 提交流程实例ID */ + private String submitInstanceId; + + /** 作废流程实例ID */ + private String cancelInstanceId; + + /** 恢复流程实例ID */ + private String restoreInstanceId; + + /** 申请标题 */ + private String applyTitle; + + /** 申请人 */ + private String applyUser; + + /** 申请时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date applyTime; + public void setQualityOrderReportId(Long qualityOrderReportId) { this.qualityOrderReportId = qualityOrderReportId; @@ -163,22 +219,6 @@ public class QualityOrderReport extends BaseEntity return makeTotal; } - public Integer getMakeInNum() { - return makeInNum; - } - - public void setMakeInNum(Integer makeInNum) { - this.makeInNum = makeInNum; - } - - public Integer getActualArriveNum() { - return actualArriveNum; - } - - public void setActualArriveNum(Integer actualArriveNum) { - this.actualArriveNum = actualArriveNum; - } - public void setQualityHasqualifiedNum(Integer qualityHasqualifiedNum) { this.qualityHasqualifiedNum = qualityHasqualifiedNum; @@ -279,6 +319,158 @@ public class QualityOrderReport extends BaseEntity this.processBadNum = processBadNum; } + public String getUseStatus() { + return useStatus; + } + + public void setUseStatus(String useStatus) { + this.useStatus = useStatus; + } + + public String getAuditStatus() { + return auditStatus; + } + + public void setAuditStatus(String auditStatus) { + this.auditStatus = auditStatus; + } + + public String getApplyUser() { + return applyUser; + } + + public void setApplyUser(String applyUser) { + this.applyUser = applyUser; + } + + public String getInstanceId() { + return instanceId; + } + + public void setInstanceId(String instanceId) { + this.instanceId = instanceId; + } + + public String getInstanceType() { + return instanceType; + } + + public void setInstanceType(String instanceType) { + this.instanceType = instanceType; + } + + public String getSubmitInstanceId() { + return submitInstanceId; + } + + public void setSubmitInstanceId(String submitInstanceId) { + this.submitInstanceId = submitInstanceId; + } + + public String getCancelInstanceId() { + return cancelInstanceId; + } + + public void setCancelInstanceId(String cancelInstanceId) { + this.cancelInstanceId = cancelInstanceId; + } + + public String getRestoreInstanceId() { + return restoreInstanceId; + } + + public void setRestoreInstanceId(String restoreInstanceId) { + this.restoreInstanceId = restoreInstanceId; + } + + public String getApplyTitle() { + return applyTitle; + } + + public void setApplyTitle(String applyTitle) { + this.applyTitle = applyTitle; + } + + public Date getApplyTime() { + return applyTime; + } + + public void setApplyTime(Date applyTime) { + this.applyTime = applyTime; + } + + public int getCheckNum() { + return checkNum; + } + + public void setCheckNum(int checkNum) { + this.checkNum = checkNum; + } + + public Date getDeliveryInspectionTime() { + return deliveryInspectionTime; + } + + public void setDeliveryInspectionTime(Date deliveryInspectionTime) { + this.deliveryInspectionTime = deliveryInspectionTime; + } + + public String getQualityOrderReportCode() { + return qualityOrderReportCode; + } + + public void setQualityOrderReportCode(String qualityOrderReportCode) { + this.qualityOrderReportCode = qualityOrderReportCode; + } + + public String getInStorageCode() { + return inStorageCode; + } + + public void setInStorageCode(String inStorageCode) { + this.inStorageCode = inStorageCode; + } + + public String getQualityOrderType() { + return qualityOrderType; + } + + public void setQualityOrderType(String qualityOrderType) { + this.qualityOrderType = qualityOrderType; + } + + public String getQualityStorageStatus() { + return qualityStorageStatus; + } + + public void setQualityStorageStatus(String qualityStorageStatus) { + this.qualityStorageStatus = qualityStorageStatus; + } + + public List getQualityReportDeviceIds() { + return qualityReportDeviceIds; + } + + public void setQualityReportDeviceIds(List qualityReportDeviceIds) { + this.qualityReportDeviceIds = qualityReportDeviceIds; + } + + public String getRelatedOrderCode() { + return relatedOrderCode; + } + + public void setRelatedOrderCode(String relatedOrderCode) { + this.relatedOrderCode = relatedOrderCode; + } + + public String getQualityOrderReportType() { + return qualityOrderReportType; + } + + public void setQualityOrderReportType(String qualityOrderReportType) { + this.qualityOrderReportType = qualityOrderReportType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -289,8 +481,7 @@ public class QualityOrderReport extends BaseEntity .append("materialNo", getMaterialNo()) .append("materialName", getMaterialName()) .append("makeTotal", getMakeTotal()) - .append("makeInNum",getMakeInNum()) - .append("actualArriveNum", getActualArriveNum()) + .append("checkNum", getCheckNum()) .append("qualityHasqualifiedNum", getQualityHasqualifiedNum()) .append("okAcceptedNum", getOkAcceptedNum()) .append("okReportUrl", getOkReportUrl())