diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
index d1603fa1..f21e343c 100644
--- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
@@ -131,6 +131,7 @@ namespace BLL
,line.ActStartDate
,line.ActEndDate
,line.IsFinished
+ ,line.FlowingSection
,com.PipelineComponentId
,com.PreUnit
,com.PipelineComponentCode
@@ -210,6 +211,7 @@ namespace BLL
,line.ActStartDate
,line.ActEndDate
,line.IsFinished
+ ,line.FlowingSection
,unit.UnitWorkName
from HJGL_Pipeline line
left join WBS_UnitWork unit on line.UnitWorkId=unit.UnitWorkId
@@ -297,6 +299,7 @@ namespace BLL
newPipeline.PCtype = pipeline.PCtype;
newPipeline.MaterialId = pipeline.MaterialId;
newPipeline.State = pipeline.State;
+ newPipeline.FlowingSection=pipeline.FlowingSection;
db.HJGL_Pipeline.InsertOnSubmit(newPipeline);
db.SubmitChanges();
}
@@ -341,6 +344,8 @@ namespace BLL
newPipeline.ActEndDate = pipeline.ActEndDate;
newPipeline.WBSId = pipeline.WBSId;
newPipeline.State = pipeline.State;
+ newPipeline.FlowingSection = pipeline.FlowingSection;
+
try
{
db.SubmitChanges(System.Data.Linq.ConflictMode.ContinueOnConflict);
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut2.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut2.xlsx
index ac6deedb..eb84a459 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut2.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut2.xlsx differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx
index 8c6ded48..0be72d8c 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx differ
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
index 5dd4ca96..ec92f111 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx
@@ -85,6 +85,9 @@
EmptyText="输入查询条件"
Width="180px" LabelWidth="80px" LabelAlign="Right">
+
+
@@ -102,6 +105,10 @@
+
+
-
+
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
index 0fed0e14..77c0552d 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
@@ -171,6 +171,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
,line.ActStartDate
,line.ActEndDate
,line.IsFinished
+ ,line.FlowingSection
,com.PipelineComponentId
,com.PreUnit
,com.PipelineComponentCode
@@ -212,6 +213,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
strSql += " AND mat.MaterialCode LIKE @MaterialCode";
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();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.designer.cs
index 4165fa7a..0870fe01 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.designer.cs
@@ -184,6 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtPipelineCode;
+ protected global::FineUIPro.TextBox txtFlowingSection;
///
/// txtSingleName 控件。
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx
index c4a4fa18..75bb1f2e 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx
@@ -60,6 +60,10 @@
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs
index 97d75c3c..ed1379fd 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs
@@ -142,10 +142,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
switch (Type)
{
case BLL.PipelineService.PipeArea_SHOP:
- responeData = AddDatasetToSQL_SHOP(rows, 13);
+ responeData = AddDatasetToSQL_SHOP(rows, 14);
break;
case BLL.PipelineService.PipeArea_FIELD:
- responeData = AddDatasetToSQL_FIELD(rows, 8);
+ responeData = AddDatasetToSQL_FIELD(rows, 9);
break;
}
if (responeData.code==1)
@@ -188,6 +188,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline();
string pioelinecode = pds.Rows[i]["管线号"].ToString();
+ string flowingSection = pds.Rows[i]["流水段"].ToString();
string PlanStartDate = 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.PlanEndDate = Convert.ToDateTime(PlanEndDate);
-
+ pipeline.FlowingSection = flowingSection;
}
catch (Exception)
{