lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20221009 001 修改焊接分析首页报错问题

Browse Source
This commit is contained in:
李鹏飞
2022-10-09 15:37:06 +08:00
parent b1416ebf7e
commit fc8d0a684d
8 changed files with 894 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx
+1 -1
View File
@@ -275,7 +275,7 @@
} else if (type == 'gg') {
// 单位工程
initEchart05(dataE05_Type02, dataE05_Values02)
} else if (type == 'lb') {
} else if (type == 'lx') {
// 材质类别
initEchart05(dataE05_Type03, dataE05_Values03)
}
SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
+111 -202
View File
@@ -236,7 +236,15 @@ namespace FineUIPro.Web
getecharts05();
getecharts06();
this.divWelderEfficacyNum.InnerText = BLL.HJGL_WeldingReportService.GetWelderEfficacy(this.CurrUser .LoginProjectId).ToString() ;
this.echarts02Value.InnerText = Math.Floor(Math.Round(decimal.Parse((PipeRate1 / (PipeRate1+ PipeRate2)).ToString("0.000")), 2) * 100).ToString();
if (PipeRate1 + PipeRate2==0)
{
this.echarts02Value.InnerText = "0";
}
else
{
this.echarts02Value.InnerText = Math.Floor(Math.Round(decimal.Parse((PipeRate1 / (PipeRate1 + PipeRate2)).ToString("0.000")), 2) * 100).ToString();
}
}
@@ -384,104 +392,6 @@ namespace FineUIPro.Web
protected string E04_Values05;
protected string E04_Type06;
protected string E04_Values06;
/// <summary>
/// 焊接一次合格率
/// </summary>
//protected void getecharts04()
//{
// E08_Type01 = "[]";
// E08_Values01 = "[]";
// E08_Type02 = "[]";
// E08_Values02 = "[]";
// E08_Type03 = "[]";
// E08_Values03 = "[]";
// double PassRate = 0;
// int current_pass_film = 0;
// int cht_totalfilm = 0;
// //// 按单位
// List<string> type01List = new List<string>();
// List<double> count011List = new List<double>();
// foreach (var itemUnit in getProjectUnitList)
// {
// string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
// type01List.Add(unitName);
// var getUJots = from x in getCH_CheckItemList
// where x.UnitId == itemUnit.UnitId
// select x;
// PassRate = 0;
// current_pass_film = getUJots.Sum(x => x.CHT_PassFilm) ?? 0;
// cht_totalfilm = getUJots.Sum(x => x.CHT_TotalFilm) ?? 0;
// if (cht_totalfilm > 0)
// {
// PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
// }
// count011List.Add(PassRate);
// }
// if (type01List.Count() > 0)
// {
// E08_Type01 = JsonConvert.SerializeObject(type01List);
// E08_Values01 = JsonConvert.SerializeObject(count011List);
// }
// ///按单位工程
// List<string> type02List = new List<string>();
// List<double> count021List = new List<double>();
// var getWorkAreas = from x in Funs.DB.WBS_UnitWork
// where x.ProjectId == this.ProjectId
// select x;
// foreach (var itemWorkArea in getWorkAreas)
// {
// type02List.Add(itemWorkArea.UnitWorkName);
// var getWJots = from x in getCH_CheckItemList
// where x.WorkAreaId == itemWorkArea.UnitWorkId
// select x;
// PassRate = 0;
// current_pass_film = getWJots.Sum(x => x.CHT_PassFilm) ?? 0;
// cht_totalfilm = getWJots.Sum(x => x.CHT_TotalFilm) ?? 0;
// if (cht_totalfilm > 0)
// {
// PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
// }
// count021List.Add(PassRate);
// }
// if (type02List.Count() > 0)
// {
// E08_Type02 = JsonConvert.SerializeObject(type02List);
// E08_Values02 = JsonConvert.SerializeObject(count021List);
// }
// ///按材质类别
// List<string> type03List = new List<string>();
// List<double> count031List = new List<double>();
// var getMaterials = from x in Funs.DB.Base_Material
// join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
// where y.ProjectId == this.ProjectId
// select x;
// foreach (var itemMaterial in getMaterials)
// {
// string code = itemMaterial.MaterialCode;
// type03List.Add(code);
// var getMJots = from x in getCH_CheckItemList
// where x.MaterialId == itemMaterial.MaterialId
// select x;
// PassRate = 0;
// current_pass_film = getMJots.Sum(x => x.CHT_PassFilm) ?? 0;
// cht_totalfilm = getMJots.Sum(x => x.CHT_TotalFilm) ?? 0;
// if (cht_totalfilm > 0)
// {
// PassRate = Math.Round((100 * current_pass_film * 1.0) / cht_totalfilm, 1);
// }
// count031List.Add(PassRate);
// }
// if (type03List.Count() > 0)
// {
// E08_Type03 = JsonConvert.SerializeObject(type03List);
// E08_Values03 = JsonConvert.SerializeObject(count031List);
// }
//}
protected void getecharts04()
{
E04_Type01 = "[]";
@@ -668,109 +578,6 @@ namespace FineUIPro.Web
protected string E05_Values03;
protected string E05_Type04;
protected string E05_Values04;
/// <summary>
/// 焊接进度分析
/// </summary>
//protected void getecharts05()
//{
// E05_Type01 = "[]";
// E05_Values01_1 = "[]";
// E05_Values01_2 = "[]";
// E05_Type02 = "[]";
// E05_Values02_1 = "[]";
// E05_Values02_2 = "[]";
// E05_Type03 = "[]";
// E05_Values03_1 = "[]";
// E05_Values03_2 = "[]";
// //// 按单位
// List<string> type01List = new List<string>();
// List<int> count011List = new List<int>();
// List<int> count012List = new List<int>();
// foreach (var itemUnit in getProjectUnitList)
// {
// string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
// type01List.Add(unitName);
// var getUJots = from x in getAllJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.UnitId == itemUnit.UnitId
// select x;
// count011List.Add(getUJots.Count());
// var getUCJots = from x in getFinishedJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.UnitId == itemUnit.UnitId
// select x;
// count012List.Add(getUCJots.Count());
// }
// if (type01List.Count() > 0)
// {
// E05_Type01 = JsonConvert.SerializeObject(type01List);
// E05_Values01_1 = JsonConvert.SerializeObject(count011List);
// E05_Values01_2 = JsonConvert.SerializeObject(count012List);
// }
// ///按单位工程
// List<string> type02List = new List<string>();
// List<int> count021List = new List<int>();
// List<int> count022List = new List<int>();
// var getWorkAreas = from x in Funs.DB.WBS_UnitWork
// where x.ProjectId == this.ProjectId
// select x;
// foreach (var itemWorkArea in getWorkAreas)
// {
// type02List.Add(itemWorkArea.UnitWorkName);
// var getWJots = from x in getAllJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.UnitWorkId == itemWorkArea.UnitWorkId
// select x;
// count021List.Add(getWJots.Count());
// var getWCJots = from x in getFinishedJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.UnitWorkId == itemWorkArea.UnitWorkId
// select x;
// count022List.Add(getWCJots.Count());
// }
// if (type02List.Count() > 0)
// {
// E05_Type02 = JsonConvert.SerializeObject(type02List);
// E05_Values02_1 = JsonConvert.SerializeObject(count021List);
// E05_Values02_2 = JsonConvert.SerializeObject(count022List);
// }
// ///按材质类别
// List<string> type03List = new List<string>();
// List<int> count031List = new List<int>();
// List<int> count032List = new List<int>();
// var getMaterials = (from x in Funs.DB.Base_Material
// join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
// where y.ProjectId == this.ProjectId
// select x).ToList().Distinct();
// foreach (var itemMaterial in getMaterials)
// {
// string code = itemMaterial.MaterialCode;
// type03List.Add(code);
// var getWJots = from x in getAllJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.MaterialId == itemMaterial.MaterialId
// select x;
// count031List.Add(getWJots.Count());
// var getWCJots = from x in getFinishedJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.MaterialId == itemMaterial.MaterialId
// select x;
// count032List.Add(getWCJots.Count());
// }
// if (type03List.Count() > 0)
// {
// E05_Type03 = JsonConvert.SerializeObject(type03List);
// E05_Values03_1 = JsonConvert.SerializeObject(count031List);
// E05_Values03_2 = JsonConvert.SerializeObject(count032List);
// }
//}
protected void getecharts05()
{
E05_Type01="[]";
@@ -981,5 +788,107 @@ namespace FineUIPro.Web
}
#endregion
#region 进度分析
/// <summary>
/// 焊接进度分析
/// </summary>
//protected void getecharts05()
//{
// E05_Type01 = "[]";
// E05_Values01_1 = "[]";
// E05_Values01_2 = "[]";
// E05_Type02 = "[]";
// E05_Values02_1 = "[]";
// E05_Values02_2 = "[]";
// E05_Type03 = "[]";
// E05_Values03_1 = "[]";
// E05_Values03_2 = "[]";
// //// 按单位
// List<string> type01List = new List<string>();
// List<int> count011List = new List<int>();
// List<int> count012List = new List<int>();
// foreach (var itemUnit in getProjectUnitList)
// {
// string unitName = UnitService.GetUnitNameByUnitId(itemUnit.UnitId);
// type01List.Add(unitName);
// var getUJots = from x in getAllJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.UnitId == itemUnit.UnitId
// select x;
// count011List.Add(getUJots.Count());
// var getUCJots = from x in getFinishedJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.UnitId == itemUnit.UnitId
// select x;
// count012List.Add(getUCJots.Count());
// }
// if (type01List.Count() > 0)
// {
// E05_Type01 = JsonConvert.SerializeObject(type01List);
// E05_Values01_1 = JsonConvert.SerializeObject(count011List);
// E05_Values01_2 = JsonConvert.SerializeObject(count012List);
// }
// ///按单位工程
// List<string> type02List = new List<string>();
// List<int> count021List = new List<int>();
// List<int> count022List = new List<int>();
// var getWorkAreas = from x in Funs.DB.WBS_UnitWork
// where x.ProjectId == this.ProjectId
// select x;
// foreach (var itemWorkArea in getWorkAreas)
// {
// type02List.Add(itemWorkArea.UnitWorkName);
// var getWJots = from x in getAllJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.UnitWorkId == itemWorkArea.UnitWorkId
// select x;
// count021List.Add(getWJots.Count());
// var getWCJots = from x in getFinishedJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.UnitWorkId == itemWorkArea.UnitWorkId
// select x;
// count022List.Add(getWCJots.Count());
// }
// if (type02List.Count() > 0)
// {
// E05_Type02 = JsonConvert.SerializeObject(type02List);
// E05_Values02_1 = JsonConvert.SerializeObject(count021List);
// E05_Values02_2 = JsonConvert.SerializeObject(count022List);
// }
// ///按材质类别
// List<string> type03List = new List<string>();
// List<int> count031List = new List<int>();
// List<int> count032List = new List<int>();
// var getMaterials = (from x in Funs.DB.Base_Material
// join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
// where y.ProjectId == this.ProjectId
// select x).ToList().Distinct();
// foreach (var itemMaterial in getMaterials)
// {
// string code = itemMaterial.MaterialCode;
// type03List.Add(code);
// var getWJots = from x in getAllJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.MaterialId == itemMaterial.MaterialId
// select x;
// count031List.Add(getWJots.Count());
// var getWCJots = from x in getFinishedJotList
// join y in getAllJIsoInfoList on x.PipelineId equals y.PipelineId
// where y.MaterialId == itemMaterial.MaterialId
// select x;
// count032List.Add(getWCJots.Count());
// }
// if (type03List.Count() > 0)
// {
// E05_Type03 = JsonConvert.SerializeObject(type03List);
// E05_Values03_1 = JsonConvert.SerializeObject(count031List);
// E05_Values03_2 = JsonConvert.SerializeObject(count032List);
// }
//}
#endregion
}
}