lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2022-11-16-001 焊接施工计划状态字段获取

Browse Source
This commit is contained in:
李鹏飞
2022-11-16 19:48:03 +08:00
parent 0352866cea
commit 4d94c81026
8 changed files with 278 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+4 -4
View File
@@ -430,10 +430,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
NewTask.TableDate = DateTime.Now;
BLL.WeldTaskService.AddWeldTask(NewTask);
}
string pipelineId = this.tvControlItem.SelectedNodeID;
var model = BLL.PipelineService.GetPipelineByPipelineId(pipelineId);
model.State = 1;
PipelineService.UpdatePipeline(model);
//string pipelineId = this.tvControlItem.SelectedNodeID;
//var model = BLL.PipelineService.GetPipelineByPipelineId(pipelineId);
//model.State = 1;
//PipelineService.UpdatePipeline(model);
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtTaskDate.Text) + ActiveWindow.GetHidePostBackReference());
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
+1 -1
View File
@@ -221,7 +221,7 @@
SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="90px">
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia"
<f:RenderField HeaderText="外径（公称直径）" ColumnID="Dia"
DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="90px">
</f:RenderField>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
+33 -6
View File
@@ -58,6 +58,8 @@
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Text="导出" Icon="FolderUp" Hidden="true"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnUpDateState" Text="更新状态" ToolTip="更新状态" Icon="ArrowRefresh" runat="server" OnClick="btnUpDateState_Click">
</f:Button>
<f:Button ID="btnImportFIELD" Text="同步管线" ToolTip="同步管线" Icon="PackageIn" runat="server" OnClick="btnImportFIELD_Click">
</f:Button>
<f:Button ID="btnImportSHOP" Text="同步管线（预制）" ToolTip="同步管线（预制）" Icon="PackageIn" runat="server" OnClick="btnImportSHOP_Click">
@@ -127,14 +129,26 @@
DataField="PlanEndDate_SHOP" SortField="PlanEndDate_SHOP" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="实际开始日期(预制)" ColumnID="ActStartDate_SHOP"
<f:TemplateField Width="150px" HeaderText="实际开始日期(预制)" HeaderTextAlign="Center"
TextAlign="Center" SortField="PipelineId">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.PipelineService.GetDateByPipelineId(Eval("PipelineId"),BLL.PipelineService.ActDateType.ActDateStart_Shop) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="150px" HeaderText="实际完成日期(预制)" HeaderTextAlign="Center"
TextAlign="Center" SortField="PipelineId">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# BLL.PipelineService.GetDateByPipelineId(Eval("PipelineId"),BLL.PipelineService.ActDateType.ActDateEnd_Shop) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:RenderField HeaderText="实际开始日期(预制)" ColumnID="ActStartDate_SHOP"
DataField="ActStartDate_SHOP" SortField="ActStartDate_SHOP" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="实际完成日期(预制)" ColumnID="ActEndDate_SHOP"
DataField="ActEndDate_SHOP" SortField="ActEndDate_SHOP" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField HeaderText="计划开始日期(安装)" ColumnID="PlanStartDate"
DataField="PlanStartDate" SortField="PlanStartDate" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
@@ -143,18 +157,31 @@
DataField="PlanEndDate" SortField="PlanEndDate" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="实际开始日期(安装)" ColumnID="ActStartDate"
<f:TemplateField Width="150px" HeaderText="实际开始日期(安装)" HeaderTextAlign="Center"
TextAlign="Center" SortField="PipelineId">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# BLL.PipelineService.GetDateByPipelineId(Eval("PipelineId"),BLL.PipelineService.ActDateType.ActDateStart_FIELD) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="150px" HeaderText="实际完成日期(安装)" HeaderTextAlign="Center"
TextAlign="Center" SortField="PipelineId">
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# BLL.PipelineService.GetDateByPipelineId(Eval("PipelineId"),BLL.PipelineService.ActDateType.ActDateEnd_FIELD) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:RenderField HeaderText="实际开始日期(安装)" ColumnID="ActStartDate"
DataField="ActStartDate" SortField="ActStartDate" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="实际完成日期(安装)" ColumnID="ActEndDate"
DataField="ActEndDate" SortField="ActEndDate" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="状态" ColumnID="IsFinished"
DataField="IsFinished" SortField="IsFinished" FieldType="String"
</f:RenderField>--%>
<f:RenderField HeaderText="状态" ColumnID="State"
DataField="State" SortField="State" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
</Columns>
<PageItems>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+18 -1
View File
@@ -172,6 +172,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
,line.ActEndDate
,line.IsFinished
,line.FlowingSection
,(case line.State
when 0 then '未开始'
when 1 then '未开始且延误'
when 2 then '开始'
when 3 then '已开始且延误'
when 4 then '完成' else '' end ) as State
,com.PipelineComponentId
,com.PreUnit
,com.PipelineComponentCode
@@ -179,7 +185,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
,com.AssembleUnit
,com.PipeLineMatId
,com.QRCode
,com.State
,com.PlanStartDate as PlanStartDate_SHOP
,com.PlanEndDate as PlanEndDate_SHOP
,com.ActStartDate as ActStartDate_SHOP
@@ -459,8 +464,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
ShowNotify("请先选择单位工程！", MessageBoxIcon.Warning);
}
}
#endregion
protected void btnUpDateState_Click(object sender, EventArgs e)
{
string unitworkid = this.tvControlItem.SelectedNodeID;
var pipeline=PipelineService.GetPipelinesByUnitWordId(unitworkid);
foreach (var item in pipeline)
{
BLL.PipelineService.GetStateByPipelineId(item.PipelineId);
}
BindGrid();
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.designer.cs
Generated
+54 -1
View File
@@ -140,6 +140,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnUpDateState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUpDateState;
/// <summary>
/// btnImportFIELD 控件。
/// </summary>
@@ -184,7 +193,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipelineCode;
protected global::FineUIPro.TextBox txtFlowingSection;
/// <summary>
/// txtSingleName 控件。
@@ -213,6 +221,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialCode;
/// <summary>
/// txtFlowingSection 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtFlowingSection;
/// <summary>
/// btnQuery 控件。
/// </summary>
@@ -231,6 +248,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>