From bb4969983f731da1f5c4279a14279182954a7338 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 16 Oct 2025 18:18:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E7=AE=A1=E9=81=93=E8=AF=95=E5=8E=8B=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/ProjectData/UnitWorkService.cs       |  10 +
 .../App_GlobalResources/Lan.resx              |   3 +
 .../App_GlobalResources/Lan1.designer.cs      |   9 +
 .../ProcessControl/TestPackageManagement.aspx |   6 +
 .../TestPackageManagement.aspx.cs             |  13 +
 .../TestPackageManagement.aspx.designer.cs    |  62 ++-
 .../TestPackageManagementDataIn.aspx          |  68 +++
 .../TestPackageManagementDataIn.aspx.cs       | 431 ++++++++++++++++++
 ...stPackageManagementDataIn.aspx.designer.cs | 125 +++++
 .../Excel/DataIn/管道试压包管理导入模板.xls   | Bin 0 -> 18944 bytes
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   8 +
 SGGL/FineUIPro.Web/common/mainProject2.aspx   |   4 +-
 12 files changed, 716 insertions(+), 23 deletions(-)
 create mode 100644 SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx
 create mode 100644 SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls

diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs
index 8e681db9..884d35cc 100644
--- a/SGGL/BLL/ProjectData/UnitWorkService.cs
+++ b/SGGL/BLL/ProjectData/UnitWorkService.cs
@@ -192,6 +192,16 @@ namespace BLL
             return (from x in Funs.DB.WBS_UnitWork where x.UnitWorkCode == UnitWorkCode select x).ToList();
         }
 
+        /// <summary>
+        /// 根据项目Id获取单位工程信息
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.WBS_UnitWork> GetUnitWorkByProjectId(string projectId)
+        {
+            return (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId select x).ToList();
+        }
+
         /// <summary>
         /// 下拉框选择(获取 text value)
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
index a1feb729..99ef4fc0 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
@@ -416,6 +416,9 @@
   </data>
 	<data name="ApprovalCompleted" xml:space="preserve">
     <value>审批完成</value>
+  </data>
+	<data name="ApprovalCompletedUnderConstruction" xml:space="preserve">
+    <value>已审待施工</value>
   </data>
 	<data name="call" xml:space="preserve">
     <value>呼叫</value>
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
index 94b02e68..8126a68e 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
@@ -105,6 +105,15 @@ namespace Resources {
             }
         }
         
+        /// <summary>
+        ///   查找类似 已审待施工 的本地化字符串。
+        /// </summary>
+        internal static string ApprovalCompletedUnderConstruction {
+            get {
+                return ResourceManager.GetString("ApprovalCompletedUnderConstruction", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 材料到货 的本地化字符串。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx
index a862f219..75b65a56 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx
@@ -35,6 +35,8 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="增加" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
+                                </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
@@ -91,6 +93,10 @@
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="800px" Height="500px">
         </f:Window>
+        <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="700px" Height="560px">
+        </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs
index a6ba357b..20a4dff6 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs
@@ -197,6 +197,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
                     this.btnNew.Hidden = false;
+                    this.btnImport.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
@@ -215,6 +216,18 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         }
         #endregion
 
+        #region 导入
+        /// <summary>
+        /// 导入按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("TestPackageManagementDataIn.aspx", "导入 - ")));
+        }
+        #endregion
+
         #region 导出按钮
         /// 导出按钮
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.designer.cs
index a7a0352c..c234b447 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ProcessControl {
-    
-    
-    public partial class TestPackageManagement {
-        
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+
+
+    public partial class TestPackageManagement
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// drpUnitWork 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitWork;
-        
+
         /// <summary>
         /// drpCompletedState 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCompletedState;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +94,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +148,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx
new file mode 100644
index 00000000..3bf3ff2c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx
@@ -0,0 +1,68 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TestPackageManagementDataIn.aspx.cs" Inherits="FineUIPro.Web.CQMS.ProcessControl.TestPackageManagementDataIn" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdFileName" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1" Text="审核"
+                            OnClick="btnAudit_Click">
+                        </f:Button>
+                        <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Text="导入"
+                            OnClick="btnImport_Click">
+                        </f:Button>
+                        <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" OnClick="btnDownLoad_Click" Text="下载模板">
+                        </f:Button>
+                        <f:HiddenField ID="hdCheckResult" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
+                            LabelWidth="150px">
+                        </f:FileUpload>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="管道试压包管理" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:BoundField DataField="Row" HeaderText="错误行号">
+                                </f:BoundField>
+                                <f:BoundField DataField="Column" HeaderText="错误列">
+                                </f:BoundField>
+                                <f:BoundField DataField="Reason" HeaderText="错误类型">
+                                </f:BoundField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs
new file mode 100644
index 00000000..9e0fbdb7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs
@@ -0,0 +1,431 @@
+using BLL;
+using FineUIPro.Web.DataShow;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.OleDb;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+    public partial class TestPackageManagementDataIn : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 上传预设的虚拟路径
+        /// </summary>
+        private string initPath = Const.ExcelUrl;
+
+
+        /// <summary>
+        /// 错误集合
+        /// </summary>
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.hdCheckResult.Text = string.Empty;
+                this.hdFileName.Text = string.Empty;
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+            }
+        }
+        #endregion
+
+        #region 审核
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.fuAttachUrl.HasFile == false)
+                {
+                    ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls")
+                {
+                    ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + initPath;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+
+                this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                string filePath = initFullPath + this.hdFileName.Text;
+                this.fuAttachUrl.PostedFile.SaveAs(filePath);
+                ImportXlsToData(rootPath + initPath + this.hdFileName.Text);
+            }
+            catch (Exception ex)
+            {
+                ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region 读Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties='Excel 8.0;HDR=Yes;IMEX=1;'";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL(ds.Tables[0], 8);
+                hdCheckResult.Text = "1";
+            }
+            catch (Exception exc)
+            {
+                Response.Write(exc);
+                //return null;
+                // return dt;
+            }
+            finally
+            {
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集行数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL(DataTable pds, int Cols)
+        {
+            string result = string.Empty;
+            errorInfos.Clear();
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                return false;
+            }
+
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                var unitWorks = UnitWorkService.GetUnitWorkByProjectId(this.CurrUser.LoginProjectId);
+                for (int i = 0; i < ir; i++)
+                {
+                    string code = pds.Rows[i][0].ToString();
+                    string unitWorkName = pds.Rows[i][1].ToString().Trim();
+                    string testMedium = pds.Rows[i][2].ToString();
+                    string testPressure = pds.Rows[i][3].ToString();
+                    string planTestDate = pds.Rows[i][4].ToString();
+                    string completedDate = pds.Rows[i][5].ToString();
+                    string completedState = pds.Rows[i][6].ToString();
+                    string remark = pds.Rows[i][7].ToString();
+
+                    if (string.IsNullOrEmpty(code))
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "试压包编号", Reason = "此项为必填项！" });
+                    }
+                    if (!string.IsNullOrEmpty(unitWorkName))
+                    {
+                        var isExistUnitWork = unitWorks.Where(x => x.UnitWorkName == unitWorkName);
+                        if (!isExistUnitWork.Any())
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "单位工程名称", Reason = $"不存在{unitWorkName}！" });
+                        }
+                    }
+                    else
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "单位工程名称", Reason = "此项为必填项！" });
+                    }
+                    if (!string.IsNullOrWhiteSpace(planTestDate))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(planTestDate);
+                        }
+                        catch (Exception)
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "计划试验日期", Reason = "不是日期格式！" });
+                        }
+                    }
+                    else
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "计划试验日期", Reason = "此项为必填项！" });
+                    }
+                    if (!string.IsNullOrWhiteSpace(completedDate))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(completedDate);
+                        }
+                        catch (Exception)
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "试验完成日期", Reason = "不是日期格式！" });
+                        }
+                    }
+                    else
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = i.ToString(), Column = "试验完成日期", Reason = "此项为必填项！" });
+                    }
+                    if (!string.IsNullOrWhiteSpace(completedState))
+                    {
+                        if (completedState != "已完成" && completedState != "未完成")
+                        {
+                            errorInfos.Add(new ErrorInfo { Row = i.ToString(), Column = "完成状态", Reason = $"不存在{completedState}！" });
+                        }
+                    }
+                    else
+                    {
+                        errorInfos.Add(new ErrorInfo { Row = i.ToString(), Column = "完成状态", Reason = "此项为必填项！" });
+                    }
+                }
+
+                if (errorInfos.Count > 0)
+                {
+                    this.gvErrorInfo.DataSource = errorInfos;
+                    this.gvErrorInfo.DataBind();
+                }
+                else
+                {
+                    ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 导入
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(hdCheckResult.Text))
+            {
+                if (errorInfos.Count <= 0)
+                {
+                    string rootPath = Server.MapPath("~/");
+                    ImportXlsToData2(rootPath + initPath + this.hdFileName.Text);
+                    hdCheckResult.Text = string.Empty;
+                    ShowNotify("导入成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
+                    ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData2(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties='Excel 8.0;HDR=Yes;IMEX=1;'";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL2(ds.Tables[0], 8);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集列数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL2(DataTable pds, int Cols)
+        {
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+            }
+            string result = string.Empty;
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                var unitWorks = UnitWorkService.GetUnitWorkByProjectId(this.CurrUser.LoginProjectId);
+                List<Model.ProcessControl_TestPackageManagement> list = new List<Model.ProcessControl_TestPackageManagement>();
+                for (int i = 0; i < ir; i++)
+                {
+                    string code = pds.Rows[i][0].ToString();
+                    string unitWorkName = pds.Rows[i][1].ToString().Trim();
+                    string testMedium = pds.Rows[i][2].ToString();
+                    string testPressure = pds.Rows[i][3].ToString();
+                    string planTestDate = pds.Rows[i][4].ToString();
+                    string completedDate = pds.Rows[i][5].ToString();
+                    string completedState = pds.Rows[i][6].ToString();
+                    string remark = pds.Rows[i][7].ToString();
+
+                    Model.ProcessControl_TestPackageManagement model = new Model.ProcessControl_TestPackageManagement();
+                    model.TestPackageManagementId = SQLHelper.GetNewID(typeof(Model.ProcessControl_TestPackageManagement));
+                    model.ProjectId = this.CurrUser.LoginProjectId;
+
+                    model.TestPackageManagementCode = code;
+                    model.UnitWorkId = unitWorks.Where(x => x.UnitWorkName == unitWorkName).FirstOrDefault().UnitWorkId;
+                    model.TestMedium = testMedium.Trim();
+                    model.TestPressure = testPressure.Trim();
+                    model.PlanTestDate = Convert.ToDateTime(planTestDate);
+                    model.CompletedDate = Convert.ToDateTime(completedDate);
+                    model.CompletedState = completedState == "已完成" ? "1" : "2";
+                    model.Remark = remark;
+                    list.Add(model);
+                }
+                if (list.Count > 0)
+                {
+                    Funs.DB.ProcessControl_TestPackageManagement.InsertAllOnSubmit(list);
+                    Funs.DB.SubmitChanges();
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 下载模板
+        /// <summary>
+        /// 下载模板按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDownLoad_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + "File\\Excel\\DataIn\\管道试压包管理导入模板.xls";
+                string filePath = "File\\Excel\\DataIn\\管道试压包管理导入模板.xls";
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.designer.cs
new file mode 100644
index 00000000..184ebe22
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.designer.cs
@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+
+
+    public partial class TestPackageManagementDataIn
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// hdFileName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdFileName;
+
+        /// <summary>
+        /// btnAudit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit;
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
+        /// <summary>
+        /// btnDownLoad 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoad;
+
+        /// <summary>
+        /// hdCheckResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckResult;
+
+        /// <summary>
+        /// fuAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload fuAttachUrl;
+
+        /// <summary>
+        /// gvErrorInfo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvErrorInfo;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls
new file mode 100644
index 0000000000000000000000000000000000000000..d0d5edf32ef595250c6e33c3648034bbf6eece09
GIT binary patch
literal 18944
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
DIDEg|

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index a5878805..d6efab7a 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -635,6 +635,7 @@
     <Content Include="CQMS\ProcessControl\NondestructiveTestEdit.aspx" />
     <Content Include="CQMS\ProcessControl\NondestructiveTest_New.aspx" />
     <Content Include="CQMS\ProcessControl\NondestructiveTest_NewEdit.aspx" />
+    <Content Include="CQMS\ProcessControl\TestPackageManagementDataIn.aspx" />
     <Content Include="CQMS\ProcessControl\ShowUnitWork.aspx" />
     <Content Include="CQMS\ProcessControl\TestPackageManagement.aspx" />
     <Content Include="CQMS\ProcessControl\TestPackageManagementEdit.aspx" />
@@ -8925,6 +8926,13 @@
     <Compile Include="CQMS\ProcessControl\NondestructiveTest_NewEdit.aspx.designer.cs">
       <DependentUpon>NondestructiveTest_NewEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\ProcessControl\TestPackageManagementDataIn.aspx.cs">
+      <DependentUpon>TestPackageManagementDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ProcessControl\TestPackageManagementDataIn.aspx.designer.cs">
+      <DependentUpon>TestPackageManagementDataIn.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\ProcessControl\ShowUnitWork.aspx.cs">
       <DependentUpon>ShowUnitWork.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx
index 54d0d10e..bba3779c 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx
@@ -109,7 +109,7 @@
                                     <span></span>
                                     <div class="inner-box">
                                         <div style="font-size: .14rem;color: #DADADA;width:40px">
-                                            <asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompleted %>" />
+                                            <asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompletedUnderConstruction %>" />
                                         </div>
                                         <div style="font-size: .25rem;color: #FEB185;"><%=CompletedNum %></div>
                                     </div>
@@ -150,7 +150,7 @@
                                     <span></span>
                                     <div class="inner-box">
                                         <div style="font-size: .14rem;color: #DADADA; width:40px">
-                                            <asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompleted %>" />
+                                            <asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompletedUnderConstruction %>" />
                                         </div>
                                         <div style="font-size: .25rem;color: #FEB185;"><%=SuperCompletedNum %></div>
                                     </div>