diff --git a/DataBase/版本日志/SGGLDB_V2022-09-23 lpf.sql b/DataBase/版本日志/SGGLDB_V2022-09-23 lpf.sql
new file mode 100644
index 00000000..ded4c274
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-09-23 lpf.sql	
@@ -0,0 +1,6 @@
+alter table HJGL_Pipeline_Component add DrawingName varchar(100)
+GO
+delete from Sys_Menu where MenuId='DB50A5AA-08DB-4915-9173-6DB133CA76F0'
+GO
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('DB50A5AA-08DB-4915-9173-6DB133CA76F0','�����Ϣ����','HJGL/DataImport/MaterialStock.aspx',30,'43F92EA7-462F-41E6-8D8A-243C03A5317E','Menu_HJGL',0,1,1)
diff --git a/DataBase/版本日志/SGGLDB_V2022-09-23 修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-23 修改明细.txt
new file mode 100644
index 00000000..2cd69f69
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-09-23 修改明细.txt	
@@ -0,0 +1,7 @@
+--ADD BY lipengfei 2022-09-23
+1、预制组件管理二维码导入增加预制图纸名称。
+2、库存信息更名为《库存信息总览》，移动到《信息查询》。
+3、焊接终版测试问题修改。
+--END
+
+ 
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql b/DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql
deleted file mode 100644
index be7141eb..00000000
--- a/DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql	
+++ /dev/null
@@ -1 +0,0 @@
-alter table HJGL_Pipeline_Component add DrawingName varchar(100)
\ No newline at end of file
diff --git a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
index 8e476cc9..eea50c9a 100644
--- a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
+++ b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
@@ -80,9 +80,7 @@ VALUES('EF6B01AF-D038-4A38-BFAF-D89130D60DE6','
 GO
 INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('9CCBEAD5-0425-47CB-B7FB-E91CA17BC6BF','EF6B01AF-D038-4A38-BFAF-D89130D60DE6','����',1) 
 GO
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('DB50A5AA-08DB-4915-9173-6DB133CA76F0','�����Ϣ','HJGL/DataImport/MaterialStock.aspx',14,'0','Menu_HJGL',0,1,1)
-GO
+
 
 -- /* Ԥ�ƹ���*/
 --INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
@@ -197,6 +195,10 @@ GO
 		VALUES('F4275A19-A72E-448E-B0C1-07DB2FCEE224','����̨������','HJGL/InfoQuery/JointQuery.aspx',20,'43F92EA7-462F-41E6-8D8A-243C03A5317E','Menu_HJGL',0,1,1)
 		GO
 		INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('EA0A1B4B-502B-416E-948A-DFBD893E40F5','F4275A19-A72E-448E-B0C1-07DB2FCEE224','�鿴',1) 
+		GO
+		INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+		VALUES('DB50A5AA-08DB-4915-9173-6DB133CA76F0','�����Ϣ����','HJGL/DataImport/MaterialStock.aspx',30,'43F92EA7-462F-41E6-8D8A-243C03A5317E','Menu_HJGL',0,1,1)
+GO
 GO
 --------------------------------------------------------------------------------------------------------------------------------
 INSERT Sys_Menu (MenuId,MenuName,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) 
diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
index 8675e443..9a3bf529 100644
--- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
@@ -130,6 +130,7 @@ namespace BLL
             newPipeline.PlanEndDate = pipeline.PlanEndDate;
             newPipeline.ActStartDate = pipeline.ActStartDate;
             newPipeline.ActEndDate = pipeline.ActEndDate;
+            newPipeline.DrawingName = pipeline.DrawingName;
             db.HJGL_Pipeline_Component.InsertOnSubmit(newPipeline);
             db.SubmitChanges();
         }
@@ -156,6 +157,7 @@ namespace BLL
                 newPipeline.PlanEndDate = pipeline.PlanEndDate;
                 newPipeline.ActStartDate = pipeline.ActStartDate;
                 newPipeline.ActEndDate = pipeline.ActEndDate;
+                newPipeline.DrawingName = pipeline.DrawingName;
                 db.SubmitChanges();
             }
         }
@@ -244,5 +246,16 @@ namespace BLL
                 Funs.FineUIPleaseSelect(dropName);
             }
         }
+        public static void InitMainItemDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "Value";
+            dropName.DataTextField = "Text";
+            dropName.DataSource = GetState();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
     }
 }
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
index ac4ee185..61e52182 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
@@ -41,7 +41,7 @@
                             Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="数据"
                             TitleToolTip="数据" AutoScroll="true">
                             <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据"  ForceFit="true"
+                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据"  ForceFit="true" MinColumnWidth="50px"
                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId" 
                                     AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
                                     AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
@@ -132,9 +132,9 @@
                         </f:Panel>
                         <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" ShowBorder="true" RegionPercent="35%"
                             Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="历史记录"
-                            TitleToolTip="历史记录" AutoScroll="true">
+                            TitleToolTip="历史记录" AutoScroll="true" >
                             <Items>
-                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true"
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true" MinColumnWidth="50px"
                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
                                     AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
                                     AllowSorting="true" SortField="Version" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" EnableMultiSelect="false"
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
index 5b2b5b77..334fd323 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>焊口信息</title>
+    <title>材料信息</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
index ef3bb3b0..3ef430a0 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
@@ -41,7 +41,7 @@
                             Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="数据"
                             TitleToolTip="数据" AutoScroll="true">
                             <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据"  ForceFit="true"
+                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据"  ForceFit="true" MinColumnWidth="50px"
                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
                                     AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
                                     AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
@@ -133,9 +133,9 @@
                         </f:Panel>
                         <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" ShowBorder="true" RegionPercent="35%"
                             Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="历史记录"
-                            TitleToolTip="历史记录" AutoScroll="true">
+                            TitleToolTip="历史记录" AutoScroll="true" >
                             <Items>
-                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true"
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true" MinColumnWidth="50px"
                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
                                     AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
                                     AllowSorting="true" SortField="Version" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" EnableMultiSelect="false"
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
index 74ab256e..4a272a97 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
@@ -222,10 +222,10 @@
             Target="Parent" EnableResize="true" runat="server" IsModal="false"  ConstrainSize="true" AutoScroll="true" PositionX="Right" PositionY="Top"
             Width="250px" Height="250px">
         </f:Window>
-              <f:Window ID="Window2" Title="轴测图" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server"  IsModal="false" EnableDrag="false" AutoScroll="true"
-        Width="800px" Height="600px">
-                  </f:Window>
+        <f:Window ID="Window2" Title="轴测图" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="false" EnableDrag="false" AutoScroll="true"
+            Width="800px" Height="600px">
+        </f:Window>
     </form>
     <script type="text/javascript">
 
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManage.aspx
index 656f457d..249abec3 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManage.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManage.aspx
@@ -43,7 +43,7 @@
                                 <f:Button ID="btnSearch" Icon="SystemSearch" Text="查询"
                                     EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
                                 </f:Button>
-                                <f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
+                                <f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置查询" Text="重置查询" Icon="ArrowUndo" EnablePostBack="true" runat="server">
                                 </f:Button>
                                 <f:Button ID="btnNew" Icon="Add" Text="新增" EnablePostBack="true" Hidden="true"
                                     runat="server">
@@ -119,7 +119,7 @@
                 </f:Grid>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="材料信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="附件上传" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="800px" Height="460px">
         </f:Window>
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
index b63292a4..a797ac4e 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
@@ -41,20 +41,40 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox ID="txtPipelineComponentCode" runat="server" Label="组件编号"
+                                    EmptyText="输入查询条件"
+                                    Width="240px" LabelWidth="100px" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DropDownList ID="drpState" Label="组件状态" runat="server"
+                                    ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="100px">
+                                </f:DropDownList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
                                  <f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
                                 </f:Button>
+                                 <f:Button ID="btnSearch" Icon="SystemSearch" Text="查询"
+                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
+                                </f:Button>       
+                                <f:Button ID="btnDelete" OnClick="btnDelete_Click" EnablePostBack="true"
+                                    ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
+                                    Text="删除" Icon="Delete">
+                                </f:Button>
+                            </Items>                           
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:ToolbarFill ID="ToolbarFill2" runat="server">
+                                </f:ToolbarFill>
                                 <f:Button ID="btnImportQRCode" Text="导入二维码信息" ToolTip="导入二维码信息" Icon="PackageIn" runat="server"  OnClick="btnImportQRCode_Click">
                                 </f:Button>
                                 <f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd"  Hidden="true"
                                     runat="server" OnClick="btnBatchAdd_Click">
                                 </f:Button>
-                                <f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="打印" ToolTip="打印" OnClick="btnPrint_Click"></f:Button>
-                                <f:Button ID="btnDelete" OnClick="btnDelete_Click" EnablePostBack="true"
-                                    ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
-                                    Text="删除" Icon="Delete">
+                                <f:Button ID="btnSinglePreview" ToolTip="管道预制加工图" Icon="PageRed" Text="管道预制加工图"
+                                    EnablePostBack="true" OnClick="btnSinglePreview_Click" runat="server">
                                 </f:Button>
+                                <f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="打印" ToolTip="打印" OnClick="btnPrint_Click"></f:Button>
+                                
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -99,6 +119,10 @@
                                         <asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("QRCode"),Eval("PipelineComponentId")) %>'></asp:Label>
                                     </ItemTemplate>
                                 </f:TemplateField>
+                                <f:RenderField Width="200px" ColumnID="DrawingName" DataField="DrawingName" SortField="DrawingName"
+                                    FieldType="String" HeaderText="预制图纸名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
                             </Columns>                         
                             <PageItems>
                                 <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -131,6 +155,10 @@
             EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
             IsModal="true" Width="1010px" Height="660px">
         </f:Window>
+        <f:Window ID="Window4" Title="管道预制加工图" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="false" EnableDrag="false" AutoScroll="true"
+            Width="800px" Height="600px">
+        </f:Window>
     </form>
     <script type="text/javascript">
        
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
index 2d75cfc3..f73ef6ef 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
@@ -17,6 +17,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 this.InitTreeMenu();//加载树
+                HJGL_PipelineComponentService.InitMainItemDownList(drpState,true);
+
+
             }
         }
 
@@ -158,17 +161,30 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             string strSql = @"	SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
                                      com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,
-									 com.QRCode,com.State,pipe.PlanStartDate
+									 com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName
                               FROM HJGL_Pipeline_Component com 
 							  LEFT JOIN HJGL_Pipeline pipe  ON pipe.PipelineId =com.PipelineId
 							  LEFT JOIN dbo.Base_Unit punit ON punit.UnitId=com.PreUnit
 							  LEFT JOIN dbo.Base_Unit aunit ON aunit.UnitId=com.AssembleUnit
-							  WHERE 1= 1";
+							  WHERE  com.PipelineId =@PipelineId ";
             List<SqlParameter> listStr = new List<SqlParameter> { };
 
-            strSql += " AND com.PipelineId =@PipelineId";
+            // strSql += " AND com.PipelineId =@PipelineId";
             listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID));
 
+            if (!string.IsNullOrEmpty(txtPipelineComponentCode.Text))
+            {
+                strSql += " AND com.PipelineComponentCode like  @PipelineComponentCode";
+                listStr.Add(new SqlParameter("@PipelineComponentCode", "%" + this.txtPipelineComponentCode.Text.Trim() + "%"));
+
+            }
+            if (drpState.SelectedValue!=Const._Null)
+            {
+                strSql += " AND com.State =@State";
+                listStr.Add(new SqlParameter("@State", drpState.SelectedValue));
+
+            }
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -390,6 +406,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
         }
         #endregion
 
+        /// <summary>
+        /// 搜索
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
         public string ConvertImageUrlByImage(object str, object id)
         {
             string path = string.Empty;
@@ -423,5 +448,32 @@ namespace FineUIPro.Web.HJGL.PreDesign
             PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - ")));
 
         }
+        protected void btnSinglePreview_Click(object sender, EventArgs e)
+        {
+            //string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf";
+            //var newurl = Funs.SGGLUrl + httpUrl.Replace(Funs.RootPath, "");
+            var id = Grid1.SelectedRowID;
+            if (string.IsNullOrEmpty(id))
+            {
+                ShowNotify("请选择相对应的图纸", MessageBoxIcon.Warning);
+                return;
+            }
+            var SingleName = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineComponentId == id select (x.DrawingName)).FirstOrDefault();
+            var filemodel = BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName, this.CurrUser.LoginProjectId);
+            if (filemodel != null)
+            {
+                string httpUrl = filemodel.FilePath;
+                PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("~/AttachFile/Look.aspx?fileUrl={0}", httpUrl, "查看  -")));
+
+            }
+            else
+            {
+                ShowNotify("请上传相关图纸", MessageBoxIcon.Warning);
+                return;
+            }
+
+
+        }
+
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
index 49fa477f..2e530739 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
@@ -104,6 +104,24 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
 
+        /// <summary>
+        /// txtPipelineComponentCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPipelineComponentCode;
+
+        /// <summary>
+        /// drpState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpState;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -122,6 +140,42 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// btnDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDelete;
+
+        /// <summary>
+        /// Toolbar4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar4;
+
+        /// <summary>
+        /// ToolbarFill2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill2;
+
         /// <summary>
         /// btnImportQRCode 控件。
         /// </summary>
@@ -140,6 +194,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.Button btnBatchAdd;
 
+        /// <summary>
+        /// btnSinglePreview 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSinglePreview;
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -149,15 +212,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.Button btnPrint;
 
-        /// <summary>
-        /// btnDelete 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnDelete;
-
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -238,5 +292,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window3;
+
+        /// <summary>
+        /// Window4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window4;
     }
 }
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx
index 5db4cc30..3d68f893 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx
@@ -52,15 +52,28 @@
                             <Columns>
                                 <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
                                     Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
-                                <f:WindowField ColumnID="PipelineComponentCode" HeaderTextAlign="Center" TextAlign="Left"
+                                <f:TemplateField ColumnID="PipelineId" Width="180px" HeaderText="管线号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertPipelineId(Eval("PipelineId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="200px" ColumnID="PipelineComponentCode" DataField="PipelineComponentCode" SortField="PipelineComponentCode"
+                                    FieldType="String" HeaderText="组件编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                               <%-- <f:WindowField ColumnID="PipelineComponentCode" HeaderTextAlign="Center" TextAlign="Left"
                                     Width="180px" WindowID="Window1" HeaderText="组件编号" DataTextField="PipelineComponentCode"
                                     DataIFrameUrlFields="PipelineComponentId" DataIFrameUrlFormatString="PrePipelineEdit.aspx?PipelineComponentId={0}"
                                     Title="组件编号" DataToolTipField="PipelineComponentCode" SortField="PipelineComponentCode"
                                     Locked="true">
-                                </f:WindowField>
-                               
+                                </f:WindowField>       --%>                        
                                 <f:RenderField Width="200px" ColumnID="QRCode" DataField="QRCode" SortField="QRCode"
-                                    FieldType="String" HeaderText="物流箱号" HeaderTextAlign="Center"
+                                    FieldType="String" HeaderText="二维码信息" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="DrawingName" DataField="DrawingName" SortField="DrawingName"
+                                    FieldType="String" HeaderText="预制图纸名称" HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>
                                 
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
index 6c7cf21e..937fa07f 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
@@ -221,12 +221,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
                     var dt = pds.AsEnumerable()
                     .GroupBy(x => new {
                         pipelinecode = x.Field<string>("管线号"),
-                        PipelineComponentCode = x.Field<string>("预制组件")
+                        PipelineComponentCode = x.Field<string>("预制组件"),
+                        DrawingName = x.Field<string>("预制图纸名称"),
                     })
                     .Select(x => new
                     {
                         pipelinecode = x.Key.pipelinecode,
                         PipelineComponentCode = x.Key.PipelineComponentCode,
+                        DrawingName = x.Key.DrawingName,
                         QRCode = String.Join("&", x.Select(z => z.Field<string>("二维码信息")))
                     });
                     foreach (var item in dt)
@@ -244,6 +246,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                             rootName.QRCode.Add(qRCodeQRCodeItem);
                         }
                         hJGL_Pipeline_Component.QRCode = JsonConvert.SerializeObject(rootName);
+                        hJGL_Pipeline_Component.DrawingName = item.DrawingName;
                         Pipeline_ComponentList.Add(hJGL_Pipeline_Component);
                     }
                     errorInfos = string.Empty;
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.designer.cs
index 0194b374..4bcbc340 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.designer.cs
@@ -113,6 +113,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
 
+        /// <summary>
+        /// lbImageUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl;
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
index ed49650f..30c699a6 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
@@ -11,7 +11,6 @@
 <TreeNode id="32F5CC8C-E0F4-456C-AB88-77E36269FA50" Text="焊接设计基础数据导入" NavigateUrl="HJGL/WeldingManage/WeldJointList.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="1EE36752-6077-47C9-AFF0-5372B862FF61" Text="管线划分" NavigateUrl="HJGL/PreDesign/PipelingDivide.aspx"></TreeNode>
-<TreeNode id="DB50A5AA-08DB-4915-9173-6DB133CA76F0" Text="库存信息" NavigateUrl="HJGL/DataImport/MaterialStock.aspx"></TreeNode>
 <TreeNode id="EF6B01AF-D038-4A38-BFAF-D89130D60DE6" Text="材料信息导入" NavigateUrl="HJGL/DataImport/MaterialInformation.aspx"></TreeNode>
 <TreeNode id="1E36EA73-D536-4215-BFB9-A8771937BD89" Text="工厂预制管理" NavigateUrl=""><TreeNode id="0A3F6AB0-535E-489C-9F64-4FFE61C17085" Text="材料管理" NavigateUrl="HJGL/PreDesign/MaterialManage.aspx"></TreeNode>
 <TreeNode id="8255554C-0A92-4C7B-BF19-779AF0220A8C" Text="预制组件管理" NavigateUrl="HJGL/PreDesign/PrePipeline.aspx"></TreeNode>
@@ -26,6 +25,7 @@
 </TreeNode>
 <TreeNode id="43F92EA7-462F-41E6-8D8A-243C03A5317E" Text="信息查询" NavigateUrl=""><TreeNode id="A98C7295-5735-4C8A-9565-7635A9C5D258" Text="管线信息总览" NavigateUrl="HJGL/InfoQuery/PipelineQuery.aspx"></TreeNode>
 <TreeNode id="F4275A19-A72E-448E-B0C1-07DB2FCEE224" Text="焊口台账总览" NavigateUrl="HJGL/InfoQuery/JointQuery.aspx"></TreeNode>
+<TreeNode id="DB50A5AA-08DB-4915-9173-6DB133CA76F0" Text="库存信息总览" NavigateUrl="HJGL/DataImport/MaterialStock.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="4D36E99E-B3D8-4C61-826A-CBD98EC51515" Text="焊接过程管理" NavigateUrl=""><TreeNode id="E6F6982A-48C7-455C-8EBB-CC7088EBF15A" Text="焊接施工计划" NavigateUrl="HJGL/WeldingManage/WeldingPlan.aspx"></TreeNode>
 <TreeNode id="ADC7EA61-6313-4DF9-913F-E9207F6525CA" Text="材料匹配(工厂预制)" NavigateUrl="HJGL/WeldingManage/WeldMatMatch.aspx?PipeArea=1"></TreeNode>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 915e3a8d..40a6d0e0 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -347,6 +347,12 @@ namespace Model
     partial void InsertCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance);
     partial void UpdateCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance);
     partial void DeleteCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance);
+    partial void InsertConManager_LongList(ConManager_LongList instance);
+    partial void UpdateConManager_LongList(ConManager_LongList instance);
+    partial void DeleteConManager_LongList(ConManager_LongList instance);
+    partial void InsertConManager_SubAchievement(ConManager_SubAchievement instance);
+    partial void UpdateConManager_SubAchievement(ConManager_SubAchievement instance);
+    partial void DeleteConManager_SubAchievement(ConManager_SubAchievement instance);
     partial void InsertCostGoods_CostManage(CostGoods_CostManage instance);
     partial void UpdateCostGoods_CostManage(CostGoods_CostManage instance);
     partial void DeleteCostGoods_CostManage(CostGoods_CostManage instance);
@@ -752,6 +758,9 @@ namespace Model
     partial void InsertPerson_Persons(Person_Persons instance);
     partial void UpdatePerson_Persons(Person_Persons instance);
     partial void DeletePerson_Persons(Person_Persons instance);
+    partial void InsertPerson_PersonsCertificate(Person_PersonsCertificate instance);
+    partial void UpdatePerson_PersonsCertificate(Person_PersonsCertificate instance);
+    partial void DeletePerson_PersonsCertificate(Person_PersonsCertificate instance);
     partial void InsertPerson_PersonTrain(Person_PersonTrain instance);
     partial void UpdatePerson_PersonTrain(Person_PersonTrain instance);
     partial void DeletePerson_PersonTrain(Person_PersonTrain instance);
@@ -2286,6 +2295,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<ConManager_LongList> ConManager_LongList
+		{
+			get
+			{
+				return this.GetTable<ConManager_LongList>();
+			}
+		}
+		
+		public System.Data.Linq.Table<ConManager_SubAchievement> ConManager_SubAchievement
+		{
+			get
+			{
+				return this.GetTable<ConManager_SubAchievement>();
+			}
+		}
+		
 		public System.Data.Linq.Table<CostGoods_CostManage> CostGoods_CostManage
 		{
 			get
@@ -3374,6 +3399,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Person_PersonsCertificate> Person_PersonsCertificate
+		{
+			get
+			{
+				return this.GetTable<Person_PersonsCertificate>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Person_PersonTrain> Person_PersonTrain
 		{
 			get
@@ -50000,6 +50033,802 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_LongList")]
+	public partial class ConManager_LongList : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ConManagerLongListId;
+		
+		private System.Nullable<int> _State;
+		
+		private string _SubUnitName;
+		
+		private string _SubUnitNature;
+		
+		private string _Corporate;
+		
+		private string _Address;
+		
+		private string _CollCropCode;
+		
+		private string _RegisteredCapital;
+		
+		private string _SubjectNatureLevel;
+		
+		private string _OtherNatureLevel;
+		
+		private string _MainBusiness;
+		
+		private string _OpeningBank_TT;
+		
+		private string _BankAccount_TT;
+		
+		private string _OpeningBank_electrophore;
+		
+		private string _BankAccount_electrophore;
+		
+		private string _LineNumber_electrophore;
+		
+		private string _LinkUserName;
+		
+		private string _LinkUserPosition;
+		
+		private string _LinkUserMobile;
+		
+		private string _LinkUserEMail;
+		
+		private string _Personal_all;
+		
+		private string _Personal_Skilled;
+		
+		private string _Personal_Manager;
+		
+		private string _Personal_Reg;
+		
+		private string _AchievementId;
+		
+		private string _IsQualifiedSub;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnConManagerLongListIdChanging(string value);
+    partial void OnConManagerLongListIdChanged();
+    partial void OnStateChanging(System.Nullable<int> value);
+    partial void OnStateChanged();
+    partial void OnSubUnitNameChanging(string value);
+    partial void OnSubUnitNameChanged();
+    partial void OnSubUnitNatureChanging(string value);
+    partial void OnSubUnitNatureChanged();
+    partial void OnCorporateChanging(string value);
+    partial void OnCorporateChanged();
+    partial void OnAddressChanging(string value);
+    partial void OnAddressChanged();
+    partial void OnCollCropCodeChanging(string value);
+    partial void OnCollCropCodeChanged();
+    partial void OnRegisteredCapitalChanging(string value);
+    partial void OnRegisteredCapitalChanged();
+    partial void OnSubjectNatureLevelChanging(string value);
+    partial void OnSubjectNatureLevelChanged();
+    partial void OnOtherNatureLevelChanging(string value);
+    partial void OnOtherNatureLevelChanged();
+    partial void OnMainBusinessChanging(string value);
+    partial void OnMainBusinessChanged();
+    partial void OnOpeningBank_TTChanging(string value);
+    partial void OnOpeningBank_TTChanged();
+    partial void OnBankAccount_TTChanging(string value);
+    partial void OnBankAccount_TTChanged();
+    partial void OnOpeningBank_electrophoreChanging(string value);
+    partial void OnOpeningBank_electrophoreChanged();
+    partial void OnBankAccount_electrophoreChanging(string value);
+    partial void OnBankAccount_electrophoreChanged();
+    partial void OnLineNumber_electrophoreChanging(string value);
+    partial void OnLineNumber_electrophoreChanged();
+    partial void OnLinkUserNameChanging(string value);
+    partial void OnLinkUserNameChanged();
+    partial void OnLinkUserPositionChanging(string value);
+    partial void OnLinkUserPositionChanged();
+    partial void OnLinkUserMobileChanging(string value);
+    partial void OnLinkUserMobileChanged();
+    partial void OnLinkUserEMailChanging(string value);
+    partial void OnLinkUserEMailChanged();
+    partial void OnPersonal_allChanging(string value);
+    partial void OnPersonal_allChanged();
+    partial void OnPersonal_SkilledChanging(string value);
+    partial void OnPersonal_SkilledChanged();
+    partial void OnPersonal_ManagerChanging(string value);
+    partial void OnPersonal_ManagerChanged();
+    partial void OnPersonal_RegChanging(string value);
+    partial void OnPersonal_RegChanged();
+    partial void OnAchievementIdChanging(string value);
+    partial void OnAchievementIdChanged();
+    partial void OnIsQualifiedSubChanging(string value);
+    partial void OnIsQualifiedSubChanged();
+    #endregion
+		
+		public ConManager_LongList()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConManagerLongListId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ConManagerLongListId
+		{
+			get
+			{
+				return this._ConManagerLongListId;
+			}
+			set
+			{
+				if ((this._ConManagerLongListId != value))
+				{
+					this.OnConManagerLongListIdChanging(value);
+					this.SendPropertyChanging();
+					this._ConManagerLongListId = value;
+					this.SendPropertyChanged("ConManagerLongListId");
+					this.OnConManagerLongListIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
+		public System.Nullable<int> State
+		{
+			get
+			{
+				return this._State;
+			}
+			set
+			{
+				if ((this._State != value))
+				{
+					this.OnStateChanging(value);
+					this.SendPropertyChanging();
+					this._State = value;
+					this.SendPropertyChanged("State");
+					this.OnStateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="NVarChar(200)")]
+		public string SubUnitName
+		{
+			get
+			{
+				return this._SubUnitName;
+			}
+			set
+			{
+				if ((this._SubUnitName != value))
+				{
+					this.OnSubUnitNameChanging(value);
+					this.SendPropertyChanging();
+					this._SubUnitName = value;
+					this.SendPropertyChanged("SubUnitName");
+					this.OnSubUnitNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitNature", DbType="NVarChar(200)")]
+		public string SubUnitNature
+		{
+			get
+			{
+				return this._SubUnitNature;
+			}
+			set
+			{
+				if ((this._SubUnitNature != value))
+				{
+					this.OnSubUnitNatureChanging(value);
+					this.SendPropertyChanging();
+					this._SubUnitNature = value;
+					this.SendPropertyChanged("SubUnitNature");
+					this.OnSubUnitNatureChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Corporate", DbType="NVarChar(200)")]
+		public string Corporate
+		{
+			get
+			{
+				return this._Corporate;
+			}
+			set
+			{
+				if ((this._Corporate != value))
+				{
+					this.OnCorporateChanging(value);
+					this.SendPropertyChanging();
+					this._Corporate = value;
+					this.SendPropertyChanged("Corporate");
+					this.OnCorporateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")]
+		public string Address
+		{
+			get
+			{
+				return this._Address;
+			}
+			set
+			{
+				if ((this._Address != value))
+				{
+					this.OnAddressChanging(value);
+					this.SendPropertyChanging();
+					this._Address = value;
+					this.SendPropertyChanged("Address");
+					this.OnAddressChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="NVarChar(200)")]
+		public string CollCropCode
+		{
+			get
+			{
+				return this._CollCropCode;
+			}
+			set
+			{
+				if ((this._CollCropCode != value))
+				{
+					this.OnCollCropCodeChanging(value);
+					this.SendPropertyChanging();
+					this._CollCropCode = value;
+					this.SendPropertyChanged("CollCropCode");
+					this.OnCollCropCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisteredCapital", DbType="NVarChar(50)")]
+		public string RegisteredCapital
+		{
+			get
+			{
+				return this._RegisteredCapital;
+			}
+			set
+			{
+				if ((this._RegisteredCapital != value))
+				{
+					this.OnRegisteredCapitalChanging(value);
+					this.SendPropertyChanging();
+					this._RegisteredCapital = value;
+					this.SendPropertyChanged("RegisteredCapital");
+					this.OnRegisteredCapitalChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubjectNatureLevel", DbType="NVarChar(200)")]
+		public string SubjectNatureLevel
+		{
+			get
+			{
+				return this._SubjectNatureLevel;
+			}
+			set
+			{
+				if ((this._SubjectNatureLevel != value))
+				{
+					this.OnSubjectNatureLevelChanging(value);
+					this.SendPropertyChanging();
+					this._SubjectNatureLevel = value;
+					this.SendPropertyChanged("SubjectNatureLevel");
+					this.OnSubjectNatureLevelChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherNatureLevel", DbType="NVarChar(200)")]
+		public string OtherNatureLevel
+		{
+			get
+			{
+				return this._OtherNatureLevel;
+			}
+			set
+			{
+				if ((this._OtherNatureLevel != value))
+				{
+					this.OnOtherNatureLevelChanging(value);
+					this.SendPropertyChanging();
+					this._OtherNatureLevel = value;
+					this.SendPropertyChanged("OtherNatureLevel");
+					this.OnOtherNatureLevelChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainBusiness", DbType="NVarChar(1000)")]
+		public string MainBusiness
+		{
+			get
+			{
+				return this._MainBusiness;
+			}
+			set
+			{
+				if ((this._MainBusiness != value))
+				{
+					this.OnMainBusinessChanging(value);
+					this.SendPropertyChanging();
+					this._MainBusiness = value;
+					this.SendPropertyChanged("MainBusiness");
+					this.OnMainBusinessChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_TT", DbType="NVarChar(100)")]
+		public string OpeningBank_TT
+		{
+			get
+			{
+				return this._OpeningBank_TT;
+			}
+			set
+			{
+				if ((this._OpeningBank_TT != value))
+				{
+					this.OnOpeningBank_TTChanging(value);
+					this.SendPropertyChanging();
+					this._OpeningBank_TT = value;
+					this.SendPropertyChanged("OpeningBank_TT");
+					this.OnOpeningBank_TTChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_TT", DbType="NVarChar(100)")]
+		public string BankAccount_TT
+		{
+			get
+			{
+				return this._BankAccount_TT;
+			}
+			set
+			{
+				if ((this._BankAccount_TT != value))
+				{
+					this.OnBankAccount_TTChanging(value);
+					this.SendPropertyChanging();
+					this._BankAccount_TT = value;
+					this.SendPropertyChanged("BankAccount_TT");
+					this.OnBankAccount_TTChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_electrophore", DbType="NVarChar(100)")]
+		public string OpeningBank_electrophore
+		{
+			get
+			{
+				return this._OpeningBank_electrophore;
+			}
+			set
+			{
+				if ((this._OpeningBank_electrophore != value))
+				{
+					this.OnOpeningBank_electrophoreChanging(value);
+					this.SendPropertyChanging();
+					this._OpeningBank_electrophore = value;
+					this.SendPropertyChanged("OpeningBank_electrophore");
+					this.OnOpeningBank_electrophoreChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_electrophore", DbType="NVarChar(100)")]
+		public string BankAccount_electrophore
+		{
+			get
+			{
+				return this._BankAccount_electrophore;
+			}
+			set
+			{
+				if ((this._BankAccount_electrophore != value))
+				{
+					this.OnBankAccount_electrophoreChanging(value);
+					this.SendPropertyChanging();
+					this._BankAccount_electrophore = value;
+					this.SendPropertyChanged("BankAccount_electrophore");
+					this.OnBankAccount_electrophoreChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LineNumber_electrophore", DbType="NVarChar(100)")]
+		public string LineNumber_electrophore
+		{
+			get
+			{
+				return this._LineNumber_electrophore;
+			}
+			set
+			{
+				if ((this._LineNumber_electrophore != value))
+				{
+					this.OnLineNumber_electrophoreChanging(value);
+					this.SendPropertyChanging();
+					this._LineNumber_electrophore = value;
+					this.SendPropertyChanged("LineNumber_electrophore");
+					this.OnLineNumber_electrophoreChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserName", DbType="NVarChar(50)")]
+		public string LinkUserName
+		{
+			get
+			{
+				return this._LinkUserName;
+			}
+			set
+			{
+				if ((this._LinkUserName != value))
+				{
+					this.OnLinkUserNameChanging(value);
+					this.SendPropertyChanging();
+					this._LinkUserName = value;
+					this.SendPropertyChanged("LinkUserName");
+					this.OnLinkUserNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserPosition", DbType="NVarChar(100)")]
+		public string LinkUserPosition
+		{
+			get
+			{
+				return this._LinkUserPosition;
+			}
+			set
+			{
+				if ((this._LinkUserPosition != value))
+				{
+					this.OnLinkUserPositionChanging(value);
+					this.SendPropertyChanging();
+					this._LinkUserPosition = value;
+					this.SendPropertyChanged("LinkUserPosition");
+					this.OnLinkUserPositionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserMobile", DbType="NVarChar(50)")]
+		public string LinkUserMobile
+		{
+			get
+			{
+				return this._LinkUserMobile;
+			}
+			set
+			{
+				if ((this._LinkUserMobile != value))
+				{
+					this.OnLinkUserMobileChanging(value);
+					this.SendPropertyChanging();
+					this._LinkUserMobile = value;
+					this.SendPropertyChanged("LinkUserMobile");
+					this.OnLinkUserMobileChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserEMail", DbType="NVarChar(50)")]
+		public string LinkUserEMail
+		{
+			get
+			{
+				return this._LinkUserEMail;
+			}
+			set
+			{
+				if ((this._LinkUserEMail != value))
+				{
+					this.OnLinkUserEMailChanging(value);
+					this.SendPropertyChanging();
+					this._LinkUserEMail = value;
+					this.SendPropertyChanged("LinkUserEMail");
+					this.OnLinkUserEMailChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_all", DbType="NVarChar(200)")]
+		public string Personal_all
+		{
+			get
+			{
+				return this._Personal_all;
+			}
+			set
+			{
+				if ((this._Personal_all != value))
+				{
+					this.OnPersonal_allChanging(value);
+					this.SendPropertyChanging();
+					this._Personal_all = value;
+					this.SendPropertyChanged("Personal_all");
+					this.OnPersonal_allChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Skilled", DbType="NVarChar(200)")]
+		public string Personal_Skilled
+		{
+			get
+			{
+				return this._Personal_Skilled;
+			}
+			set
+			{
+				if ((this._Personal_Skilled != value))
+				{
+					this.OnPersonal_SkilledChanging(value);
+					this.SendPropertyChanging();
+					this._Personal_Skilled = value;
+					this.SendPropertyChanged("Personal_Skilled");
+					this.OnPersonal_SkilledChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Manager", DbType="NVarChar(200)")]
+		public string Personal_Manager
+		{
+			get
+			{
+				return this._Personal_Manager;
+			}
+			set
+			{
+				if ((this._Personal_Manager != value))
+				{
+					this.OnPersonal_ManagerChanging(value);
+					this.SendPropertyChanging();
+					this._Personal_Manager = value;
+					this.SendPropertyChanged("Personal_Manager");
+					this.OnPersonal_ManagerChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Reg", DbType="NVarChar(200)")]
+		public string Personal_Reg
+		{
+			get
+			{
+				return this._Personal_Reg;
+			}
+			set
+			{
+				if ((this._Personal_Reg != value))
+				{
+					this.OnPersonal_RegChanging(value);
+					this.SendPropertyChanging();
+					this._Personal_Reg = value;
+					this.SendPropertyChanged("Personal_Reg");
+					this.OnPersonal_RegChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50)")]
+		public string AchievementId
+		{
+			get
+			{
+				return this._AchievementId;
+			}
+			set
+			{
+				if ((this._AchievementId != value))
+				{
+					this.OnAchievementIdChanging(value);
+					this.SendPropertyChanging();
+					this._AchievementId = value;
+					this.SendPropertyChanged("AchievementId");
+					this.OnAchievementIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsQualifiedSub", DbType="NVarChar(50)")]
+		public string IsQualifiedSub
+		{
+			get
+			{
+				return this._IsQualifiedSub;
+			}
+			set
+			{
+				if ((this._IsQualifiedSub != value))
+				{
+					this.OnIsQualifiedSubChanging(value);
+					this.SendPropertyChanging();
+					this._IsQualifiedSub = value;
+					this.SendPropertyChanged("IsQualifiedSub");
+					this.OnIsQualifiedSubChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_SubAchievement")]
+	public partial class ConManager_SubAchievement : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _AchievementId;
+		
+		private string _ProjectName;
+		
+		private string _Remark;
+		
+		private string _HonorAward;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnAchievementIdChanging(string value);
+    partial void OnAchievementIdChanged();
+    partial void OnProjectNameChanging(string value);
+    partial void OnProjectNameChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    partial void OnHonorAwardChanging(string value);
+    partial void OnHonorAwardChanged();
+    #endregion
+		
+		public ConManager_SubAchievement()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string AchievementId
+		{
+			get
+			{
+				return this._AchievementId;
+			}
+			set
+			{
+				if ((this._AchievementId != value))
+				{
+					this.OnAchievementIdChanging(value);
+					this.SendPropertyChanging();
+					this._AchievementId = value;
+					this.SendPropertyChanged("AchievementId");
+					this.OnAchievementIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")]
+		public string ProjectName
+		{
+			get
+			{
+				return this._ProjectName;
+			}
+			set
+			{
+				if ((this._ProjectName != value))
+				{
+					this.OnProjectNameChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectName = value;
+					this.SendPropertyChanged("ProjectName");
+					this.OnProjectNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(1000)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HonorAward", DbType="NVarChar(1000)")]
+		public string HonorAward
+		{
+			get
+			{
+				return this._HonorAward;
+			}
+			set
+			{
+				if ((this._HonorAward != value))
+				{
+					this.OnHonorAwardChanging(value);
+					this.SendPropertyChanging();
+					this._HonorAward = value;
+					this.SendPropertyChanged("HonorAward");
+					this.OnHonorAwardChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_CostManage")]
 	public partial class CostGoods_CostManage : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -66062,8 +66891,6 @@ namespace Model
 		
 		private string _ImportType;
 		
-		private string _DataClassification;
-		
 		private string _FileName;
 		
 		private string _FilePath;
@@ -66082,6 +66909,8 @@ namespace Model
 		
 		private string _CreateDate;
 		
+		private string _DataClassification;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -66094,8 +66923,6 @@ namespace Model
     partial void OnUnitWorkIdChanged();
     partial void OnImportTypeChanging(string value);
     partial void OnImportTypeChanged();
-    partial void OnDataClassificationChanging(string value);
-    partial void OnDataClassificationChanged();
     partial void OnFileNameChanging(string value);
     partial void OnFileNameChanged();
     partial void OnFilePathChanging(string value);
@@ -66114,6 +66941,8 @@ namespace Model
     partial void OnCreateManChanged();
     partial void OnCreateDateChanging(string value);
     partial void OnCreateDateChanged();
+    partial void OnDataClassificationChanging(string value);
+    partial void OnDataClassificationChanged();
     #endregion
 		
 		public HJGL_DesignBasisDataImport()
@@ -66201,26 +67030,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")]
-		public string DataClassification
-		{
-			get
-			{
-				return this._DataClassification;
-			}
-			set
-			{
-				if ((this._DataClassification != value))
-				{
-					this.OnDataClassificationChanging(value);
-					this.SendPropertyChanging();
-					this._DataClassification = value;
-					this.SendPropertyChanged("DataClassification");
-					this.OnDataClassificationChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileName", DbType="VarChar(500)")]
 		public string FileName
 		{
@@ -66401,6 +67210,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")]
+		public string DataClassification
+		{
+			get
+			{
+				return this._DataClassification;
+			}
+			set
+			{
+				if ((this._DataClassification != value))
+				{
+					this.OnDataClassificationChanging(value);
+					this.SendPropertyChanging();
+					this._DataClassification = value;
+					this.SendPropertyChanged("DataClassification");
+					this.OnDataClassificationChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -66434,10 +67263,10 @@ namespace Model
 		
 		private string _UnitWorkId;
 		
-		private string _DataClassification;
-		
 		private System.Nullable<decimal> _Version;
 		
+		private string _DataClassification;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -66448,10 +67277,10 @@ namespace Model
     partial void OnProjectIdChanged();
     partial void OnUnitWorkIdChanging(string value);
     partial void OnUnitWorkIdChanged();
-    partial void OnDataClassificationChanging(string value);
-    partial void OnDataClassificationChanged();
     partial void OnVersionChanging(System.Nullable<decimal> value);
     partial void OnVersionChanged();
+    partial void OnDataClassificationChanging(string value);
+    partial void OnDataClassificationChanged();
     #endregion
 		
 		public HJGL_DesignBasisDataImportVerSionLog()
@@ -66519,26 +67348,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")]
-		public string DataClassification
-		{
-			get
-			{
-				return this._DataClassification;
-			}
-			set
-			{
-				if ((this._DataClassification != value))
-				{
-					this.OnDataClassificationChanging(value);
-					this.SendPropertyChanging();
-					this._DataClassification = value;
-					this.SendPropertyChanged("DataClassification");
-					this.OnDataClassificationChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Version", DbType="Decimal(18,1)")]
 		public System.Nullable<decimal> Version
 		{
@@ -66559,6 +67368,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")]
+		public string DataClassification
+		{
+			get
+			{
+				return this._DataClassification;
+			}
+			set
+			{
+				if ((this._DataClassification != value))
+				{
+					this.OnDataClassificationChanging(value);
+					this.SendPropertyChanging();
+					this._DataClassification = value;
+					this.SendPropertyChanged("DataClassification");
+					this.OnDataClassificationChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -73383,7 +74212,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -74623,6 +75452,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _ActEndDate;
 		
+		private string _DrawingName;
+		
 		private EntityRef<HJGL_Pipeline> _HJGL_Pipeline;
 		
     #region 可扩展性方法定义
@@ -74655,6 +75486,8 @@ namespace Model
     partial void OnActStartDateChanged();
     partial void OnActEndDateChanging(System.Nullable<System.DateTime> value);
     partial void OnActEndDateChanged();
+    partial void OnDrawingNameChanging(string value);
+    partial void OnDrawingNameChanged();
     #endregion
 		
 		public HJGL_Pipeline_Component()
@@ -74927,6 +75760,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrawingName", DbType="VarChar(100)")]
+		public string DrawingName
+		{
+			get
+			{
+				return this._DrawingName;
+			}
+			set
+			{
+				if ((this._DrawingName != value))
+				{
+					this.OnDrawingNameChanging(value);
+					this.SendPropertyChanging();
+					this._DrawingName = value;
+					this.SendPropertyChanged("DrawingName");
+					this.OnDrawingNameChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Pipeline_Component_HJGL_Pipeline", Storage="_HJGL_Pipeline", ThisKey="PipelineId", OtherKey="PipelineId", IsForeignKey=true)]
 		public HJGL_Pipeline HJGL_Pipeline
 		{
@@ -124056,6 +124909,284 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonsCertificate")]
+	public partial class Person_PersonsCertificate : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _PersonsCertificateId;
+		
+		private string _PersonId;
+		
+		private string _CertificateId;
+		
+		private string _CertificateCode;
+		
+		private string _SendUnit;
+		
+		private System.Nullable<System.DateTime> _SendDate;
+		
+		private System.Nullable<System.DateTime> _RegisterDate;
+		
+		private string _Major;
+		
+		private System.Nullable<System.DateTime> _ValidityDate;
+		
+		private string _Url;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnPersonsCertificateIdChanging(string value);
+    partial void OnPersonsCertificateIdChanged();
+    partial void OnPersonIdChanging(string value);
+    partial void OnPersonIdChanged();
+    partial void OnCertificateIdChanging(string value);
+    partial void OnCertificateIdChanged();
+    partial void OnCertificateCodeChanging(string value);
+    partial void OnCertificateCodeChanged();
+    partial void OnSendUnitChanging(string value);
+    partial void OnSendUnitChanged();
+    partial void OnSendDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnSendDateChanged();
+    partial void OnRegisterDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnRegisterDateChanged();
+    partial void OnMajorChanging(string value);
+    partial void OnMajorChanged();
+    partial void OnValidityDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnValidityDateChanged();
+    partial void OnUrlChanging(string value);
+    partial void OnUrlChanged();
+    #endregion
+		
+		public Person_PersonsCertificate()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonsCertificateId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string PersonsCertificateId
+		{
+			get
+			{
+				return this._PersonsCertificateId;
+			}
+			set
+			{
+				if ((this._PersonsCertificateId != value))
+				{
+					this.OnPersonsCertificateIdChanging(value);
+					this.SendPropertyChanging();
+					this._PersonsCertificateId = value;
+					this.SendPropertyChanged("PersonsCertificateId");
+					this.OnPersonsCertificateIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonId", DbType="NVarChar(50)")]
+		public string PersonId
+		{
+			get
+			{
+				return this._PersonId;
+			}
+			set
+			{
+				if ((this._PersonId != value))
+				{
+					this.OnPersonIdChanging(value);
+					this.SendPropertyChanging();
+					this._PersonId = value;
+					this.SendPropertyChanged("PersonId");
+					this.OnPersonIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateId", DbType="NVarChar(50)")]
+		public string CertificateId
+		{
+			get
+			{
+				return this._CertificateId;
+			}
+			set
+			{
+				if ((this._CertificateId != value))
+				{
+					this.OnCertificateIdChanging(value);
+					this.SendPropertyChanging();
+					this._CertificateId = value;
+					this.SendPropertyChanged("CertificateId");
+					this.OnCertificateIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateCode", DbType="NVarChar(50)")]
+		public string CertificateCode
+		{
+			get
+			{
+				return this._CertificateCode;
+			}
+			set
+			{
+				if ((this._CertificateCode != value))
+				{
+					this.OnCertificateCodeChanging(value);
+					this.SendPropertyChanging();
+					this._CertificateCode = value;
+					this.SendPropertyChanged("CertificateCode");
+					this.OnCertificateCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendUnit", DbType="NVarChar(500)")]
+		public string SendUnit
+		{
+			get
+			{
+				return this._SendUnit;
+			}
+			set
+			{
+				if ((this._SendUnit != value))
+				{
+					this.OnSendUnitChanging(value);
+					this.SendPropertyChanging();
+					this._SendUnit = value;
+					this.SendPropertyChanged("SendUnit");
+					this.OnSendUnitChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> SendDate
+		{
+			get
+			{
+				return this._SendDate;
+			}
+			set
+			{
+				if ((this._SendDate != value))
+				{
+					this.OnSendDateChanging(value);
+					this.SendPropertyChanging();
+					this._SendDate = value;
+					this.SendPropertyChanged("SendDate");
+					this.OnSendDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RegisterDate
+		{
+			get
+			{
+				return this._RegisterDate;
+			}
+			set
+			{
+				if ((this._RegisterDate != value))
+				{
+					this.OnRegisterDateChanging(value);
+					this.SendPropertyChanging();
+					this._RegisterDate = value;
+					this.SendPropertyChanged("RegisterDate");
+					this.OnRegisterDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Major", DbType="NVarChar(50)")]
+		public string Major
+		{
+			get
+			{
+				return this._Major;
+			}
+			set
+			{
+				if ((this._Major != value))
+				{
+					this.OnMajorChanging(value);
+					this.SendPropertyChanging();
+					this._Major = value;
+					this.SendPropertyChanged("Major");
+					this.OnMajorChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ValidityDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ValidityDate
+		{
+			get
+			{
+				return this._ValidityDate;
+			}
+			set
+			{
+				if ((this._ValidityDate != value))
+				{
+					this.OnValidityDateChanging(value);
+					this.SendPropertyChanging();
+					this._ValidityDate = value;
+					this.SendPropertyChanged("ValidityDate");
+					this.OnValidityDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(2000)")]
+		public string Url
+		{
+			get
+			{
+				return this._Url;
+			}
+			set
+			{
+				if ((this._Url != value))
+				{
+					this.OnUrlChanging(value);
+					this.SendPropertyChanging();
+					this._Url = value;
+					this.SendPropertyChanged("Url");
+					this.OnUrlChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonTrain")]
 	public partial class Person_PersonTrain : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -137363,8 +138494,6 @@ namespace Model
 		
 		private System.Nullable<int> _Status;
 		
-		private string _ContactUnitOfPartyA;
-		
 		private string _ContactPersonOfPartyA;
 		
 		private string _ContactPersonOfPartyB;
@@ -137389,6 +138518,8 @@ namespace Model
 		
 		private System.Nullable<int> _IsItACentralizedPurchaseSupplier;
 		
+		private string _ContactUnitOfPartyA;
+		
 		private string _Clause;
 		
 		private string _MainContent;
@@ -137475,8 +138606,6 @@ namespace Model
     partial void OnCreateDateChanged();
     partial void OnStatusChanging(System.Nullable<int> value);
     partial void OnStatusChanged();
-    partial void OnContactUnitOfPartyAChanging(string value);
-    partial void OnContactUnitOfPartyAChanged();
     partial void OnContactPersonOfPartyAChanging(string value);
     partial void OnContactPersonOfPartyAChanged();
     partial void OnContactPersonOfPartyBChanging(string value);
@@ -137501,6 +138630,8 @@ namespace Model
     partial void OnSubcontractingMethodChanged();
     partial void OnIsItACentralizedPurchaseSupplierChanging(System.Nullable<int> value);
     partial void OnIsItACentralizedPurchaseSupplierChanged();
+    partial void OnContactUnitOfPartyAChanging(string value);
+    partial void OnContactUnitOfPartyAChanged();
     partial void OnClauseChanging(string value);
     partial void OnClauseChanged();
     partial void OnMainContentChanging(string value);
@@ -138228,26 +139359,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")]
-		public string ContactUnitOfPartyA
-		{
-			get
-			{
-				return this._ContactUnitOfPartyA;
-			}
-			set
-			{
-				if ((this._ContactUnitOfPartyA != value))
-				{
-					this.OnContactUnitOfPartyAChanging(value);
-					this.SendPropertyChanging();
-					this._ContactUnitOfPartyA = value;
-					this.SendPropertyChanged("ContactUnitOfPartyA");
-					this.OnContactUnitOfPartyAChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonOfPartyA", DbType="VarChar(50)")]
 		public string ContactPersonOfPartyA
 		{
@@ -138488,6 +139599,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")]
+		public string ContactUnitOfPartyA
+		{
+			get
+			{
+				return this._ContactUnitOfPartyA;
+			}
+			set
+			{
+				if ((this._ContactUnitOfPartyA != value))
+				{
+					this.OnContactUnitOfPartyAChanging(value);
+					this.SendPropertyChanging();
+					this._ContactUnitOfPartyA = value;
+					this.SendPropertyChanged("ContactUnitOfPartyA");
+					this.OnContactUnitOfPartyAChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(1000)")]
 		public string Clause
 		{
@@ -179944,6 +181075,8 @@ namespace Model
 		
 		private EntityRef<WBS_UnitWork> _WBS_UnitWork;
 		
+		private EntityRef<WBS_WorkPackage> _WBS_WorkPackage;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -179977,6 +181110,7 @@ namespace Model
 			this._Base_Unit = default(EntityRef<Base_Unit>);
 			this._Solution_LargerHazardList = default(EntityRef<Solution_LargerHazardList>);
 			this._WBS_UnitWork = default(EntityRef<WBS_UnitWork>);
+			this._WBS_WorkPackage = default(EntityRef<WBS_WorkPackage>);
 			OnCreated();
 		}
 		
@@ -180079,6 +181213,10 @@ namespace Model
 			{
 				if ((this._WorkPackageId != value))
 				{
+					if (this._WBS_WorkPackage.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
 					this.OnWorkPackageIdChanging(value);
 					this.SendPropertyChanging();
 					this._WorkPackageId = value;
@@ -180314,6 +181452,40 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)]
+		public WBS_WorkPackage WBS_WorkPackage
+		{
+			get
+			{
+				return this._WBS_WorkPackage.Entity;
+			}
+			set
+			{
+				WBS_WorkPackage previousValue = this._WBS_WorkPackage.Entity;
+				if (((previousValue != value) 
+							|| (this._WBS_WorkPackage.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._WBS_WorkPackage.Entity = null;
+						previousValue.Solution_LargerHazardListItem.Remove(this);
+					}
+					this._WBS_WorkPackage.Entity = value;
+					if ((value != null))
+					{
+						value.Solution_LargerHazardListItem.Add(this);
+						this._WorkPackageId = value.WorkPackageId;
+					}
+					else
+					{
+						this._WorkPackageId = default(string);
+					}
+					this.SendPropertyChanged("WBS_WorkPackage");
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -202801,7 +203973,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -207242,7 +208414,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -209972,7 +211144,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -210871,7 +212043,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -211248,7 +212420,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -211441,7 +212613,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -211674,7 +212846,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -212504,7 +213676,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -213489,7 +214661,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -215675,7 +216847,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -220467,7 +221639,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -221097,7 +222269,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -221792,7 +222964,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -222375,7 +223547,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")]
 		public string PipelineCode
 		{
 			get
@@ -231648,6 +232820,8 @@ namespace Model
 		
 		private System.Nullable<decimal> _Costs;
 		
+		private EntitySet<Solution_LargerHazardListItem> _Solution_LargerHazardListItem;
+		
 		private EntitySet<WBS_ControlItemAndCycle> _WBS_ControlItemAndCycle;
 		
 		private EntityRef<WBS_UnitWork> _WBS_UnitWork;
@@ -231694,6 +232868,7 @@ namespace Model
 		
 		public WBS_WorkPackage()
 		{
+			this._Solution_LargerHazardListItem = new EntitySet<Solution_LargerHazardListItem>(new Action<Solution_LargerHazardListItem>(this.attach_Solution_LargerHazardListItem), new Action<Solution_LargerHazardListItem>(this.detach_Solution_LargerHazardListItem));
 			this._WBS_ControlItemAndCycle = new EntitySet<WBS_ControlItemAndCycle>(new Action<WBS_ControlItemAndCycle>(this.attach_WBS_ControlItemAndCycle), new Action<WBS_ControlItemAndCycle>(this.detach_WBS_ControlItemAndCycle));
 			this._WBS_UnitWork = default(EntityRef<WBS_UnitWork>);
 			OnCreated();
@@ -232043,6 +233218,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_Solution_LargerHazardListItem", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")]
+		public EntitySet<Solution_LargerHazardListItem> Solution_LargerHazardListItem
+		{
+			get
+			{
+				return this._Solution_LargerHazardListItem;
+			}
+			set
+			{
+				this._Solution_LargerHazardListItem.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_ControlItemAndCycle", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")]
 		public EntitySet<WBS_ControlItemAndCycle> WBS_ControlItemAndCycle
 		{
@@ -232110,6 +233298,18 @@ namespace Model
 			}
 		}
 		
+		private void attach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.WBS_WorkPackage = this;
+		}
+		
+		private void detach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.WBS_WorkPackage = null;
+		}
+		
 		private void attach_WBS_ControlItemAndCycle(WBS_ControlItemAndCycle entity)
 		{
 			this.SendPropertyChanging();