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

2022-11-9 焊接施工计划导入增加流水段

This commit is contained in:
李鹏飞 2022-11-09 18:16:18 +08:00
parent 1f39165abd
commit a0a3f525ab
8 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
View File

@ -131,6 +131,7 @@ namespace BLL
,line.ActStartDate ,line.ActStartDate
,line.ActEndDate ,line.ActEndDate
,line.IsFinished ,line.IsFinished
,line.FlowingSection
,com.PipelineComponentId ,com.PipelineComponentId
,com.PreUnit ,com.PreUnit
,com.PipelineComponentCode ,com.PipelineComponentCode
@ -210,6 +211,7 @@ namespace BLL
,line.ActStartDate ,line.ActStartDate
,line.ActEndDate ,line.ActEndDate
,line.IsFinished ,line.IsFinished
,line.FlowingSection
,unit.UnitWorkName ,unit.UnitWorkName
from HJGL_Pipeline line from HJGL_Pipeline line
left join WBS_UnitWork unit on line.UnitWorkId=unit.UnitWorkId left join WBS_UnitWork unit on line.UnitWorkId=unit.UnitWorkId
@ -297,6 +299,7 @@ namespace BLL
newPipeline.PCtype = pipeline.PCtype; newPipeline.PCtype = pipeline.PCtype;
newPipeline.MaterialId = pipeline.MaterialId; newPipeline.MaterialId = pipeline.MaterialId;
newPipeline.State = pipeline.State; newPipeline.State = pipeline.State;
newPipeline.FlowingSection=pipeline.FlowingSection;
db.HJGL_Pipeline.InsertOnSubmit(newPipeline); db.HJGL_Pipeline.InsertOnSubmit(newPipeline);
db.SubmitChanges(); db.SubmitChanges();
} }
@ -341,6 +344,8 @@ namespace BLL
newPipeline.ActEndDate = pipeline.ActEndDate; newPipeline.ActEndDate = pipeline.ActEndDate;
newPipeline.WBSId = pipeline.WBSId; newPipeline.WBSId = pipeline.WBSId;
newPipeline.State = pipeline.State; newPipeline.State = pipeline.State;
newPipeline.FlowingSection = pipeline.FlowingSection;
try try
{ {
db.SubmitChanges(System.Data.Linq.ConflictMode.ContinueOnConflict); db.SubmitChanges(System.Data.Linq.ConflictMode.ContinueOnConflict);

BIN
SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut2.xlsx
View File

Binary file not shown.

BIN
SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx
View File

Binary file not shown.

9
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
View File

@ -85,6 +85,9 @@
EmptyText="输入查询条件" EmptyText="输入查询条件"
Width="180px" LabelWidth="80px" LabelAlign="Right"> Width="180px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtFlowingSection" runat ="server" Label="流水段" EmptyText="输入查询条件"
Width="180px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill> <f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnQuery_Click" runat="server"> EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
@ -102,6 +105,10 @@
<Columns> <Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center" /> Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="流水段" ColumnID="FlowingSection" Locked="true"
DataField="FlowingSection" SortField="FlowingSection" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:WindowField ColumnID="PipelineCode" HeaderTextAlign="Center" TextAlign="Left" <f:WindowField ColumnID="PipelineCode" HeaderTextAlign="Center" TextAlign="Left"
Width="280px" WindowID="Window1" HeaderText="管线号" DataTextField="PipelineCode" Width="280px" WindowID="Window1" HeaderText="管线号" DataTextField="PipelineCode"
DataIFrameUrlFields="PipelineId" DataIFrameUrlFormatString="PipelineFinish.aspx?PipelineId={0}" DataIFrameUrlFields="PipelineId" DataIFrameUrlFormatString="PipelineFinish.aspx?PipelineId={0}"
@ -111,7 +118,7 @@
<f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode" <f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode"
DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String" DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px"> HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="计划开始日期(预制)" ColumnID="PlanStartDate_SHOP" <f:RenderField HeaderText="计划开始日期(预制)" ColumnID="PlanStartDate_SHOP"
DataField="PlanStartDate_SHOP" SortField="PlanStartDate_SHOP" FieldType="Date" Renderer="Date" DataField="PlanStartDate_SHOP" SortField="PlanStartDate_SHOP" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="150px"> HeaderTextAlign="Center" TextAlign="Left" Width="150px">

7
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
View File

@ -171,6 +171,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
,line.ActStartDate ,line.ActStartDate
,line.ActEndDate ,line.ActEndDate
,line.IsFinished ,line.IsFinished
,line.FlowingSection
,com.PipelineComponentId ,com.PipelineComponentId
,com.PreUnit ,com.PreUnit
,com.PipelineComponentCode ,com.PipelineComponentCode
@ -212,6 +213,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
strSql += " AND mat.MaterialCode LIKE @MaterialCode"; strSql += " AND mat.MaterialCode LIKE @MaterialCode";
listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text.Trim() + "%")); listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text.Trim() + "%"));
} }
if (!string.IsNullOrEmpty(this.txtFlowingSection.Text.Trim()))
{
strSql += " AND line.FlowingSection LIKE @FlowingSection";
listStr.Add(new SqlParameter("@FlowingSection", "%" + this.txtFlowingSection.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

1
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.designer.cs generated
View File

@ -184,6 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtPipelineCode; protected global::FineUIPro.TextBox txtPipelineCode;
protected global::FineUIPro.TextBox txtFlowingSection;
/// <summary> /// <summary>
/// txtSingleName 控件。 /// txtSingleName 控件。

4
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx
View File

@ -60,6 +60,10 @@
<asp:Label ID="lbPipelineId" runat="server" Text='<%# ConvertPipelineId(Eval("PipelineId")) %>'></asp:Label> <asp:Label ID="lbPipelineId" runat="server" Text='<%# ConvertPipelineId(Eval("PipelineId")) %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<f:RenderField HeaderText="流水段" ColumnID="FlowingSection"
DataField="FlowingSection" SortField="FlowingSection" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode" <f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode"
DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String" DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px"> HeaderTextAlign="Center" TextAlign="Left" Width="150px">

7
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs
View File

@ -142,10 +142,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
switch (Type) switch (Type)
{ {
case BLL.PipelineService.PipeArea_SHOP: case BLL.PipelineService.PipeArea_SHOP:
responeData = AddDatasetToSQL_SHOP(rows, 13); responeData = AddDatasetToSQL_SHOP(rows, 14);
break; break;
case BLL.PipelineService.PipeArea_FIELD: case BLL.PipelineService.PipeArea_FIELD:
responeData = AddDatasetToSQL_FIELD(rows, 8); responeData = AddDatasetToSQL_FIELD(rows, 9);
break; break;
} }
if (responeData.code==1) if (responeData.code==1)
@ -188,6 +188,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline(); Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline();
string pioelinecode = pds.Rows[i]["管线号"].ToString(); string pioelinecode = pds.Rows[i]["管线号"].ToString();
string flowingSection = pds.Rows[i]["流水段"].ToString();
string PlanStartDate = pds.Rows[i]["计划开始时间"].ToString(); string PlanStartDate = pds.Rows[i]["计划开始时间"].ToString();
string PlanEndDate = pds.Rows[i]["计划结束时间"].ToString(); string PlanEndDate = pds.Rows[i]["计划结束时间"].ToString();
@ -209,7 +210,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
pipeline.PlanStartDate = Convert.ToDateTime(PlanStartDate); pipeline.PlanStartDate = Convert.ToDateTime(PlanStartDate);
pipeline.PlanEndDate = Convert.ToDateTime(PlanEndDate); pipeline.PlanEndDate = Convert.ToDateTime(PlanEndDate);
pipeline.FlowingSection = flowingSection;
} }
catch (Exception) catch (Exception)
{ {