diff --git a/DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql b/DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql
new file mode 100644
index 00000000..be7141eb
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-09-24 lpf.sql	
@@ -0,0 +1 @@
+alter table HJGL_Pipeline_Component add DrawingName varchar(100)
\ No newline at end of file
diff --git a/SGGL/BLL/HJGL/DataImport/DataImportService.cs b/SGGL/BLL/HJGL/DataImport/DataImportService.cs
index 85b805ac..d3ad796c 100644
--- a/SGGL/BLL/HJGL/DataImport/DataImportService.cs
+++ b/SGGL/BLL/HJGL/DataImport/DataImportService.cs
@@ -51,6 +51,31 @@ namespace BLL
                      ).OrderByDescending(x => x.Version).FirstOrDefault();
             return q;
         }
+        public static string  ConvertFileType(object ImportType)
+        {
+            string TypeName=string.Empty;
+            if (ImportType != null)
+            {
+                switch (ImportType.ToString ())
+                {
+                    case "0":
+                        TypeName = "ISO轴测图";
+                        break;
+                    case "1":
+                        TypeName = "三维模型";
+                        break;
+                    case "2":
+                        TypeName = "属性文件";
+                        break;
+                    case "3":
+                        TypeName = "管道预制加工图";
+                        break;
+                }
+
+            }
+            return TypeName;
+        
+        }
         public static List<decimal?> GetListVersionByUnitWorkId(string UnitWorkId)
         {
             //decimal a = 0.1M;
diff --git a/SGGL/FineUIPro.Web/Controls/Fastreport.aspx b/SGGL/FineUIPro.Web/Controls/Fastreport.aspx
index 510dde4b..29cb5a29 100644
--- a/SGGL/FineUIPro.Web/Controls/Fastreport.aspx
+++ b/SGGL/FineUIPro.Web/Controls/Fastreport.aspx
@@ -13,7 +13,6 @@
         <div>
         </div>
         <cc2:WebReport ID="WebReport1" runat="server" Width="1000" Height="600" ReportResourceString="77u/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxSZXBvcnQgU2NyaXB0TGFuZ3VhZ2U9IkNTaGFycCIgUmVwb3J0SW5mby5DcmVhdGVkPSIxMS8wOS8yMDE1IDEyOjU1OjEyIiBSZXBvcnRJbmZvLk1vZGlmaWVkPSIxMS8wOS8yMDE1IDE1OjAzOjI1IiBSZXBvcnRJbmZvLkNyZWF0b3JWZXJzaW9uPSIyMDE1LjQuNC4wIj4NCiAgPERpY3Rpb25hcnkvPg0KICA8UmVwb3J0UGFnZSBOYW1lPSJQYWdlMSI+DQogICAgPFJlcG9ydFRpdGxlQmFuZCBOYW1lPSJSZXBvcnRUaXRsZTEiIFdpZHRoPSI3MTguMiIgSGVpZ2h0PSIzNy44Ij4NCiAgICAgIDxUZXh0T2JqZWN0IE5hbWU9IlRleHQxIiBMZWZ0PSIxNzkuNTUiIFRvcD0iOS40NSIgV2lkdGg9IjE4OSIgSGVpZ2h0PSIxOC45IiBUZXh0PSJbRGF0ZV0iLz4NCiAgICA8L1JlcG9ydFRpdGxlQmFuZD4NCiAgICA8UGFnZUhlYWRlckJhbmQgTmFtZT0iUGFnZUhlYWRlcjEiIFRvcD0iNDEuOCIgV2lkdGg9IjcxOC4yIiBIZWlnaHQ9IjI4LjM1Ii8+DQogICAgPERhdGFCYW5kIE5hbWU9IkRhdGExIiBUb3A9Ijc0LjE1IiBXaWR0aD0iNzE4LjIiIEhlaWdodD0iNzUuNiIvPg0KICAgIDxQYWdlRm9vdGVyQmFuZCBOYW1lPSJQYWdlRm9vdGVyMSIgVG9wPSIxNTMuNzUiIFdpZHRoPSI3MTguMiIgSGVpZ2h0PSIxOC45Ii8+DQogIDwvUmVwb3J0UGFnZT4NCjwvUmVwb3J0Pg0K" />
-
     </form>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 39f7ac69..3b3a0a0a 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -135,3 +135,146 @@ IP地址:::1
 
 出错时间:09/13/2022 10:46:27
 
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。
+错误堆栈:
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath)
+   在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder)
+   在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider)
+出错时间:09/22/2022 00:35:36
+出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx
+IP地址:::1
+
+出错时间:09/22/2022 00:35:36
+
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。
+错误堆栈:
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath)
+   在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder)
+   在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider)
+出错时间:09/22/2022 00:35:41
+出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx
+IP地址:::1
+
+出错时间:09/22/2022 00:35:41
+
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。
+错误堆栈:
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath)
+   在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder)
+   在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider)
+出错时间:09/22/2022 00:36:29
+出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx
+IP地址:::1
+
+出错时间:09/22/2022 00:36:29
+
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:基类包括字段“WebReport1”，但其类型(FastReport.Web.WebReport)与控件(FastReport.Web.WebReport)的类型不兼容。
+错误堆栈:
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath)
+   在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder)
+   在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider)
+出错时间:09/22/2022 00:36:58
+出错文件:http://localhost:8008/Controls/Fastreport.aspx?ReportPath=D:%5C%E8%AF%BA%E5%BF%85%E8%BE%BE%5C%E8%B5%9B%E9%BC%8E%5CSGGL_SeDin_new%5CSGGL%5CFineUIPro.Web%5CFile%5CFastreport%5C%E7%BB%84%E4%BB%B6%E6%89%93%E5%8D%B0.frx
+IP地址:::1
+
+出错时间:09/22/2022 00:36:58
+
+
+错误信息开始=====>
+错误类型:ArgumentNullException
+错误信息:路径不能为 null。
+参数名: path
+错误堆栈:
+   在 System.IO.FileStream.Init(String path, FileMode mode, FileAccess access, Int32 rights, Boolean useRights, FileShare share, Int32 bufferSize, FileOptions options, SECURITY_ATTRIBUTES secAttrs, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost)
+   在 System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share)
+   在 FastReport.Report.Load(String fileName)
+   在 FineUIPro.Web.Controls.Fastreport.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\Controls\Fastreport.aspx.cs:行号 54
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/22/2022 00:43:55
+出错文件:http://localhost:8008/Controls/Fastreport.aspx
+IP地址:::1
+
+出错时间:09/22/2022 00:43:55
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.HJGL.PreDesign.PrePipeline.btnImportQRCode_Click(Object sender, EventArgs e)
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/22/2022 00:46:14
+出错文件:http://localhost:8008/HJGL/PreDesign/PrePipeline.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/22/2022 00:46:14
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.HJGL.PreDesign.PrePipeline.btnImportQRCode_Click(Object sender, EventArgs e)
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/22/2022 00:46:21
+出错文件:http://localhost:8008/HJGL/PreDesign/PrePipeline.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/22/2022 00:46:21
+
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/组件管理二维码信息导入.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/组件管理二维码信息导入.xlsx
index 8364220b..ec2e63a9 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/组件管理二维码信息导入.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/组件管理二维码信息导入.xlsx differ
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
index be88dbf6..0aa27f8e 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="08/23/2022 10:49:51" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="09/22/2022 00:44:07" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRG/27P7L9MSYYZ37vaRYsb+"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGDdJIxGBPkhSIXgks1WU3X"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="PrefabricatedComponents" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="PlanStartDate" DataType="System.String" PropName="CH_TrustMan"/>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 91482771..c5778153 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -75,19 +75,19 @@
     </Reference>
     <Reference Include="FastReport, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ChengDa\sggl_cd\SGGL\FineUIPro.Web\bin\FastReport.dll</HintPath>
+      <HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.dll</HintPath>
     </Reference>
     <Reference Include="FastReport.Bars, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Development\DepCode\reference-bll\Reference BLL\FastReport.Bars.dll</HintPath>
+      <HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.Bars.dll</HintPath>
     </Reference>
     <Reference Include="FastReport.Editor, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Development\DepCode\reference-bll\Reference BLL\FastReport.Editor.dll</HintPath>
+      <HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.Editor.dll</HintPath>
     </Reference>
     <Reference Include="FastReport.Web, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ChengDa\sggl_cd\SGGL\FineUIPro.Web\bin\FastReport.Web.dll</HintPath>
+      <HintPath>C:\Users\1420031550\Desktop\fastreport\FastReport.Web.dll</HintPath>
     </Reference>
     <Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
index 1f57eda8..ac4ee185 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
@@ -53,10 +53,17 @@
                                                 <f:TextBox runat="server" Label="文件名称" ID="txtfilename" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
                                                     LabelAlign="right">
                                                 </f:TextBox>
+                                                <f:DropDownList runat="server" ID="DropImportType" Label="文件类别" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
+                                                    <f:ListItem Text="ISO轴测图" Value="0" />
+                                                    <f:ListItem Text="管道预制加工图" Value="3" />
+                                                </f:DropDownList>
                                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                                 <f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" OnClick="btnQuery_Click" Text="查询" Hidden="true">
                                                 </f:Button>
-                                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" OnClick="btnNew_Click" Hidden="true"
+                                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" Text="新增" OnClick="btnNew_Click" Hidden="true"
+                                                    EnablePostBack="true" runat="server">
+                                                </f:Button>
+                                                <f:Button ID="btnDelete" ToolTip="删除" Icon="Delete" Text="删除" OnClick="btnMenuDelete_Click" Hidden="true"
                                                     EnablePostBack="true" runat="server">
                                                 </f:Button>
                                             </Items>
@@ -70,16 +77,22 @@
                                             Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
                                         <f:RenderField HeaderText="名称" ColumnID="FileName"
                                             DataField="FileName" SortField="FileName" FieldType="String" HeaderTextAlign="Center"
-                                            TextAlign="Left" Width="200px">
+                                            TextAlign="Left" Width="150px">
                                         </f:RenderField>
                                         <f:RenderField HeaderText="版本" ColumnID="Version"
                                             DataField="Version" SortField="Version" FieldType="String" HeaderTextAlign="Center"
                                             TextAlign="Left" Width="70px">
                                         </f:RenderField>
-                                        <f:RenderField HeaderText="类型" ColumnID="FileType"
+                                        <f:RenderField HeaderText="格式" ColumnID="FileType"
                                             DataField="FileType" SortField="FileType" FieldType="String" HeaderTextAlign="Center"
-                                            TextAlign="Left" Width="90px">
+                                            TextAlign="Left" Width="70px">
                                         </f:RenderField>
+                                        <f:TemplateField Width="90px" HeaderText="类型" HeaderTextAlign="Center"
+                                            TextAlign="Center" SortField="ImportType">
+                                            <ItemTemplate>
+                                                <asp:Label ID="Label1" runat="server" Text='<%# BLL.HJGL_DataImportService.ConvertFileType(Eval("ImportType")) %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
                                         <f:RenderField Width="90px" ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String"
                                             HeaderText="专业" HeaderTextAlign="Center" TextAlign="Right">
                                         </f:RenderField>
@@ -95,6 +108,9 @@
                                             DataField="CreateDate" SortField="CreateDate" FieldType="String" HeaderTextAlign="Center"
                                             TextAlign="Left" Width="90px">
                                         </f:RenderField>
+                                        <f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" FieldType="String"
+                                            HeaderText="更新原因" HeaderTextAlign="Center" TextAlign="Right">
+                                        </f:RenderField>
                                     </Columns>
                                     <PageItems>
                                         <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs
index 53612203..659e38fe 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs
@@ -17,6 +17,8 @@ namespace FineUIPro.Web.HJGL.DataImport
 
                 //this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 this.InitTreeMenu();//加载树
+                Funs.FineUIPleaseSelect(DropImportType);
+
                 GetButtonPower();
             }
         }
@@ -123,11 +125,13 @@ namespace FineUIPro.Web.HJGL.DataImport
             if (tvControlItem.SelectedNodeID == "1" || tvControlItem.SelectedNodeID == "2")
             {
                 this.btnNew.Hidden = true;
+                this.btnDelete.Hidden = true;
                 this.btnSearch.Hidden = true;
             }
             else
             {
                 this.btnNew.Hidden = false;
+                this.btnDelete.Hidden = false;
                 this.btnSearch.Hidden = false;
 
 
@@ -150,7 +154,7 @@ namespace FineUIPro.Web.HJGL.DataImport
                              from ( select * from HJGL_DataImport  a where not exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version<b.Version )) as  Import 
                              left join Base_DesignProfessional as Design on Design.DesignProfessionalId=Import.DesignProfessionalId
                              left join Person_Persons as Users on Users.PersonId=Import.CreateMan
-                             where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.ImportType='0'";
+                             where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.ImportType in ('0','3') ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
@@ -159,6 +163,11 @@ namespace FineUIPro.Web.HJGL.DataImport
                 strSql += " AND Import.FileName LIKE @FileName";
                 listStr.Add(new SqlParameter("@FileName", "%" + this.txtfilename.Text.Trim() + "%"));
             }
+            if (DropImportType.SelectedValue != Const._Null)
+            {
+                strSql += " AND Import.ImportType=@ImportType";
+                listStr.Add(new SqlParameter("@ImportType", DropImportType.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             // 2.获取当前分页数据
@@ -175,7 +184,7 @@ namespace FineUIPro.Web.HJGL.DataImport
                              from ( select * from HJGL_DataImport  a where  exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version<b.Version )) as  Import 
                              left join Base_DesignProfessional as Design on Design.DesignProfessionalId=Import.DesignProfessionalId
                              left join Person_Persons as Users on Users.PersonId=Import.CreateMan
-                             where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.FileName=@FileName and Import.ImportType='0'";
+                             where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.FileName=@FileName and Import.ImportType in ('0','3')";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.designer.cs
index 2f911897..4c081816 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.designer.cs
@@ -122,6 +122,15 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.TextBox txtfilename;
 
+        /// <summary>
+        /// DropImportType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropImportType;
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -140,6 +149,24 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDelete;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
         /// <summary>
         /// ToolbarSeparator2 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx
index ba19648a..30bb0382 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx
@@ -17,7 +17,8 @@
                 <f:FormRow>
                     <Items>
                         <f:DropDownList runat="server" ID="DropImportType" Label="文件类别" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
-                            <f:ListItem Text="图纸" Value="0" />    
+                            <f:ListItem Text="ISO轴测图" Value="0" />    
+                            <f:ListItem Text="管道预制加工图" Value="3" />    
                         </f:DropDownList>
                         <f:DropDownList ID="DropDesignProfessional" runat="server" Label="专业" ShowRedStar="true" AutoSelectFirstItem="true" LabelAlign="Right" AutoPostBack="true" LabelWidth="140px"></f:DropDownList>
                     </Items>
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
index 40dd942f..ef3bb3b0 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
@@ -45,7 +45,7 @@
                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
                                     AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
                                     AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
-                                    EnableCheckBoxSelect="true" EnableMultiSelect="false" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick"
+                                    EnableCheckBoxSelect="true" EnableMultiSelect="true"  EnableRowClickEvent="true" OnRowClick="Grid1_RowClick"
                                     AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
                                     <Toolbars>
                                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="right">
@@ -53,10 +53,17 @@
                                                 <f:TextBox runat="server" Label="文件名称" ID="txtfilename" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
                                                     LabelAlign="right">
                                                 </f:TextBox>
+                                                <f:DropDownList runat="server" ID="DropImportType" Label="文件类别" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
+                                                    <f:ListItem Text="三维模型" Value="1" />
+                                                    <f:ListItem Text="属性文件" Value="2" />
+                                                </f:DropDownList>
                                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                                 <f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" OnClick="btnQuery_Click" Text="查询" Hidden="true">
                                                 </f:Button>
-                                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" OnClick="btnNew_Click" Hidden="true"
+                                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" Text="新增" OnClick="btnNew_Click" Hidden="true"
+                                                    EnablePostBack="true" runat="server">
+                                                </f:Button>
+                                                <f:Button ID="btnDelete" ToolTip="删除" Icon="Delete" Text="删除" OnClick="btnMenuDelete_Click" Hidden="true"
                                                     EnablePostBack="true" runat="server">
                                                 </f:Button>
                                             </Items>
@@ -70,16 +77,23 @@
                                             Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
                                         <f:RenderField HeaderText="名称" ColumnID="FileName"
                                             DataField="FileName" SortField="FileName" FieldType="String" HeaderTextAlign="Center"
-                                            TextAlign="Left" Width="200px">
+                                            TextAlign="Left" Width="150px">
                                         </f:RenderField>
                                         <f:RenderField HeaderText="版本" ColumnID="Version"
                                             DataField="Version" SortField="Version" FieldType="String" HeaderTextAlign="Center"
                                             TextAlign="Left" Width="70px">
                                         </f:RenderField>
-                                        <f:RenderField HeaderText="类型" ColumnID="FileType"
+                                        <f:RenderField HeaderText="格式" ColumnID="FileType"
                                             DataField="FileType" SortField="FileType" FieldType="String" HeaderTextAlign="Center"
-                                            TextAlign="Left" Width="50px">
+                                            TextAlign="Left" Width="70px">
                                         </f:RenderField>
+                                        <f:TemplateField Width="90px" HeaderText="类型" HeaderTextAlign="Center"
+                                            TextAlign="Center" SortField="ImportType">
+                                            <ItemTemplate>
+                                                <asp:Label ID="Label1" runat="server" Text='<%# BLL.HJGL_DataImportService.ConvertFileType(Eval("ImportType")) %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        
                                         <f:RenderField Width="90px" ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String"
                                             HeaderText="专业" HeaderTextAlign="Center" TextAlign="Right">
                                         </f:RenderField>
@@ -95,6 +109,9 @@
                                             DataField="CreateDate" SortField="CreateDate" FieldType="String" HeaderTextAlign="Center"
                                             TextAlign="Left" Width="90px">
                                         </f:RenderField>
+                                        <f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" FieldType="String"
+                                            HeaderText="更新原因" HeaderTextAlign="Center" TextAlign="Right">
+                                        </f:RenderField>
                                     </Columns>
                                     <PageItems>
                                         <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
index 7e64ba40..8fcd1ba3 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
@@ -17,6 +17,7 @@ namespace FineUIPro.Web.HJGL.DataImport
 
                 //this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 this.InitTreeMenu();//加载树
+                Funs.FineUIPleaseSelect(DropImportType);
                 GetButtonPower();
             }
         }
@@ -122,11 +123,13 @@ namespace FineUIPro.Web.HJGL.DataImport
             if (tvControlItem.SelectedNodeID == "1" || tvControlItem.SelectedNodeID == "2")
             {
                 this.btnNew.Hidden = true;
+                this.btnDelete.Hidden = true;
                 this.btnSearch.Hidden = true;
             }
             else
             {
                 this.btnNew.Hidden = false;
+                this.btnDelete.Hidden = false;
                 this.btnSearch.Hidden = false;
 
 
@@ -158,6 +161,11 @@ namespace FineUIPro.Web.HJGL.DataImport
                 strSql += " AND Import.FileName LIKE @FileName";
                 listStr.Add(new SqlParameter("@FileName", "%" + this.txtfilename.Text.Trim() + "%"));
             }
+            if (DropImportType.SelectedValue !=Const._Null)
+            {
+                strSql += " AND Import.ImportType=@ImportType";
+                listStr.Add(new SqlParameter("@ImportType", DropImportType.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             // 2.获取当前分页数据
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.designer.cs
index c843e2b1..928b530d 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.designer.cs
@@ -122,6 +122,15 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.TextBox txtfilename;
 
+        /// <summary>
+        /// DropImportType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropImportType;
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -140,6 +149,24 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDelete;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
         /// <summary>
         /// ToolbarSeparator2 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
index 0baf50bc..74ab256e 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
@@ -73,7 +73,7 @@
                                         <f:Button ID="btnGetChart" ToolTip="图表" Icon="ChartPie" Text="统计图表"
                                             EnablePostBack="true"  OnClick="btnGetChart_Click" runat="server">
                                         </f:Button>
-                                        <f:Button ID="btnSinglePreview" ToolTip="轴测图" Icon="PageRed" Text="轴测图" 
+                                        <f:Button ID="btnSinglePreview" ToolTip="ISO轴测图" Icon="PageRed" Text="ISO轴测图" 
                                             EnablePostBack="true"   OnClick="btnSinglePreview_Click" runat="server">
                                         </f:Button>
                                         <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Text="导出" Icon="FolderUp"
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
index c0c066f5..b63292a4 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
@@ -127,6 +127,10 @@
             EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
             IsModal="true" Width="1010px" Height="660px">
         </f:Window>
+        <f:Window ID="Window3" Title="附件上传" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
+            IsModal="true" Width="1010px" Height="660px">
+        </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 8b016629..2d75cfc3 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
@@ -420,7 +420,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
 
         protected void btnImportQRCode_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - ")));
+            PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - ")));
 
         }
     }
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
index f3ca0420..49fa477f 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
@@ -229,5 +229,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
+
+        /// <summary>
+        /// Window3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
     }
 }