lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量月报去除：

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+4
View File
@@ -2474,6 +2474,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
#region 11.压力管道监检情况
/*
var PressureInspection = reportItem.Where(x => x.ReType == "11").ToList();
if (PressureInspection.Count > 0)
{
@@ -2529,6 +2530,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
table.Alignment = TableAlignment.Center;
}
*/
#endregion
#region 12.管道试压包管理情况
@@ -2589,6 +2591,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
#region 13.特种设备监检情况
/*
var SpecialInspection = reportItem.Where(x => x.ReType == "13").ToList();
if (SpecialInspection.Count > 0)
{
@@ -2643,6 +2646,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
table.Alignment = TableAlignment.Center;
}
*/
#endregion
#region 14.NCR管理情况
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+15 -15
View File
@@ -1401,7 +1401,7 @@
</Items>
</f:Panel>
<%--11.压力管道监检情况--%>
<f:Panel ID="Pnl11" IsFluid="true" Title="11.压力管道监检情况" runat="server" EnableCollapse="false"
<%--<f:Panel ID="Pnl11" IsFluid="true" Title="11.压力管道监检情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form28" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1444,9 +1444,9 @@
</Rows>
</f:Form>
</Items>
</f:Panel>
</f:Panel>--%>
<%--12.管道试压包管理情况--%>
<f:Panel ID="Pnl12" IsFluid="true" Title="12.管道试压包管理情况" runat="server" EnableCollapse="false"
<f:Panel ID="Pnl12" IsFluid="true" Title="11.管道试压包管理情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form29" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1495,7 +1495,7 @@
</Items>
</f:Panel>
<%--13.特种设备监检情况--%>
<f:Panel ID="Pnl13" IsFluid="true" Title="13.特种设备监检情况" runat="server" EnableCollapse="false"
<%--<f:Panel ID="Pnl13" IsFluid="true" Title="13.特种设备监检情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form30" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1539,9 +1539,9 @@
</Rows>
</f:Form>
</Items>
</f:Panel>
</f:Panel>--%>
<%--14.NCR管理情况--%>
<f:Panel ID="Pnl14" IsFluid="true" Title="14.NCR管理情况" runat="server" EnableCollapse="false"
<f:Panel ID="Pnl14" IsFluid="true" Title="12.NCR管理情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form31" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1587,7 +1587,7 @@
</Items>
</f:Panel>
<%--15.质量巡检情况--%>
<f:Panel ID="Panel21" IsFluid="true" Title="15.质量巡检情况" runat="server" EnableCollapse="false"
<f:Panel ID="Panel21" IsFluid="true" Title="13.质量巡检情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form20" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1641,7 +1641,7 @@
</Items>
</f:Panel>
<%--16.质量专项检查情况--%>
<f:Panel ID="Panel22" IsFluid="true" Title="16.质量专项检查情况" runat="server" EnableCollapse="false"
<f:Panel ID="Panel22" IsFluid="true" Title="14.质量专项检查情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form21" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1684,7 +1684,7 @@
</f:Panel>
<%--17.质量文件上报情况--%>
<f:Panel ID="Panel23" IsFluid="true" Title="17.质量文件上报情况" runat="server" EnableCollapse="false"
<f:Panel ID="Panel23" IsFluid="true" Title="15.质量文件上报情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form22" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1731,7 +1731,7 @@
</f:Panel>
<%--18.本月质量问题处理情况--%>
<f:Panel ID="Panel24" IsFluid="true" Title="18.本月质量问题处理情况" runat="server" EnableCollapse="false"
<f:Panel ID="Panel24" IsFluid="true" Title="16.本月质量问题处理情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Panel ID="Panel25" IsFluid="true" Title="（1）原材料问题" runat="server" EnableCollapse="false"
@@ -1883,7 +1883,7 @@
</f:Panel>
<%--19.下月质量控制重点--%>
<f:Panel ID="Panel27" IsFluid="true" Title="19.下月质量控制重点" runat="server" EnableCollapse="false"
<f:Panel ID="Panel27" IsFluid="true" Title="17.下月质量控制重点" runat="server" EnableCollapse="false"
ShowHeader="true">
<Toolbars>
<f:Toolbar ID="Toolbar7" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
@@ -1929,7 +1929,7 @@
</Items>
</f:Panel>
<%--20.项目质量体系审核--%>
<f:Panel ID="Panel3" IsFluid="true" Title="20.项目质量体系审核" runat="server" EnableCollapse="false"
<f:Panel ID="Panel3" IsFluid="true" Title="18.项目质量体系审核" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form3" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1946,7 +1946,7 @@
</Items>
</f:Panel>
<%--21.类似项目管理经验教训应对措施及跟踪--%>
<f:Panel ID="Panel1" IsFluid="true" Title="21.类似项目管理经验教训应对措施及跟踪" runat="server" EnableCollapse="false"
<f:Panel ID="Panel1" IsFluid="true" Title="19.类似项目管理经验教训应对措施及跟踪" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form2" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1964,7 +1964,7 @@
</f:Panel>
<%--22.附件--%>
<f:Panel ID="Panel2" IsFluid="true" Title="22.附件" runat="server" EnableCollapse="false"
<f:Panel ID="Panel2" IsFluid="true" Title="20.附件" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form4" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
@@ -1982,7 +1982,7 @@
</f:Panel>
<%--23.施工照片--%>
<f:Panel ID="Panel28" IsFluid="true" Title="23.施工照片" runat="server" EnableCollapse="false"
<f:Panel ID="Panel28" IsFluid="true" Title="21.施工照片" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form32" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+26 -12
View File
@@ -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管理情况
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs
Generated
-72
View File
@@ -941,42 +941,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </remarks>
protected global::FineUIPro.TextBox TextBox14;
/// <summary>
/// Pnl11 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Pnl11;
/// <summary>
/// Form28 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form28;
/// <summary>
/// gvPressureInspection 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvPressureInspection;
/// <summary>
/// TextBox15 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox15;
/// <summary>
/// Pnl12 控件。
/// </summary>
@@ -1013,42 +977,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </remarks>
protected global::FineUIPro.TextBox TextBox17;
/// <summary>
/// Pnl13 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Pnl13;
/// <summary>
/// Form30 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form30;
/// <summary>
/// gvSpecialInspection 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvSpecialInspection;
/// <summary>
/// TextBox18 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox18;
/// <summary>
/// Pnl14 控件。
/// </summary>