20250912 修改焊接统计
This commit is contained in:
parent
df49677f90
commit
a596fd7273
|
@ -214,14 +214,25 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
||||||
double AvgDayCompletedDin = 0.0f;
|
double AvgDayCompletedDin = 0.0f;
|
||||||
double finished_current_day_din = 0.0f;
|
double finished_current_day_din = 0.0f;
|
||||||
|
|
||||||
|
List<string> lists = new List<string>();
|
||||||
|
|
||||||
foreach (DataRow row in tb.Rows)
|
foreach (DataRow row in tb.Rows)
|
||||||
{
|
{
|
||||||
total_jot += Convert.ToInt32(row["total_jot"]);
|
string areaid = row["WorkAreaId"].ToString();
|
||||||
total_din += Convert.ToDouble(row["total_din"]);
|
|
||||||
|
//多个班组同一个区域只合计一个
|
||||||
|
if (!lists.Exists(x => x.EndsWith(areaid)))
|
||||||
|
{
|
||||||
|
total_jot += Convert.ToInt32(row["total_jot"]);
|
||||||
|
total_din += Convert.ToDouble(row["total_din"]);
|
||||||
|
RemainingDain += Convert.ToDouble(row["RemainingDain"]);
|
||||||
|
|
||||||
|
lists.Add(areaid);
|
||||||
|
}
|
||||||
finished_total_din_bq += Convert.ToDouble(row["finished_total_din_bq"]);
|
finished_total_din_bq += Convert.ToDouble(row["finished_total_din_bq"]);
|
||||||
RemainingDain += Convert.ToDouble(row["RemainingDain"]);
|
|
||||||
AvgDayCompletedDin += Convert.ToDouble(row["AvgDayCompletedDin"]);
|
AvgDayCompletedDin += Convert.ToDouble(row["AvgDayCompletedDin"]);
|
||||||
finished_current_day_din += Convert.ToDouble(row["finished_current_day_din"]);
|
finished_current_day_din += Convert.ToDouble(row["finished_current_day_din"]);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
JObject summary = new JObject
|
JObject summary = new JObject
|
||||||
|
|
Loading…
Reference in New Issue