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

焊接拍片数、合格数汇总

Browse Source
This commit is contained in:
夏菊
2025-07-01 17:13:29 +08:00
parent 037888ef1f
commit eba44201cb
6 changed files with 109 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/main_new.aspx.cs
+4 -3
View File
@@ -844,8 +844,8 @@ namespace FineUIPro.Web.common
if (ndtLists.Count > 0)
{
//取每个单位、专业最新的一条数据
var datalist = ndtLists.GroupBy(r => new { r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
//取每个项目、单位、专业最新的一条数据
var datalist = ndtLists.GroupBy(r => new { r.ProjectId, r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
foreach (var item in datalist)
{
if (item.TotalQuantity.HasValue)
@@ -854,7 +854,8 @@ namespace FineUIPro.Web.common
b += item.TotalQuantity.Value;
}
}
result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
//result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
}
//else
//{
SGGL/FineUIPro.Web/common/main_new1.aspx.cs
+38
View File
@@ -67,6 +67,42 @@ namespace FineUIPro.Web.common
getEarlyWarningCounts();
getCNEN();
//焊接数据
double result = 0;
Model.SGGLDB db = Funs.DB;
var ndtLists = (from x in db.ProcessControl_NondestructiveTest_New select x).ToList();
if (pids != null)
{
ndtLists = ndtLists.Where(x => pids.Contains(x.ProjectId)).ToList();
}
decimal a = 0, b = 0;
if (ndtLists.Count > 0)
{
//取每个项目、单位、专业最新的一条数据
var datalist = ndtLists.GroupBy(r => new { r.ProjectId, r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
foreach (var item in datalist)
{
if (item.TotalQuantity.HasValue)
{
a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) / 100);
b += item.TotalQuantity.Value;
}
}
//result = Convert.ToDouble(Convert.ToDecimal(100.0) * a / b);
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
}
if (b > 0)
{
hjallNumber = b.ToString();
hjfinishNumber = a.ToString();
hjzgl = result.ToString() + "%";
}
/****** 焊接数据
//在建项目
var allProjects = ProjectService.GetAllProjectDropDownList();
//焊接数据
@@ -100,6 +136,8 @@ namespace FineUIPro.Web.common
hjfinishNumber = a.ToString();
hjzgl = result.ToString() + "%";
}
********/
}
}