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

质量管理

This commit is contained in:
夏菊 2024-11-18 17:44:22 +08:00
parent ecaed6746b
commit 5fb846030f
10 changed files with 59 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
View File

@ -490,7 +490,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Ins.TestCycle = pds.Rows[i][7].ToString().Trim();
Ins.IsOnSite = pds.Rows[i][8].ToString().Trim() == "是" ? true : false;
Ins.IsVerification = pds.Rows[i][8].ToString().Trim() == "是" ? true : false;
if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim()))
{

10
SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
View File

@ -16,7 +16,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack) {
if (!IsPostBack)
{
Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
this.txtStartDate.Text = "2015-01-01";
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
@ -104,8 +105,11 @@ namespace FineUIPro.Web.CQMS.ManageReport
NCRStatisc.Num = i;
NCRStatisc.WorkName = item.ProfessionalName;
NCRStatisc.CheckNum = managementList.Count();
NCRStatisc.OKNum = managementList.Count(x => x.Status == "3");
NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3");
//NCRStatisc.OKNum = managementList.Count(x => x.Status == "3");
//NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3");
int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
NCRStatisc.OKNum = okNum;
NCRStatisc.NotOKNum = managementList.Count() - okNum;
NCRStatisc.Remark = "";
if (NCRStatisc.CheckNum != 0)//被除数不能为零
{

14
SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
View File

@ -45,9 +45,9 @@ namespace FineUIPro.Web.Transfer.Chart
public DataTable DataSql()
{
string strSql = @"select f.SubSysNo,f.ProjectId,f.TotalFactor,f.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
case ISNULL(f.TotalFactor,0) when 0 then 0
else CONVERT(DECIMAL(10,2),100*(ISNULL(f.CompleteFactor,0)*1.0/ISNULL(f.TotalFactor,0))) end CompleteProportion,
string strSql = @"select f.SubSysNo,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
case ISNULL(tpi3.TotalFactor,0) when 0 then 0
else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi3.CompleteFactor,0)*1.0/ISNULL(tpi3.TotalFactor,0))) end CompleteProportion,
ISNULL(tpi.PipingCount,0) PipingCount,ISNULL(tpi1.PipingScount,0) PipingScount,
case ISNULL(tpi.PipingCount,0)
@ -86,9 +86,9 @@ else CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0))) end
ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark
from(
SELECT TestPackage as SubSysNo,ProjectId,sum(TotalFactor)as TotalFactor,sum(CompleteFactor)as CompleteFactor FROM Transfer_Piping group by TestPackage,ProjectId
SELECT Commissioningsystemcode as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by Commissioningsystemcode,ProjectId
) f
left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SubmitPackage
left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
--piping
left join (select count(*)as PipingCount,ProjectId,TestPackage from Transfer_Piping
@ -103,6 +103,10 @@ left join (select count(*)as ReinstateScount,ProjectId,TestPackage from Transfer
group by ProjectId,TestPackage)
tpi2 on f.ProjectId=tpi2.ProjectId and f.SubSysNo=tpi2.TestPackage
left join (select sum(TotalFactor) as TotalFactor,sum(CompleteFactor) as CompleteFactor,ProjectId,TestPackage from Transfer_Piping
group by ProjectId,TestPackage)
tpi3 on f.ProjectId=tpi3.ProjectId and f.SubSysNo=tpi3.TestPackage
--设备测试包
left join (select count(*)as TseCount,ProjectId,TestPackage from Transfer_StaticEquipment
group by ProjectId,TestPackage)

72
SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs
View File

@ -16,13 +16,13 @@ namespace FineUIPro.Web.Transfer.Chart
if (!IsPostBack) {
var systemCode = Funs.DB.Transfer_LHCSystemList
.Where(x => x.ProjectId == CurrUser.LoginProjectId)
.GroupBy(p => new { p.SystemNo })
.Select(p => new { SystemNo = p.Key.SystemNo }).ToList();
.GroupBy(p => new { p.Commissioningsystemcode })
.Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
int indexRow = 1;
ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
foreach (var t in systemCode)
{
ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SystemNo, t.SystemNo));
ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode));
indexRow++;
}
@ -40,15 +40,15 @@ namespace FineUIPro.Web.Transfer.Chart
#region 统计所有
var systemCode = Funs.DB.Transfer_LHCSystemList
.Where(x => x.ProjectId == CurrUser.LoginProjectId)
.GroupBy(p => new { p.SystemNo })
.Select(p => new { SystemNo = p.Key.SystemNo }).ToList();
.GroupBy(p => new { p.Commissioningsystemcode })
.Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue))
{
systemCode= Funs.DB.Transfer_LHCSystemList
.Where(x => x.ProjectId == CurrUser.LoginProjectId && x.SystemNo == ddlSystemNo.SelectedValue)
.GroupBy(p => new { p.SystemNo })
.Select(p => new { SystemNo = p.Key.SystemNo }).ToList();
.GroupBy(p => new { p.Commissioningsystemcode })
.Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
}
#region 九个表的数据
var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid).ToList();
@ -57,7 +57,7 @@ namespace FineUIPro.Web.Transfer.Chart
var list4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == pid).ToList();
var list5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == pid).ToList();
var list6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == pid).ToList();
var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid).ToList();
//var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid).ToList();
var list8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == pid).ToList();
var list9 = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == pid).ToList();
#endregion
@ -67,46 +67,46 @@ namespace FineUIPro.Web.Transfer.Chart
dt.Columns.Add("进行中数量", typeof(string));
dt.Columns.Add("未完成数量", typeof(string));
foreach (var t in systemCode) {
var scode = t.SystemNo;
var scode = t.Commissioningsystemcode;
AllSystemNo += "'" + scode + "',";
DataRow dr = dt.NewRow();
dr["系统编号"] = scode;
#region 根据系统编号获取完成的数量
var completedCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "Completed").ToList().Count()
+ list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Completed").ToList().Count()
+ list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Completed").ToList().Count()
+ list4.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
+ list5.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
+ list6.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
+ list8.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
+ list9.Where(x => x.SystemName == scode && x.Status == "Completed").ToList().Count();
var completedCount = list1.Where(x => x.TestPackage == scode && x.FINALStatus == "Completed").ToList().Count()
+ list2.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Completed").ToList().Count()
+ list3.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Completed").ToList().Count()
+ list4.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count()
+ list5.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count()
+ list6.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count()
//+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
+ list8.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count()
+ list9.Where(x => x.Sub_Sys_No == scode && x.Status == "Completed").ToList().Count();
#endregion
dr["完成数量"] = completedCount;
completed+= "'" + completedCount.ToString() + "',";
#region 根据系统编号获取进行中数量
var InprogressCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "In progress").ToList().Count()
+ list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "In progress").ToList().Count()
+ list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "In progress").ToList().Count()
+ list4.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
+ list5.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
+ list6.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
+ list8.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
+ list9.Where(x => x.SystemName == scode && x.Status == "In progress").ToList().Count();
var InprogressCount = list1.Where(x => x.TestPackage == scode && x.FINALStatus == "In progress").ToList().Count()
+ list2.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "In progress").ToList().Count()
+ list3.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "In progress").ToList().Count()
+ list4.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count()
+ list5.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count()
+ list6.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count()
//+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
+ list8.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count()
+ list9.Where(x => x.Sub_Sys_No == scode && x.Status == "In progress").ToList().Count();
#endregion
dr["进行中数量"] = InprogressCount;
Inprogress += "'" + InprogressCount.ToString() + "',";
#region 根据系统编号获取未完成数量
var NotStartCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "Not Start").ToList().Count()
+ list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count()
+ list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count()
+ list4.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
+ list5.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
+ list6.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
+ list8.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
+ list9.Where(x => x.SystemName == scode && x.Status == "Not Start").ToList().Count();
var NotStartCount = list1.Where(x => x.TestPackage == scode && x.FINALStatus == "Not Start").ToList().Count()
+ list2.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count()
+ list3.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count()
+ list4.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count()
+ list5.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count()
+ list6.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count()
//+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
+ list8.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count()
+ list9.Where(x => x.Sub_Sys_No == scode && x.Status == "Not Start").ToList().Count();
#endregion
dr["未完成数量"] = NotStartCount;
NotStart += "'" + NotStartCount.ToString() + "',";

2
SGGL/FineUIPro.Web/Transfer/Electrical.aspx
View File

@ -67,7 +67,7 @@
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
HeaderTextAlign="Center" MinWidth="320px">
</f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">

2
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
View File

@ -67,7 +67,7 @@
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
HeaderTextAlign="Center" MinWidth="320px">
</f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">

3
SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
View File

@ -241,8 +241,7 @@ namespace FineUIPro.Web.Transfer
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = 100000;
this.BindGrid();
Response.Write(GetGridMultiHeaderTableHtml(Grid1));
//Response.Write(GetGridTableHtml(Grid1));
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}

2
SGGL/FineUIPro.Web/Transfer/Piping.aspx
View File

@ -59,7 +59,7 @@
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
HeaderTextAlign="Center" MinWidth="300px">
</f:RenderField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">

2
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
View File

@ -67,7 +67,7 @@
</f:RenderField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
HeaderTextAlign="Center" MinWidth="300px">
</f:RenderField>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"

2
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
View File

@ -71,7 +71,7 @@
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
HeaderTextAlign="Center" MinWidth="300px">
</f:RenderField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">