20250909 修改焊接统计分析表

SGGL/FineUIPro.Web/HJGL/WeldingReport/WeldingStatistical.aspx.cs

@@ -55,6 +55,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
 
 
                 Funs.FineUIPleaseSelect(this.drpWorkArea);
+
+                BLL.TeamGroupService.InitTeamGroupProjectDropDownList(this.drpTeamGroupId, this.CurrUser.LoginProjectId, true);
                 ////钢材类型
                 //this.drpSteType.DataTextField = "Text";
                 //this.drpSteType.DataValueField = "Value";
@@ -110,6 +112,14 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             {
                 listStr.Add(new SqlParameter("@AreaNo", null));
             }
+            if (this.drpTeamGroupId.SelectedValue!=BLL.Const._Null)
+            {
+                listStr.Add(new SqlParameter("@teamGroup", this.drpTeamGroupId.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@teamGroup", null));
+            }
             if (!string.IsNullOrEmpty(this.txtStarTime.Text))
             {
                 listStr.Add(new SqlParameter("@startTime", this.txtStarTime.Text.Trim()));
@@ -202,6 +212,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 double finished_total_din_bq = 0.0f;
                 double RemainingDain = 0.0f;
                 double AvgDayCompletedDin = 0.0f;
+                double finished_current_day_din = 0.0f;
+
                 foreach (DataRow row in tb.Rows)
                 {
                     total_jot += Convert.ToInt32(row["total_jot"]);
@@ -209,6 +221,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                     finished_total_din_bq += Convert.ToDouble(row["finished_total_din_bq"]);
                     RemainingDain += Convert.ToDouble(row["RemainingDain"]);
                     AvgDayCompletedDin += Convert.ToDouble(row["AvgDayCompletedDin"]);
+                    finished_current_day_din += Convert.ToDouble(row["finished_current_day_din"]);
                 }
 
                 JObject summary = new JObject
@@ -219,6 +232,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                     { "finished_total_din_bq", finished_total_din_bq.ToString("F2") },
                     { "RemainingDain",RemainingDain.ToString("F2") },
                     { "AvgDayCompletedDin", AvgDayCompletedDin.ToString("F2") },
+                    { "finished_current_day_din", finished_current_day_din.ToString("F2") },
                 };
 
                 Grid1.SummaryData = summary;