20250909 修改焊接统计分析表
This commit is contained in:
+1
-7547
File diff suppressed because it is too large
Load Diff
@@ -34,16 +34,15 @@
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<f:FormRow ColumnWidths="17% 20% 17% 15% 15% 16%">
|
||||
<Items>
|
||||
<%--<f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true"
|
||||
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
|
||||
</f:DropDownList>--%>
|
||||
<f:DropDownList ID="drpInstallation" runat="server" LabelWidth="80px" Label="装置" EnableEdit="true"
|
||||
AutoPostBack="true" OnSelectedIndexChanged="drpInstallation_SelectedIndexChanged">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpTeamGroupId" runat="server" LabelWidth="80px" Label="施工队" EnableEdit="true">
|
||||
</f:DropDownList>
|
||||
<f:DatePicker runat="server" Label="开始日期" ID="txtStarTime" LabelWidth="80px"></f:DatePicker>
|
||||
<f:DatePicker runat="server" Label="结束日期" ID="txtEndTime" LabelWidth="80px"></f:DatePicker>
|
||||
<f:CheckBoxList ID="cb_IsStandard" Label="是否非标" runat="server">
|
||||
@@ -61,7 +60,7 @@
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接统计分析表"
|
||||
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="baw_areano"
|
||||
AllowCellEditing="true" ClicksToEdit="2" DataIDField="baw_areano" AllowSorting="true"
|
||||
AllowCellEditing="true" ClicksToEdit="2" DataIDField="" AllowSorting="true"
|
||||
SortField="bsu_unitcode,InstallationName,baw_areano" SortDirection="DESC" OnSort="Grid1_Sort"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
|
||||
@@ -76,7 +75,7 @@
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="260px">
|
||||
</f:RenderField>--%>
|
||||
<f:RenderField HeaderText="装置" ColumnID="InstallationName" DataField="InstallationName" SortField="InstallationName"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="工区" ColumnID="baw_areano" DataField="baw_areano" SortField="baw_areano"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="160px">
|
||||
@@ -87,7 +86,7 @@
|
||||
<f:RenderField HeaderText="总达因" ColumnID="total_din" DataField="total_din" SortField="total_din"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Right" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="施工工队" ColumnID="TeamGroup" DataField="TeamGroup" SortField="TeamGroup"
|
||||
<f:RenderField HeaderText="施工队" ColumnID="TeamGroup" DataField="TeamGroup" SortField="TeamGroup"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Right" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="本期完成达因" ColumnID="finished_total_din_bq" DataField="finished_total_din_bq" SortField="finished_total_din_bq"
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpWorkArea;
|
||||
|
||||
/// <summary>
|
||||
/// drpTeamGroupId 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpTeamGroupId;
|
||||
|
||||
/// <summary>
|
||||
/// txtStarTime 控件。
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user