From 448fa6c4f2d02176f425b796449dacde122e20ef Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Wed, 20 Nov 2024 11:29:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9A=E5=AD=90=E9=A1=B9=E5=AE=8C=E6=88=90=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CQMS/ManageReport/WeekReportEdit.aspx.cs | 9 +- .../Transfer/Chart/Systemstatus.aspx | 52 ++-- .../Transfer/Chart/Systemstatus.aspx.cs | 230 ++++++++++++++++-- .../Transfer/Chart/SystemstatusChart.aspx.cs | 2 +- .../Transfer/CivilStructure.aspx | 2 +- .../Transfer/CivilStructureDataIn.aspx.cs | 5 +- .../Transfer/CivilStructureEdit.aspx.cs | 5 +- .../Transfer/ElectricalDataIn.aspx.cs | 5 +- .../Transfer/ElectricalEdit.aspx.cs | 5 +- SGGL/FineUIPro.Web/Transfer/Firefighting.aspx | 2 +- .../Transfer/FirefightingDataIn.aspx.cs | 6 +- .../Transfer/FirefightingEdit.aspx.cs | 5 +- .../Transfer/InstrumentationDataIn.aspx.cs | 5 +- .../Transfer/InstrumentationEdit.aspx.cs | 5 +- .../FineUIPro.Web/Transfer/LHCSystemList.aspx | 2 +- .../Transfer/PipingDataIn.aspx.cs | 5 +- .../FineUIPro.Web/Transfer/PipingEdit.aspx.cs | 4 +- SGGL/FineUIPro.Web/Transfer/Plumbing.aspx | 2 +- .../Transfer/PlumbingDataIn.aspx.cs | 5 +- .../Transfer/PlumbingEdit.aspx.cs | 5 +- .../FineUIPro.Web/Transfer/PunchlistFrom.aspx | 2 +- .../Transfer/RotatingEquipment.aspx | 2 +- .../Transfer/RotatingEquipmentDataIn.aspx.cs | 5 +- .../Transfer/RotatingEquipmentEdit.aspx.cs | 5 +- .../Transfer/StaticEquipment.aspx | 2 +- .../Transfer/StaticEquipmentDataIn.aspx.cs | 5 +- .../Transfer/StaticEquipmentEdit.aspx.cs | 5 +- SGGL/FineUIPro.Web/Transfer/Telecom.aspx | 2 +- .../Transfer/TelecomDataIn.aspx.cs | 7 +- .../Transfer/TelecomEdit.aspx.cs | 5 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 31 files changed, 300 insertions(+), 103 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs index 1b5f32b6..58c8016d 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs @@ -916,7 +916,8 @@ namespace FineUIPro.Web.CQMS.ManageReport u.UnitId, u.UnitName, c.IssuedDate, - c.Status + c.Status, + c.ImplementationFrontState, }; @@ -926,8 +927,10 @@ namespace FineUIPro.Web.CQMS.ManageReport Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc(); NCRStatisc.Num = i; NCRStatisc.WorkName = item.UnitName; - NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3"); - NCRStatisc.OKNum = AllList.Count(x => x.Status == "3"); + //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3"); + //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3"); + NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); + NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count(); NCRStatisc.CheckNum = AllList.Count(); if (NCRStatisc.CheckNum != 0)//被除数不能为零 { diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx index e937bbfd..de2193df 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx @@ -13,7 +13,7 @@ - + HeaderTextAlign="Center" MinWidth="180px" EnableLock="true" Locked="true"> - - - - - - - - - - - - - - - - - - - - - @@ -169,13 +169,13 @@ - - - diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs index 8197d60e..c96c4cf4 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs @@ -183,6 +183,187 @@ where f.ProjectId = @ProjectId"; DataTable tb = DataSql(); Grid1.RecordCount = tb.Rows.Count; var table = this.GetPagedDataTable(Grid1, tb); + // 添加管道焊接信息 + DataColumn StrTotalFactor = new DataColumn("StrTotalFactor", typeof(string)); + DataColumn StrCompleteFactor = new DataColumn("StrCompleteFactor", typeof(string)); + DataColumn StrCompleteProportion = new DataColumn("StrCompleteProportion", typeof(string)); + table.Columns.Add(StrTotalFactor); + table.Columns.Add(StrCompleteFactor); + table.Columns.Add(StrCompleteProportion); + // 添加管道试压包 + DataColumn StrPipingCount = new DataColumn("StrPipingCount", typeof(string)); + DataColumn StrPipingScount = new DataColumn("StrPipingScount", typeof(string)); + DataColumn StrPipingPercent = new DataColumn("StrPipingPercent", typeof(string)); + table.Columns.Add(StrPipingCount); + table.Columns.Add(StrPipingScount); + table.Columns.Add(StrPipingPercent); + // 管道冲洗吹扫&复位信息 + DataColumn StrReinstateCount = new DataColumn("StrReinstateCount", typeof(string)); + DataColumn StrReinstateScount = new DataColumn("StrReinstateScount", typeof(string)); + DataColumn StrReinstatePercent = new DataColumn("StrReinstatePercent", typeof(string)); + table.Columns.Add(StrReinstateCount); + table.Columns.Add(StrReinstateScount); + table.Columns.Add(StrReinstatePercent); + // 设备测试包 + DataColumn StrEqCount = new DataColumn("StrEqCount", typeof(string)); + DataColumn StrEqSCount = new DataColumn("StrEqSCount", typeof(string)); + DataColumn StrEqPercent = new DataColumn("StrEqPercent", typeof(string)); + table.Columns.Add(StrEqCount); + table.Columns.Add(StrEqSCount); + table.Columns.Add(StrEqPercent); + // 电气测试包 + DataColumn StrTeCount = new DataColumn("StrTeCount", typeof(string)); + DataColumn StrTeScount = new DataColumn("StrTeScount", typeof(string)); + DataColumn StrTePercent = new DataColumn("StrTePercent", typeof(string)); + table.Columns.Add(StrTeCount); + table.Columns.Add(StrTeScount); + table.Columns.Add(StrTePercent); + // 仪表测试包 + DataColumn StrTiCount = new DataColumn("StrTiCount", typeof(string)); + DataColumn StrTiScount = new DataColumn("StrTiScount", typeof(string)); + DataColumn StrTiPercent = new DataColumn("StrTiPercent", typeof(string)); + table.Columns.Add(StrTiCount); + table.Columns.Add(StrTiScount); + table.Columns.Add(StrTiPercent); + // 土建/建筑/结构测试包 + DataColumn StrTcsCount = new DataColumn("StrTcsCount", typeof(string)); + DataColumn StrTcsScount = new DataColumn("StrTcsScount", typeof(string)); + DataColumn StrTcsPercent = new DataColumn("StrTcsPercent", typeof(string)); + table.Columns.Add(StrTcsCount); + table.Columns.Add(StrTcsScount); + table.Columns.Add(StrTcsPercent); + // 电信测试包 + DataColumn StrTtCount = new DataColumn("StrTtCount", typeof(string)); + DataColumn StrTtScount = new DataColumn("StrTtScount", typeof(string)); + DataColumn StrTtPercent = new DataColumn("StrTtPercent", typeof(string)); + table.Columns.Add(StrTtCount); + table.Columns.Add(StrTtScount); + table.Columns.Add(StrTtPercent); + + // 遍历所有行 + foreach (DataRow row in table.Rows) + { + //管道焊接信息-总达因数 + //string TotalFactor = row["TotalFactor"].ToString(); + //if (string.IsNullOrWhiteSpace(TotalFactor) || TotalFactor == "0.0" || TotalFactor == "0") + if (string.IsNullOrWhiteSpace(row["TotalFactor"].ToString()) || (decimal)row["TotalFactor"] == 0) + { + row["StrTotalFactor"] = "NA"; + row["StrCompleteFactor"] = "NA"; + row["StrCompleteProportion"] = "NA"; + } + else + { + row["StrTotalFactor"] = row["TotalFactor"].ToString(); + row["StrCompleteFactor"] = row["CompleteFactor"].ToString(); + row["StrCompleteProportion"] = row["CompleteProportion"].ToString(); + } + //管道试压包 + //string PipingCount = row["PipingCount"].ToString(); + //if (string.IsNullOrWhiteSpace(PipingCount) || PipingCount == "0.0" || PipingCount == "0") + if (string.IsNullOrWhiteSpace(row["PipingCount"].ToString()) || (int)row["PipingCount"] == 0) + { + row["StrPipingCount"] = "NA"; + row["StrPipingScount"] = "NA"; + row["StrPipingPercent"] = "NA"; + } + else + { + row["StrPipingCount"] = row["PipingCount"].ToString(); + row["StrPipingScount"] = row["PipingScount"].ToString(); + row["StrPipingPercent"] = row["PipingPercent"].ToString(); + } + //管道冲洗吹扫&复位信息 + //string ReinstateCount = row["ReinstateCount"].ToString(); + //if (string.IsNullOrWhiteSpace(ReinstateCount) || ReinstateCount == "0.0" || ReinstateCount == "0") + if (string.IsNullOrWhiteSpace(row["ReinstateCount"].ToString()) || (int)row["ReinstateCount"] == 0) + { + row["StrReinstateCount"] = "NA"; + row["StrReinstateScount"] = "NA"; + row["StrReinstatePercent"] = "NA"; + } + else + { + row["StrReinstateCount"] = row["ReinstateCount"].ToString(); + row["StrReinstateScount"] = row["ReinstateScount"].ToString(); + row["StrReinstatePercent"] = row["ReinstatePercent"].ToString(); + } + //设备测试包 + //string EqCount = row["EqCount"].ToString(); + //if (string.IsNullOrWhiteSpace(EqCount) || EqCount == "0.0" || EqCount == "0") + if (string.IsNullOrWhiteSpace(row["EqCount"].ToString()) || (int)row["EqCount"] == 0) + { + row["StrEqCount"] = "NA"; + row["StrEqSCount"] = "NA"; + row["StrEqPercent"] = "NA"; + } + else + { + row["StrEqCount"] = row["EqCount"].ToString(); + row["StrEqSCount"] = row["EqSCount"].ToString(); + row["StrEqPercent"] = row["EqPercent"].ToString(); + } + //电气测试包 + //string TeCount = row["TeCount"].ToString(); + //if (string.IsNullOrWhiteSpace(TeCount) || TeCount == "0.0" || TeCount == "0") + if (string.IsNullOrWhiteSpace(row["TeCount"].ToString()) || (int)row["TeCount"] == 0) + { + row["StrTeCount"] = "NA"; + row["StrTeScount"] = "NA"; + row["StrTePercent"] = "NA"; + } + else + { + row["StrTeCount"] = row["TeCount"].ToString(); + row["StrTeScount"] = row["TeScount"].ToString(); + row["StrTePercent"] = row["TePercent"].ToString(); + } + //仪表测试包 + //string TiCount = row["TiCount"].ToString(); + //if (string.IsNullOrWhiteSpace(TiCount) || TiCount == "0.0" || TiCount == "0") + if (string.IsNullOrWhiteSpace(row["TiCount"].ToString()) || (int)row["TiCount"] == 0) + { + row["StrTiCount"] = "NA"; + row["StrTiScount"] = "NA"; + row["StrTiPercent"] = "NA"; + } + else + { + row["StrTiCount"] = row["TiCount"].ToString(); + row["StrTiScount"] = row["TiScount"].ToString(); + row["StrTiPercent"] = row["TiPercent"].ToString(); + } + //土建/建筑/结构测试包 + //string TcsCount = row["TcsCount"].ToString(); + //if (string.IsNullOrWhiteSpace(TcsCount) || TcsCount == "0.0" || TcsCount == "0") + if (string.IsNullOrWhiteSpace(row["TcsCount"].ToString()) || (int)row["TcsCount"] == 0) + { + row["StrTcsCount"] = "NA"; + row["StrTcsScount"] = "NA"; + row["StrTcsPercent"] = "NA"; + } + else + { + row["StrTcsCount"] = row["TcsCount"].ToString(); + row["StrTcsScount"] = row["TcsScount"].ToString(); + row["StrTcsPercent"] = row["TcsPercent"].ToString(); + } + //电信测试包 + //string TtCount = row["TtCount"].ToString(); + //if (string.IsNullOrWhiteSpace(TtCount) || TtCount == "0.0" || TtCount == "0") + if (string.IsNullOrWhiteSpace(row["TtCount"].ToString()) || (int)row["TtCount"] == 0) + { + row["StrTtCount"] = "NA"; + row["StrTtScount"] = "NA"; + row["StrTtPercent"] = "NA"; + } + else + { + row["StrTtCount"] = row["TtCount"].ToString(); + row["StrTtScount"] = row["TtScount"].ToString(); + row["StrTtPercent"] = row["TtPercent"].ToString(); + } + } Grid1.DataSource = table; Grid1.DataBind(); } @@ -260,7 +441,7 @@ where f.ProjectId = @ProjectId"; Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); return; } - + string SystemNo = Grid1.SelectedRowID; PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SystemstatusEdit.aspx?SystemNo={0}", SystemNo, "编辑 - "))); } @@ -284,27 +465,42 @@ where f.ProjectId = @ProjectId"; var scode = systemNo.ToString(); //根据systemNo和projectid获取所有数据 和完成的数据 #region 九个表的数据 - var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid && x.SYSTEM == scode).ToList(); - var list2 = Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == pid && x.SYSTEM == scode).ToList(); - var list3 = Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == pid && x.SYSTEM == scode).ToList(); - var list4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList(); - var list5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList(); - var list6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList(); - //var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList(); - var list8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList(); + var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid && x.TestPackage == scode).ToList(); + var list2 = Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == pid && x.TestPackage == scode).ToList(); + var list3 = Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == pid && x.TestPackage == scode).ToList(); + var list4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList(); + var list5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList(); + var list6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList(); + //var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList(); + var list8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList(); #endregion - float allcount = (list1.Count + list2.Count + list3.Count + list4.Count + - list5.Count + list6.Count + list8.Count);//list7.Count + + //float allcount = (list1.Count + list2.Count + list3.Count + list4.Count + + // list5.Count + list6.Count + list8.Count);//list7.Count + - float allScount = (list1.Where(x => x.FINALStatus == "Completed").ToList().Count + list2.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count - + list3.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count + list4.Where(x => x.FINAL_Status == "Completed").ToList().Count + - list5.Where(x => x.FINAL_Status == "Completed").ToList().Count + list6.Where(x => x.FINAL_Status == "Completed").ToList().Count + //float allScount = (list1.Where(x => x.FINALStatus == "Completed").ToList().Count + list2.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count + // + list3.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count + list4.Where(x => x.FINAL_Status == "Completed").ToList().Count + + // list5.Where(x => x.FINAL_Status == "Completed").ToList().Count + list6.Where(x => x.FINAL_Status == "Completed").ToList().Count + // //+ list7.Where(x => x.FINAL_Status == "Completed").ToList().Count + // + list8.Where(x => x.FINAL_Status == "Completed").ToList().Count + // ); + + //Piping管道试压包和复位都要统计 + float allcount = (list1.Count + list1.Count + list2.Count + list3.Count + list4.Count + + list5.Count + list6.Count + list8.Count);//list7.Count + + + float allScount = (list1.Where(x => x.FINALStatus == "Completed").ToList().Count + + list1.Where(x => x.Reduction == "Completed").ToList().Count + + list2.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count + + list3.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count + + list4.Where(x => x.FINAL_Status == "Completed").ToList().Count + + list5.Where(x => x.FINAL_Status == "Completed").ToList().Count + + list6.Where(x => x.FINAL_Status == "Completed").ToList().Count //+ list7.Where(x => x.FINAL_Status == "Completed").ToList().Count + list8.Where(x => x.FINAL_Status == "Completed").ToList().Count ); - if (Convert.ToInt32(allcount)==0) + if (Convert.ToInt32(allcount) == 0) { return "0"; } @@ -388,7 +584,7 @@ where f.ProjectId = @ProjectId"; // { // html = (row.FindControl("lblPageIndex") as AspNet.Label).Text; // } - + // else if (column.ColumnID == "Count4") // { // html = (row.FindControl("Label5") as AspNet.Label).Text; @@ -400,7 +596,7 @@ where f.ProjectId = @ProjectId"; // //} // sb.Append(""); // } - + // sb.Append(""); // return sb.ToString(); diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs index 6526caf7..8bca2f21 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs @@ -46,7 +46,7 @@ namespace FineUIPro.Web.Transfer.Chart if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue)) { systemCode= Funs.DB.Transfer_LHCSystemList - .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.SystemNo == ddlSystemNo.SelectedValue) + .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.Commissioningsystemcode == ddlSystemNo.SelectedValue) .GroupBy(p => new { p.Commissioningsystemcode }) .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList(); } diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx index 0555a232..94d7de8a 100644 --- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx +++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx @@ -74,7 +74,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs index 2d9f55d9..e34360f4 100644 --- a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs @@ -348,9 +348,8 @@ namespace FineUIPro.Web.Transfer continue; } - - //如果全是Not Start 就是 Not Start - if (listObj.Where(x => x == "Not Start").ToList().Count == 2) + //如果全是NA或Not Start 就是 Not Start + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 2) { model.FINAL_Status = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs index 7d831ab8..c5fbc48c 100644 --- a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs @@ -106,8 +106,9 @@ namespace FineUIPro.Web.Transfer if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 2) { model.FINAL_Status = "Completed"; - } //如果全是Not Start 就是 Not Start - else if (listObj.Where(x => x == "Not Start").ToList().Count == 2) + } + //如果全是NA或Not Start 就是 Not Start + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 2) { model.FINAL_Status = "Not Start"; } diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs index 68e91fe8..e4bc345b 100644 --- a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs @@ -344,9 +344,8 @@ namespace FineUIPro.Web.Transfer continue; } - - //如果全是Not Start 就是 Not Start - if (listObj.Where(x => x == "Not Start").ToList().Count == 4) + //如果全是NA或Not Start 就是 Not Start + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) { model.FINAL_Status = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs index c9977e73..34bc6cd7 100644 --- a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs @@ -93,8 +93,9 @@ namespace FineUIPro.Web.Transfer if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4) { model.FINAL_Status = "Completed"; - } //如果全是Not Start 就是 Not Start - else if (listObj.Where(x => x == "Not Start").ToList().Count == 4) + } + //如果全是NA或Not Start 就是 Not Start + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) { model.FINAL_Status = "Not Start"; } diff --git a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx index 60ec13c9..45cd39e8 100644 --- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx @@ -70,7 +70,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs index 606c1f96..e1746265 100644 --- a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs @@ -341,10 +341,8 @@ namespace FineUIPro.Web.Transfer list.Add(model); continue; } - - - //如果全是Not Start 就是 Not Start - if (listObj.Where(x => x == "Not Start").ToList().Count == 3) + //如果全是NA或Not Start 就是 Not Start + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.FINAL_Status = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs index c6f75a5e..89fb8978 100644 --- a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs @@ -88,8 +88,9 @@ namespace FineUIPro.Web.Transfer if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { model.FINAL_Status = "Completed"; - } //如果全是Not Start 就是 Not Start - else if (listObj.Where(x => x == "Not Start").ToList().Count == 3) + } + //如果全是NA或Not Start 就是 Not Start + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.FINAL_Status = "Not Start"; } diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs index 4be4ac9b..c16ef0e6 100644 --- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs @@ -356,9 +356,8 @@ namespace FineUIPro.Web.Transfer continue; } - - //如果全是Not Start 就是 Not Start - if (listObj.Where(x => x == "Not Start").ToList().Count == 5) + //如果全是NA或Not Start 就是 Not Start + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 5) { model.FINAL_Status = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs index 01765da1..8cf84f39 100644 --- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs @@ -99,8 +99,9 @@ namespace FineUIPro.Web.Transfer if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5) { model.FINAL_Status = "Completed"; - } //如果全是Not Start 就是 Not Start - else if (listObj.Where(x => x == "Not Start").ToList().Count == 5) + } + //如果全是NA或Not Start 就是 Not Start + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 5) { model.FINAL_Status = "Not Start"; } diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx index 8b4caaf8..ebdf02d7 100644 --- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx @@ -65,7 +65,7 @@ + HeaderTextAlign="Center" MinWidth="180px"> diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs index 6c02ec74..f4b4048f 100644 --- a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs @@ -374,9 +374,8 @@ namespace FineUIPro.Web.Transfer continue; } - - //如果全是Not Start 就是 Not Start - if (listObj.Where(x => x == "Not Start").ToList().Count == 3) + //如果全是NA或Not Start 就是 Not Start + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.FINALStatus = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs index 27fbb5e8..213e5fc9 100644 --- a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs @@ -136,8 +136,8 @@ namespace FineUIPro.Web.Transfer model.FINALStatus = "Completed"; } - //如果全是Not Start 就是 Not Start - else if (listObj.Where(x => x == "Not Start").ToList().Count == 3) + //如果全是NA或Not Start 就是 Not Start + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.FINALStatus = "Not Start"; diff --git a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx index 845d510f..50f21530 100644 --- a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx @@ -62,7 +62,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs index e6f120e5..63fd308d 100644 --- a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs @@ -342,9 +342,8 @@ namespace FineUIPro.Web.Transfer continue; } - - //如果全是Not Start 就是 Not Start - if (listObj.Where(x => x == "Not Start").ToList().Count == 3) + //如果全是NA或Not Start 就是 Not Start + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.FINAL_Status = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs index ab730923..8a503e28 100644 --- a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs @@ -88,8 +88,9 @@ namespace FineUIPro.Web.Transfer if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { model.FINAL_Status = "Completed"; - } //如果全是Not Start 就是 Not Start - else if (listObj.Where(x => x == "Not Start").ToList().Count == 3) + } + //如果全是NA或Not Start 就是 Not Start + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.FINAL_Status = "Not Start"; } diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx index 697441b4..ff2cc19f 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx @@ -152,7 +152,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx index a11a39ba..4cdc7d6e 100644 --- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx @@ -80,7 +80,7 @@ + HeaderTextAlign="Center" MinWidth="180px"> x == "Not Start").ToList().Count == 4) + //如果全是NA或Not Start 就是 Not Start + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) { model.MechanicalFINALStatus = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs index 3a45e860..83f7a869 100644 --- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs @@ -90,8 +90,9 @@ namespace FineUIPro.Web.Transfer if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4) { model.MechanicalFINALStatus = "Completed"; - } //如果全是Not Start 就是 Not Start - else if (listObj.Where(x => x == "Not Start").ToList().Count == 4) + } + //如果全是NA或Not Start 就是 Not Start + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) { model.MechanicalFINALStatus = "Not Start"; } diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx index 50bbb87f..787bac49 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx @@ -84,7 +84,7 @@ HeaderTextAlign="Center" MinWidth="100px"> + HeaderTextAlign="Center" MinWidth="180px"> diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs index 59873369..82e5ff7e 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs @@ -338,9 +338,8 @@ namespace FineUIPro.Web.Transfer continue; } - - //如果全是Not Start 就是 Not Start - if (listObj.Where(x => x == "Not Start").ToList().Count == 3) + //如果全是NA或Not Start 就是 Not Start + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.MechanicalFINALStatus = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs index 5f183226..d6f8bf0a 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs @@ -89,8 +89,9 @@ namespace FineUIPro.Web.Transfer if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { model.MechanicalFINALStatus = "Completed"; - } //如果全是Not Start 就是 Not Start - else if (listObj.Where(x => x == "Not Start").ToList().Count == 3) + } + //如果全是NA或Not Start 就是 Not Start + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.MechanicalFINALStatus = "Not Start"; } diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx index a3d1113c..268b2761 100644 --- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx @@ -74,7 +74,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs index c342b9a7..627f081d 100644 --- a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs @@ -336,7 +336,7 @@ namespace FineUIPro.Web.Transfer listObj.Add(obj2); listObj.Add(obj3); listObj.Add(obj4); - //全是NA或Completed 状态是Completed + //如果全是NA或Completed 状态是Completed if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4) { model.FINAL_Status = "Completed"; @@ -344,9 +344,8 @@ namespace FineUIPro.Web.Transfer continue; } - - //如果全是Not Start 就是 Not Start - if (listObj.Where(x => x == "Not Start").ToList().Count == 4) + //如果全是NA或Not Start 就是 Not Start + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) { model.FINAL_Status = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs index c2aacfd0..a389378f 100644 --- a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs @@ -91,8 +91,9 @@ namespace FineUIPro.Web.Transfer if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count ==4) { model.FINAL_Status = "Completed"; - } //如果全是Not Start 就是 Not Start - else if (listObj.Where(x => x == "Not Start").ToList().Count == 4) + } + //如果全是NA或Not Start 就是 Not Start + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4) { model.FINAL_Status = "Not Start"; } diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 71396b97..df2b89c2 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true