diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java index 6f22818..bebfac6 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java @@ -113,7 +113,7 @@ public class QcReportData extends QueryPage { /** * 质检备注 */ - @ExcelProperty(index = 26, value = "质检备注") + @ExcelProperty(index = 27, value = "质检备注") private String inspectionRemark; /** * 到货数量 @@ -128,17 +128,17 @@ public class QcReportData extends QueryPage { /** * 处置措施 */ - @ExcelProperty(index = 27, value = "处置措施") + @ExcelProperty(index = 28, value = "处置措施") private String disposalMeasures; /** * 处置说明 */ - @ExcelProperty(index = 28, value = "处置说明") + @ExcelProperty(index = 29, value = "处置说明") private String disposalRemark; /** * 检验时间 */ - @ExcelProperty(index = 30, value = "检验时间") + @ExcelProperty(index = 31, value = "检验时间") private String inspectorDate; /** * 标签条码 @@ -163,7 +163,7 @@ public class QcReportData extends QueryPage { /** * 开始检验时间 */ - @ExcelProperty(index = 29, value = "开始检验时间") + @ExcelProperty(index = 30, value = "开始检验时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date actionDate; @@ -225,27 +225,27 @@ public class QcReportData extends QueryPage { /** * 检验项目编码 */ - @ExcelProperty(index = 32, value = "检验项目编码") + @ExcelProperty(index = 34, value = "检验项目编码") private String itemNo; /** * 检验项目名称 */ - @ExcelProperty(index = 33, value = "检验项目名称") + @ExcelProperty(index = 35, value = "检验项目名称") private String itemDesc; /** * 标准值 */ - @ExcelProperty(index = 34, value = "标准值") + @ExcelProperty(index = 36, value = "标准值") private String defaultValue; /** * 上限值 */ - @ExcelProperty(index = 35, value = "上限值") + @ExcelProperty(index = 37, value = "上限值") private BigDecimal maxValue; /** * 下限值 */ - @ExcelProperty(index = 36, value = "下限值") + @ExcelProperty(index = 38, value = "下限值") private BigDecimal minValue; /** * 抽样数量(项目) @@ -260,7 +260,7 @@ public class QcReportData extends QueryPage { /** * 实测值 */ - @ExcelProperty(index = 37, value = "实测值") + @ExcelProperty(index = 39, value = "实测值") private String textValue; /** * 检验类型 @@ -320,7 +320,7 @@ public class QcReportData extends QueryPage { /** * 质检员名称 */ - @ExcelProperty(index = 31, value = "开始检验时间") + @ExcelProperty(index = 32, value = "开始检验时间") private String inspectorName; /** * 检验任务类型 @@ -375,7 +375,7 @@ public class QcReportData extends QueryPage { /** * 项目检验结论 */ - @ExcelProperty(index = 38, value = "项目检验结论") + @ExcelProperty(index = 40, value = "项目检验结论") private String itemResultDesc; @ExcelIgnore private String downloadType; @@ -383,4 +383,10 @@ public class QcReportData extends QueryPage { @TableField(exist = false) private String workCenterDesc; + @ExcelProperty(index = 33, value = "协同人员") + private String operatorName; + + @ExcelProperty(index = 26, value = "责任人(供应商)") + private String responsiblePerson; + } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcReportFQASData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcReportFQASData.java index b17e672..797e406 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcReportFQASData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/QcReportFQASData.java @@ -125,82 +125,89 @@ public class QcReportFQASData extends QueryPage { */ @ExcelProperty(index = 21, value = "关联单号6") private String orderRef6; + /** + * 责任人(供应商) + */ + @ExcelProperty(index = 22, value = "责任人(供应商)") + private String responsiblePerson; /** * 质检备注 */ - @ExcelProperty(index = 22, value = "质检备注") + @ExcelProperty(index = 23, value = "质检备注") private String inspectionRemark; /** * 处置措施 */ - @ExcelProperty(index = 23, value = "处置措施") + @ExcelProperty(index = 24, value = "处置措施") private String disposalMeasures; /** * 处置说明 */ - @ExcelProperty(index = 24, value = "处置说明") + @ExcelProperty(index = 25, value = "处置说明") private String disposalRemark; /** * 开始检验时间 */ - @ExcelProperty(index = 25, value = "开始检验时间") + @ExcelProperty(index = 26, value = "开始检验时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date actionDate; /** * 检验时间 */ - @ExcelProperty(index = 26, value = "检验时间") + @ExcelProperty(index = 27, value = "检验时间") private String inspectorDate; /** * 质检员名称 */ - @ExcelProperty(index = 27, value = "开始检验时间") + @ExcelProperty(index = 28, value = "质检员") private String inspectorName; + @ExcelProperty(index = 29, value = "协同人员") + private String operatorName; /** * 检验项目编码 */ - @ExcelProperty(index = 28, value = "检验项目编码") + @ExcelProperty(index = 30, value = "检验项目编码") private String itemNo; /** * 检验项目名称 */ - @ExcelProperty(index = 29, value = "检验项目名称") + @ExcelProperty(index = 31, value = "检验项目名称") private String itemDesc; /** * 标准值 */ - @ExcelProperty(index = 30, value = "标准值") + @ExcelProperty(index = 32, value = "标准值") private String defaultValue; /** * 上限值 */ - @ExcelProperty(index = 31, value = "上限值") + @ExcelProperty(index = 33, value = "上限值") private BigDecimal maxValue; /** * 下限值 */ - @ExcelProperty(index = 32, value = "下限值") + @ExcelProperty(index = 34, value = "下限值") private BigDecimal minValue; /** * 抽样数量(项目) */ - @ExcelProperty(index = 33, value = "抽样数量(项目)") + @ExcelProperty(index = 35, value = "抽样数量(项目)") private BigDecimal itemSamplingQty; /** * 不合格数量(项目) */ - @ExcelProperty(index = 34, value = "不合格数量(项目)") + @ExcelProperty(index = 36, value = "不合格数量(项目)") private BigDecimal unqualifiedQuantity; /** * 实测值 */ - @ExcelProperty(index = 35, value = "实测值") + @ExcelProperty(index = 37, value = "实测值") private String textValue; /** * 项目检验结论 */ - @ExcelProperty(index = 36, value = "项目检验结论") + @ExcelProperty(index = 38, value = "项目检验结论") private String itemResultDesc; diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcReportIPQCData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcReportIPQCData.java index f1f8f01..261520e 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcReportIPQCData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/QcReportIPQCData.java @@ -125,77 +125,83 @@ public class QcReportIPQCData extends QueryPage { */ @ExcelProperty(index = 21, value = "不合格数量") private BigDecimal notPassQty; + + @ExcelProperty(index = 22, value = "责任人(供应商)") + private String responsiblePerson; /** * 质检备注 */ - @ExcelProperty(index = 22, value = "质检备注") + @ExcelProperty(index = 23, value = "质检备注") private String inspectionRemark; /** * 处置说明 */ - @ExcelProperty(index = 23, value = "处置说明") + @ExcelProperty(index = 24, value = "处置说明") private String disposalRemark; /** * 开始检验时间 */ - @ExcelProperty(index = 24, value = "开始检验时间") + @ExcelProperty(index = 25, value = "开始检验时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date actionDate; /** * 检验时间 */ - @ExcelProperty(index = 25, value = "检验时间") + @ExcelProperty(index = 26, value = "检验时间") private String inspectorDate; /** * 特殊要求 */ - @ExcelProperty(index = 26, value = "特殊要求") + @ExcelProperty(index = 27, value = "特殊要求") private String specialRequirements; + @ExcelProperty(index = 28, value = "协同人员") + private String operatorName; + /** * 检验项目编码 */ - @ExcelProperty(index = 27, value = "检验项目编码") + @ExcelProperty(index = 29, value = "检验项目编码") private String itemNo; /** * 检验项目名称 */ - @ExcelProperty(index = 28, value = "检验项目名称") + @ExcelProperty(index = 30, value = "检验项目名称") private String itemDesc; /** * 标准值 */ - @ExcelProperty(index = 29, value = "标准值") + @ExcelProperty(index = 31, value = "标准值") private String defaultValue; /** * 上限值 */ - @ExcelProperty(index = 30, value = "上限值") + @ExcelProperty(index = 32, value = "上限值") private BigDecimal maxValue; /** * 下限值 */ - @ExcelProperty(index = 31, value = "下限值") + @ExcelProperty(index = 33, value = "下限值") private BigDecimal minValue; /** * 抽样数量(项目) */ - @ExcelProperty(index = 32, value = "抽样数量(项目)") + @ExcelProperty(index = 34, value = "抽样数量(项目)") private BigDecimal itemSamplingQty; /** * 不合格数量(项目) */ - @ExcelProperty(index = 33, value = "不合格数量(项目)") + @ExcelProperty(index = 35, value = "不合格数量(项目)") private BigDecimal unqualifiedQuantity; /** * 实测值 */ - @ExcelProperty(index = 34, value = "实测值") + @ExcelProperty(index = 36, value = "实测值") private String textValue; /** * 项目检验结论 */ - @ExcelProperty(index = 35, value = "项目检验结论") + @ExcelProperty(index = 37, value = "项目检验结论") private String itemResultDesc; /** diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml index 893cd1d..fb2ddc9 100644 --- a/src/main/resources/mapper/pms/QcReportMapper.xml +++ b/src/main/resources/mapper/pms/QcReportMapper.xml @@ -56,7 +56,9 @@ END as itemResultDesc, CASE WHEN b.value_type_db = 'T' THEN b.text_value WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126) - END as textValue + END as textValue, + isnull(dbo.joint_name (a.site, a.bu_no, a.inspection_no, 'coordination'), '') AS operatorName, + isnull(dbo.joint_id (a.site, a.bu_no, a.inspection_no, 'supplier'), '') AS responsiblePerson FROM qc_iqc_record as a LEFT JOIN qc_iqc_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no left join part as d on a.site = d.site and a.part_no = d.PartNo @@ -198,7 +200,9 @@ END as itemResultDesc, CASE WHEN b.value_type_db = 'T' THEN b.text_value WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126) - END as textValue + END as textValue, + isnull(dbo.joint_name (a.site, a.bu_no, a.inspection_no, 'coordination'), '') AS operatorName, + isnull(dbo.joint_id (a.site, a.bu_no, a.inspection_no, 'supplier'), '') AS responsiblePerson FROM qc_ipqc_record as a LEFT JOIN qc_ipqc_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no left join WorkCenterResource as r on a.site = r.site and a.resource_id = r.resourceID @@ -322,7 +326,9 @@ END as itemResultDesc, CASE WHEN b.value_type_db = 'T' THEN b.text_value WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126) - END as textValue + END as textValue, + isnull(dbo.joint_name (a.site, a.bu_no, a.inspection_no, 'coordination'), '') AS operatorName, + isnull(dbo.joint_id (a.site, a.bu_no, a.inspection_no, 'supplier'), '') AS responsiblePerson FROM qc_stock_record as a LEFT JOIN qc_stock_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no left join part as d on a.site = d.site and a.part_no = d.PartNo @@ -447,7 +453,9 @@ END as itemResultDesc, CASE WHEN b.value_type_db = 'T' THEN b.text_value WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126) - END as textValue + END as textValue, + isnull(dbo.joint_name (a.site, a.bu_no, a.inspection_no, 'coordination'), '') AS operatorName, + isnull(dbo.joint_id (a.site, a.bu_no, a.inspection_no, 'supplier'), '') AS responsiblePerson FROM qc_stock_record as a LEFT JOIN qc_stock_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no left join part as d on a.site = d.site and a.part_no = d.PartNo @@ -662,7 +670,9 @@ END as itemResultDesc, CASE WHEN b.value_type_db = 'T' THEN b.text_value WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126) - END as textValue + END as textValue, + isnull(dbo.joint_name (a.site, a.bu_no, a.inspection_no, 'coordination'), '') AS operatorName, + isnull(dbo.joint_id (a.site, a.bu_no, a.inspection_no, 'supplier'), '') AS responsiblePerson FROM qc_iqc_record as a LEFT JOIN qc_iqc_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no left join part as d on a.site = d.site and a.part_no = d.PartNo @@ -867,7 +877,9 @@ END as itemResultDesc, CASE WHEN b.value_type_db = 'T' THEN b.text_value WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126) - END as textValue + END as textValue, + isnull(dbo.joint_name (a.site, a.bu_no, a.inspection_no, 'coordination'), '') AS operatorName, + isnull(dbo.joint_id (a.site, a.bu_no, a.inspection_no, 'supplier'), '') AS responsiblePerson FROM qc_ipqc_record as a LEFT JOIN qc_ipqc_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no left join WorkCenterResource as r on a.site = r.site and a.resource_id = r.resourceID @@ -1060,7 +1072,9 @@ END as itemResultDesc, CASE WHEN b.value_type_db = 'T' THEN b.text_value WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126) - END as textValue + END as textValue, + isnull(dbo.joint_name (a.site, a.bu_no, a.inspection_no, 'coordination'), '') AS operatorName, + isnull(dbo.joint_id (a.site, a.bu_no, a.inspection_no, 'supplier'), '') AS responsiblePerson FROM qc_stock_record as a LEFT JOIN qc_stock_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no left join part as d on a.site = d.site and a.part_no = d.PartNo @@ -1257,7 +1271,9 @@ END as itemResultDesc, CASE WHEN b.value_type_db = 'T' THEN b.text_value WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126) - END as textValue + END as textValue, + isnull(dbo.joint_name (a.site, a.bu_no, a.inspection_no, 'coordination'), '') AS operatorName, + isnull(dbo.joint_id (a.site, a.bu_no, a.inspection_no, 'supplier'), '') AS responsiblePerson FROM qc_stock_record as a LEFT JOIN qc_stock_detailed_record b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no left join part as d on a.site = d.site and a.part_no = d.PartNo