From a0a3f525ab16a6ca6faebd20db89349dc697ae68 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Wed, 9 Nov 2022 18:16:18 +0800
Subject: [PATCH] =?UTF-8?q?2022-11-9=20=E7=84=8A=E6=8E=A5=E6=96=BD?=
 =?UTF-8?q?=E5=B7=A5=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B5=81=E6=B0=B4=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BLL/HJGL/WeldingManage/PipelineService.cs |   5 +++++
 .../Excel/DataOut/WeldingPlanDataOut2.xlsx    | Bin 11251 -> 11281 bytes
 .../DataOut/WeldingPlanDataOut_SHOP.xlsx      | Bin 11537 -> 11559 bytes
 .../HJGL/WeldingManage/WeldingPlan.aspx       |   9 ++++++++-
 .../HJGL/WeldingManage/WeldingPlan.aspx.cs    |   7 +++++++
 .../WeldingPlan.aspx.designer.cs              |   1 +
 .../HJGL/WeldingManage/WeldingPlanIn.aspx     |   4 ++++
 .../HJGL/WeldingManage/WeldingPlanIn.aspx.cs  |   7 ++++---
 8 files changed, 29 insertions(+), 4 deletions(-)

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 ac6deedbf96767e60126c8664eebf17879eb44cc..eb84a4596460387dcdda6b6b202ad900d90652af 100644
GIT binary patch
delta 2765
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
KU{6*2!}t$BR1T*A

delta 2743
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

diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut_SHOP.xlsx
index 8c6ded480402129375689fdd966859fafefba731..0be72d8cde66a36e365b6961d97b86cf0d0e324c 100644
GIT binary patch
delta 3019
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
N<t!!!swn^f005+?kA46E

delta 3029
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
Jo(cPp@ITRGhmimP

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">
                                         </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:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
                                             EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
@@ -102,6 +105,10 @@
                                     <Columns>
                                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
                                             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"
                                             Width="280px" WindowID="Window1" HeaderText="管线号" DataTextField="PipelineCode"
                                             DataIFrameUrlFields="PipelineId" DataIFrameUrlFormatString="PipelineFinish.aspx?PipelineId={0}"
@@ -111,7 +118,7 @@
                                         <f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode"
                                             DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String" 
                                             HeaderTextAlign="Center" TextAlign="Left" Width="150px">
-                                        </f:RenderField>
+                                        </f:RenderField>                                      
                                         <f:RenderField HeaderText="计划开始日期(预制)" ColumnID="PlanStartDate_SHOP"
                                             DataField="PlanStartDate_SHOP" SortField="PlanStartDate_SHOP" FieldType="Date" Renderer="Date"
                                             HeaderTextAlign="Center" TextAlign="Left" Width="150px">
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
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPipelineCode;
+        protected global::FineUIPro.TextBox txtFlowingSection;
 
         /// <summary>
         /// 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 @@
                                         <asp:Label ID="lbPipelineId" runat="server" Text='<%# ConvertPipelineId(Eval("PipelineId")) %>'></asp:Label>
                                     </ItemTemplate>
                                 </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"
                                     DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String"
                                     HeaderTextAlign="Center" TextAlign="Left" Width="150px">
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)
                     {