质量月报去除:

11.压力管道监检情况;
13.特种设备监检情况;
This commit is contained in:
2025-11-04 17:22:48 +08:00
parent 2128fe6a93
commit 95026b82ca
6 changed files with 55 additions and 109 deletions
@@ -373,15 +373,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
var inspectionEquipment = LoadInspectionEquipmentDt();
var measuringInspection = LoadMeasuringInspectionDt();
var checkLotBindStatisc = CheckLotBindStatiscDt();
var pressureInspection = LoadPressureInspectionDt();
//var pressureInspection = LoadPressureInspectionDt();
var InspectionDataInspection = loadInspectionDataInspectionDt();
var pipingInspection = LoadPipingInspectionDt();
var specialInspection = LoadSpecialInspectionDt();
//var specialInspection = LoadSpecialInspectionDt();
var ncrManagementInspection = LoadNcrManagementInspectionDt();
var qualityInspection = LoadQualityInspectionDt();
var specialCheck = loadSpecialCheckDt();
var fileReport = loadFileReportDt();
await Task.WhenAll(new[] { remarks, cqmsRemarks, generalPlanApproval, majorPlanApproval, inspectionTestPlan, designDetailsApprove, reviewDrawings, designChangeOrder, passWelder, processControl_NondestructiveTest, inspectionEquipment, measuringInspection, checkLotBindStatisc, InspectionDataInspection, pressureInspection, pipingInspection, specialInspection, ncrManagementInspection, qualityInspection, specialCheck, fileReport });
//await Task.WhenAll(new[] { remarks, cqmsRemarks, generalPlanApproval, majorPlanApproval, inspectionTestPlan, designDetailsApprove, reviewDrawings, designChangeOrder, passWelder, processControl_NondestructiveTest, inspectionEquipment, measuringInspection, checkLotBindStatisc, InspectionDataInspection, pressureInspection, pipingInspection, specialInspection, ncrManagementInspection, qualityInspection, specialCheck, fileReport });
await Task.WhenAll(new[] { remarks, cqmsRemarks, generalPlanApproval, majorPlanApproval, inspectionTestPlan, designDetailsApprove, reviewDrawings, designChangeOrder, passWelder, processControl_NondestructiveTest, inspectionEquipment, measuringInspection, checkLotBindStatisc, InspectionDataInspection, pipingInspection, ncrManagementInspection, qualityInspection, specialCheck, fileReport });
var generalPlanApprovalData = await generalPlanApproval;
var remarksData = await remarks;
@@ -397,9 +399,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
var measuringInspectionData = await measuringInspection;
var checkLotBindStatiscData = await checkLotBindStatisc;
var InspectionDataInspectionData = await InspectionDataInspection;
var pressureInspectionData = await pressureInspection;
//var pressureInspectionData = await pressureInspection;
var pipingInspectionData = await pipingInspection;
var specialInspectionData = await specialInspection;
//var specialInspectionData = await specialInspection;
var ncrManagementInspectionData = await ncrManagementInspection;
var qualityInspectionData = await qualityInspection;
var specialCheckData = await specialCheck;
@@ -2053,6 +2055,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
gvInspectionDataInspection.SummaryData = summary;
}
/*11.
if (pressureInspectionData != null)
{
var list = new List<Model.Report_CQMS_MonthReportItem>();
@@ -2132,7 +2135,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
gvPressureInspection.SummaryData = summary;
}
*/
if (pipingInspectionData != null)
{
var list = new List<Model.Report_CQMS_MonthReportItem>();
@@ -2210,7 +2213,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
gvPipingInspection.SummaryData = summary;
}
/*13.
if (specialInspectionData != null)
{
var list = new List<Model.Report_CQMS_MonthReportItem>();
@@ -2286,7 +2289,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
gvSpecialInspection.SummaryData = summary;
}
*/
if (ncrManagementInspectionData != null)
{
List<Model.NCRReportStatisc> StatisticsList = new List<Model.NCRReportStatisc>();
@@ -4526,6 +4529,9 @@ from View_MonthReport_InspectionManagement a with(nolock)
#endregion
#region 11. gvPressureInspection方法
/*11.
/// <summary>
/// 压力管道监检情况
/// </summary>
@@ -4599,6 +4605,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
gvPressureInspection.SummaryData = summary;
}
async Task<DataTable> LoadPressureInspectionDt()
{
return await Task.Run(() =>
@@ -4610,6 +4617,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
return dt;
});
}
*/
#endregion
@@ -4702,6 +4710,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
#endregion
#region 13. gvSpecialInspection方法
/*
/// <summary>
/// 特种设备监检情况
/// </summary>
@@ -4786,6 +4795,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
return dt;
});
}
*/
#endregion
#region 14.NCR管理情况 gvNcrManagementInspection方法
@@ -5792,12 +5802,12 @@ from View_MonthReport_InspectionManagement a with(nolock)
saveFFInspection();
saveXFInspection();
saveInspectionDataInspection();
//保存11.压力管道监检情况
savePressureInspection();
////保存11.压力管道监检情况
//savePressureInspection();
//保存12.管道试压包管理情况
savePipingInspection();
//保存13.特种设备监检情况
saveSpecialInspection();
////保存13.特种设备监检情况
//saveSpecialInspection();
//保存14.NCR管理情况
saveNcrManagementInspection();
@@ -6658,6 +6668,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
#endregion
#region 11.
/*
void savePressureInspection()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
@@ -6699,6 +6710,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
}
}
}
*/
#endregion
#region 12.
@@ -6747,6 +6759,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
#endregion
#region 13.
/*
void saveSpecialInspection()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
@@ -6788,6 +6801,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
}
}
}
*/
#endregion
#region 14.NCR管理情况