提交代码

This commit is contained in:
2024-04-19 15:48:37 +08:00
parent 8f650add98
commit ae229cb24e
22 changed files with 1565 additions and 225 deletions
+41 -14
View File
@@ -571,27 +571,54 @@ namespace FineUIPro.Web.common
List<double> listdata = new List<double>();
double result = 0;
Model.SGGLDB db = Funs.DB;
var ndtLists = from x in db.ProcessControl_NondestructiveTest_New select x;
var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName== "工艺管道" select x;
decimal a = 0, b = 0;
if (ndtLists.Count() > 0)
{
decimal a = 0, b = 0;
foreach (var item in ndtLists)
foreach (var project in allProjects)
{
//a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
//b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
}
if (b > 0)
{
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
hjallNumber = b.ToString();
hjfinishNumber = a.ToString();
hjzgl = result.ToString();
hjDataValue = (100 - result).ToString();
var ndt = (from x in ndtLists
where x.ProjectId == project.ProjectId
orderby x.CreateDate descending
select x).FirstOrDefault();
if (ndt != null)
{
if (ndt.TotalQuantity.HasValue)
{
a += Math.Floor(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
b += ndt.TotalQuantity.Value;
}
}
}
}
if (b > 0)
{
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
hjallNumber = b.ToString();
hjfinishNumber = a.ToString();
hjzgl = result.ToString();
hjDataValue = (100 - result).ToString();
}
//if (ndtLists.Count() > 0)
//{
// foreach (var item in ndtLists)
// {
// //a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount);
// //b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount);
// }
// if (b > 0)
// {
// result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
// hjallNumber = b.ToString();
// hjfinishNumber = a.ToString();
// hjzgl = result.ToString();
// hjDataValue = (100 - result).ToString();
// }
//}
}
#endregion