Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

DataBase/版本日志/SUBQHSE_V2025-08-06-xiaj（IDP试车工作包数据表）.sql

@@ -0,0 +1,157 @@
+
+
+
+--1、试车管道数据补充P&ID图号起止点
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'PreRun_PropertySysPiping' AND COLUMN_NAME = 'DrawingEndNo')
+BEGIN
+	ALTER TABLE PreRun_PropertySysPiping ADD DrawingEndNo varchar(50);
+END
+GO
+
+--IDP试车工作包数据表——管道一览表
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'IDP_PreRunData_Piping') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[IDP_PreRunData_Piping](
+	[ItemId] [varchar](50) NOT NULL,
+	[ProjId] [varchar](50) NULL,
+	[ProjCode] [varchar](50) NULL,
+	[ProjectId] [varchar](50) NULL,
+	[LastTime] [datetime] NOT NULL,
+	[WbsCode] [varchar](50) NULL,
+	[DeviceCode] [varchar](50) NULL,
+	[ProcessesCode] [varchar](50) NULL,
+	[SubjectCode] [varchar](50) NULL,
+	[Category] [varchar](50) NULL,
+	[Tag] [varchar](50) NULL,
+	[PipingCode] [varchar](50) NULL,
+	[Diameter] [varchar](50) NULL,
+	[DiameterUnit] [varchar](50) NULL,
+	[MaterialLevel] [varchar](50) NULL,
+	[AdiabatType] [varchar](50) NULL,
+	[AdiabatThickness] [varchar](50) NULL,
+	[AdiabatThicknessUnit] [varchar](50) NULL,
+	[MediumState] [varchar](50) NULL,
+	[DrawingStartNo] [varchar](50) NULL,
+	[DrawingEndNo] [varchar](50) NULL,
+	[PipingStart] [varchar](500) NULL,
+	[PipingEnd] [varchar](500) NULL,
+	[PipingLevel] [varchar](50) NULL,
+	[NormalTemperature] [varchar](50) NULL,
+	[NormalTemperatureUnit] [varchar](50) NULL,
+	[NormalPressure] [varchar](50) NULL,
+	[NormalPressureUnit] [varchar](50) NULL,
+	[DesignTemperature] [varchar](50) NULL,
+	[DesignTemperatureUnit] [varchar](50) NULL,
+	[DesignPressure] [varchar](50) NULL,
+	[DesignPressureUnit] [varchar](50) NULL,
+	[PaintLevel] [varchar](50) NULL,
+	[Remark] [nvarchar](max) NULL,
+	[DetailInfo] [varchar](max) NULL,
+ CONSTRAINT [PK_IDP_PreRunData_Piping] PRIMARY KEY CLUSTERED 
+(
+	[ItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'ItemId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'五环项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'ProjId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'五环项目Code' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'ProjCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'智慧施工系统项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'ProjectId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'最后异动时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'LastTime'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'详细完整信息' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'DetailInfo'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'装置工序主项码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'WbsCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'装置码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'DeviceCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工序码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'ProcessesCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主项码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Piping', @level2type=N'COLUMN',@level2name=N'SubjectCode'
+END
+GO
+
+--IDP试车工作包数据表——设备一览表
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'IDP_PreRunData_Equipment') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[IDP_PreRunData_Equipment](
+	[ItemId] [varchar](50) NOT NULL,
+	[ProjId] [varchar](50) NULL,
+	[ProjCode] [varchar](50) NULL,
+	[ProjectId] [varchar](50) NULL,
+	[LastTime] [datetime] NOT NULL,
+	[WbsCode] [varchar](50) NULL,
+	[DeviceCode] [varchar](50) NULL,
+	[ProcessesCode] [varchar](50) NULL,
+	[SubjectCode] [varchar](50) NULL,
+	[Category] [varchar](50) NULL,
+	[Tag] [varchar](50) NULL,
+	[TagNumber] [varchar](50) NULL,
+	[NameSpecifications] [varchar](500) NULL,
+	[DrawingNo] [varchar](500) NULL,
+	[Materials] [varchar](200) NULL,
+	[NumOperate] [varchar](50) NULL,
+	[NumStandby] [varchar](50) NULL,
+	[WeightSingle] [varchar](50) NULL,
+	[WeightSingleUnit] [varchar](50) NULL,
+	[WeightTotal] [varchar](50) NULL,
+	[Remark] [nvarchar](max) NULL,
+	[DetailInfo] [varchar](max) NULL,
+ CONSTRAINT [PK_IDP_PreRunData_Equipment] PRIMARY KEY CLUSTERED 
+(
+	[ItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'ItemId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'五环项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'ProjId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'五环项目Code' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'ProjCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'智慧施工系统项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'ProjectId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'最后异动时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'LastTime'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'详细完整信息' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'DetailInfo'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'装置工序主项码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'WbsCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'装置码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'DeviceCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工序码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'ProcessesCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主项码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Equipment', @level2type=N'COLUMN',@level2name=N'SubjectCode'
+END
+GO
+
+--IDP试车工作包数据表——仪表索引表
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'IDP_PreRunData_Instrumentation') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[IDP_PreRunData_Instrumentation](
+	[ItemId] [varchar](50) NOT NULL,
+	[ProjId] [varchar](50) NULL,
+	[ProjCode] [varchar](50) NULL,
+	[ProjectId] [varchar](50) NULL,
+	[LastTime] [datetime] NOT NULL,
+	[WbsCode] [varchar](50) NULL,
+	[DeviceCode] [varchar](50) NULL,
+	[ProcessesCode] [varchar](50) NULL,
+	[SubjectCode] [varchar](50) NULL,
+	[Category] [varchar](50) NULL,
+	[Tag] [varchar](50) NULL,
+	[InstrumentTag] [varchar](50) NULL,
+	[UseTo] [varchar](50) NULL,
+	[InstrumentName] [varchar](50) NULL,
+	[Supplier] [varchar](50) NULL,
+	[InstallationPosition] [varchar](50) NULL,
+	[SignalType] [varchar](50) NULL,
+	[AssociatedSystem] [varchar](50) NULL,
+	[Cp25] [varchar](50) NULL,
+	[In11] [varchar](50) NULL,
+	[In40] [varchar](50) NULL,
+	[Remark] [nvarchar](max) NULL,
+	[DetailInfo] [varchar](max) NULL,
+ CONSTRAINT [PK_IDP_PreRunData_Instrumentation] PRIMARY KEY CLUSTERED 
+(
+	[ItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Instrumentation', @level2type=N'COLUMN',@level2name=N'ItemId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'五环项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Instrumentation', @level2type=N'COLUMN',@level2name=N'ProjId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'五环项目Code' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Instrumentation', @level2type=N'COLUMN',@level2name=N'ProjCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'智慧施工系统项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Instrumentation', @level2type=N'COLUMN',@level2name=N'ProjectId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'最后异动时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Instrumentation', @level2type=N'COLUMN',@level2name=N'LastTime'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'装置工序主项码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Instrumentation', @level2type=N'COLUMN',@level2name=N'WbsCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'装置码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Instrumentation', @level2type=N'COLUMN',@level2name=N'DeviceCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工序码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Instrumentation', @level2type=N'COLUMN',@level2name=N'ProcessesCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主项码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_PreRunData_Instrumentation', @level2type=N'COLUMN',@level2name=N'SubjectCode'
+END
+GO
+
+
+

SGGL/BLL/BLL.csproj

@@ -594,6 +594,7 @@
     <Compile Include="HSSE\Technique\SpecialSchemeService.cs" />
     <Compile Include="HSSE\Technique\Technique_CheckItemDetailService.cs" />
     <Compile Include="HSSE\Technique\Technique_CheckItemSetService.cs" />
+    <Compile Include="IDP\IDPPreRunDataService.cs" />
     <Compile Include="IDP\IDPDataService.cs" />
     <Compile Include="JDGL\Check\ElectricalCompletionService.cs" />
     <Compile Include="JDGL\Check\EquipmentCompletionService.cs" />

SGGL/BLL/IDP/IDPDataService.cs

@@ -9,9 +9,11 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace BLL
 {
@@ -30,105 +32,607 @@ namespace BLL
         //private static readonly string IDPApiUrl = "https://idp.cwcec.com/";
         private static readonly string IDPApiUrl = SysConstSetService.WuHuanIDPPath;
 
-        #region 接口授权认证
+        #region 试车工作包
+
+        #region 管道一览表
 
         /// <summary>
-        /// 加密公钥
+        /// 项目试车工作包——管道一览表
         /// </summary>
-        private static readonly string publicKey = "<RSAKeyValue><Modulus>g1sk7Xtc1TJouHdY4+FAe5atGCu2n17NhoKVDV57pki1IL+9+S7BY4gxAjmMkUU2/cbCCdbPoUJLBrCBCjX7yI3UJW6FZwQWkn3kVoeulLEwdPCIq/GUjMXaWf3Iaaad5wBUFbfXAzv15VN6z48Nt1IY/O8YEzhIpuZdtEgDdos=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>";
-        //private static readonly string publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChnc2YD0YzJPx6QTh+/n7XzjR1ugFzrsmPolJhpCfWMKrSGbT7iX/Kgcm1AI+T95K4Jzv3KS42QTecZ1ziJ4Rr9Luzw+9ZCSjMZgrmAUbY5IeBaA6GzaSk8UWHZ4n5PL+GUGq+2f+COL7+KCS2AxEpaqDZVrJrIfg/UektdgNyzwIDAQAB";
-
-        /// <summary>
-        /// 第三方加密认证接口
-        /// </summary>
-        /// 五环IDP系统SessionId有效期30分钟
-        /// <returns></returns>
-        public static SessionItem GetAuthenticationSession()
+        /// <param name="session">session</param>
+        /// <param name="projectId">项目Id</param>
+        public static string GetIDPProjectPreRunDataPiping(SessionItem session, string projectId)
         {
-            SessionItem session = new SessionItem();
-            try
+            string result = string.Empty;
+            if (string.IsNullOrWhiteSpace(projectId))
             {
-                //// 创建RSA加密服务提供者
-                ////using (RSA rsa = RSA.Create())
-                //using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
-                //{
-                //// 获取公钥false表示只导出公钥
-                //string publicKey = rsa.ToXmlString(false);
-                //// 获取私钥true表示导出公钥和私钥
-                //string privateKey = rsa.ToXmlString(true);
+                result = "请传项目Id";
+            }
+            else
+            {
+                var project = BLL.ProjectService.GetProjectByProjectId(projectId);
+                var mainProjects = BLL.PMPDataService.GetPMPProjectListByCode(project.ProjectCode);
 
-
-                ////用户名加密
-                //string encryptedUsername = EncryptData("dataviewer", publicKey);
-                ////密码加密
-                //string encryptedPassword = EncryptData("a3365$!", publicKey);
-
-                //用户名加密后的密文
-                string encryptedUsername = "k0N0tx/hfRPY0v2lq1G8eH6hCO+UiMqlSZi1PD6bhGf4YpP/koJq5hfMsDSzdn3dZjzExrwyrjFWp/1jZLde0+gRbQ0D7tzm0R5D6AmriodD2cJvrEiwtDy7SeGNloSaNmpTEMuycpuueiOeGhMkKnTwWfRkEw73lxEpTmaahq4=";
-                //密码加密后的密文
-                string encryptedPassword = "HLLroiNJJzyTWJt9td1xgChbVzyQkoxWCGGXqdwI2cvlUF/A30FAPaInszSwEhNRQlJZZ01EODElemkgv36DMF+XGwfDi0BfIq9jKG+/+wq0TVOHNhiu2NPzpn5Ji2X3yXIXpH1zv6XEtkvx/qiLToZYfRQCufsl5vH1cZxk2fQ=";
-
-                string url = $"{IDPApiUrl}UAMS/authEncrypt";
-                //string url = $"http://10.5.6.151:8100/UAMS/authEncrypt";
-                string contenttype = "application/json;charset=utf-8";
-                var body = new
+                List<string> idpPipingIds = IDPPreRunDataService.GetIDPPreRunDataPipingIds(projectId);
+                List<IDP_PreRunData_Piping> addItems = new List<IDP_PreRunData_Piping>();
+                List<IDP_PreRunData_Piping> modifyItems = new List<IDP_PreRunData_Piping>();
+                int all = 0;
+                foreach (var pro in mainProjects)
                 {
-                    encryptedUsername = encryptedUsername,
-                    encryptedPassword = encryptedPassword
-                };
+                    string url = $"{IDPApiUrl}OSS/projects/{pro.Code}/workitems/CP2600/objects/latest";
+                    //string url = $"{IDPApiUrl}OSS/projects/100168/workitems/CP2600/objects/latest";
 
-                string pushContent = JsonConvert.SerializeObject(body);
-                string strJosn = APIGetHttpService.Http(url, "POST", contenttype, null, pushContent);
-                //string strJosn = HttpHelper.Post(url, null, pushContent);
-                JObject obj = JObject.Parse(strJosn);
-                if (!string.IsNullOrEmpty(strJosn))
-                {
-                    string value = obj["value"].ToString();
-                    string name = obj["name"].ToString();
-                    session.value = value;
-                    session.name = name;
+                    try
+                    {
+                        //var session = GetAuthenticationSession();
+                        //ErrLogInfo.WriteLog($"Session——name：{session.name}；value：{session.value}");
+                        Hashtable newToken = new Hashtable { { "Cookie", $"{session.name}={session.value}" } };
+                        var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, newToken, null);
+                        if (!string.IsNullOrEmpty(returndata))
+                        {
+                            if (returndata.Contains("\"code\":404,\"message\":\"资源不存在\""))
+                            {
+                                result += $"失败！{returndata}|";
+                            }
+                            else if (returndata.Contains("\"status\":404,\"error\":\"Not Found\""))
+                            {
+                                result += $"失败！{returndata}|";
+                            }
+                            else
+                            {
+                                List<IDPPreRunPiping> responseDatas = IDPPreRunPiping.FromJson(returndata);
+                                all += responseDatas.Count();
+                                foreach (var item in responseDatas)
+                                {
+                                    IDP_PreRunData_Piping newItem = new IDP_PreRunData_Piping();
+                                    newItem.ItemId = item.ItemId;
+                                    newItem.ProjId = pro.Code;//主数据项目Id
+                                    newItem.ProjCode = pro.StNum;//主数据项目Code
+                                    newItem.ProjectId = project.ProjectId;//智慧施工项目Id
+                                    newItem.LastTime = DateTime.Now;//入库时间
+                                    newItem.WbsCode = item.WbsCode;//装置工序主项码
+                                    newItem.DeviceCode = item.DeviceCode;//装置码
+                                    newItem.ProcessesCode = item.ProcessesCode;//工序码
+                                    newItem.SubjectCode = item.SubjectCode;//主项码
+                                    newItem.Category = item.Category;
+                                    newItem.Category = item.Category;
+                                    newItem.Tag = item.Tag;
+                                    newItem.PipingCode = item.PipingCode;
+                                    newItem.Diameter = item.Diameter;
+                                    newItem.DiameterUnit = item.DiameterUnit;
+                                    newItem.MaterialLevel = item.MaterialLevel;
+                                    newItem.AdiabatType = item.AdiabatType;
+                                    newItem.AdiabatThickness = item.AdiabatThickness;
+                                    newItem.AdiabatThicknessUnit = item.AdiabatThicknessUnit;
+                                    newItem.MediumState = item.MediumState;
+                                    newItem.DrawingStartNo = item.DrawingStartNo;
+                                    newItem.DrawingEndNo = item.DrawingEndNo;
+                                    newItem.PipingStart = item.PipingStart;
+                                    newItem.PipingEnd = item.PipingEnd;
+                                    newItem.PipingLevel = item.PipingLevel;
+                                    newItem.NormalTemperature = item.NormalTemperature;
+                                    newItem.NormalTemperatureUnit = item.NormalTemperatureUnit;
+                                    newItem.NormalPressure = item.NormalPressure;
+                                    newItem.NormalPressureUnit = item.NormalPressureUnit;
+                                    newItem.DesignTemperature = item.DesignTemperature;
+                                    newItem.DesignTemperatureUnit = item.DesignTemperatureUnit;
+                                    newItem.DesignPressure = item.DesignPressure;
+                                    newItem.DesignPressureUnit = item.DesignPressureUnit;
+                                    newItem.PaintLevel = item.PaintLevel;
+                                    newItem.Remark = item.Remark;
+                                    newItem.DetailInfo = JsonConvert.SerializeObject(item, Formatting.Indented);
+
+                                    if (!string.IsNullOrWhiteSpace(item.ItemId) && idpPipingIds.Contains(item.ItemId))
+                                    {//编辑
+                                        modifyItems.Add(newItem);
+                                    }
+                                    else
+                                    {//新增
+                                        addItems.Add(newItem);
+                                        idpPipingIds.Add(item.ItemId);
+                                    }
+                                }
+                            }
+                        }
+                        else
+                        {
+                            result = "失败！";
+                        }
+                    }
+                    catch (WebException ex)
+                    {
+                        result = $"程序异常：{ex.Message}";
+                    }
                 }
-                //}
-            }
-            catch (WebException ex)
-            {
-                return null;
-            }
-            finally
-            {
+
+                if (addItems.Any()) { AddIDPPreRunPiping(addItems); }
+                if (modifyItems.Any()) { ModifyIDPPreRunPiping(modifyItems); }
+                result = $"成功！总数：{all}条；新增：{addItems.Count()}条，维护：{(all - addItems.Count())}条";
 
             }
-            return session;
+            return result;
         }
 
         /// <summary>
-        /// 加密字符串
+        /// 批量插入数据
         /// </summary>
-        /// <param name="data">加密信息</param>
-        /// <param name="publicKey">公钥</param>
-        /// <returns></returns>
-        public static string EncryptData(string data, string publicKey)
+        /// <param name="list"></param>
+        public static void AddIDPPreRunPiping(List<Model.IDP_PreRunData_Piping> list)
         {
-            using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+            Model.SGGLDB db = Funs.DB;
+            db.IDP_PreRunData_Piping.InsertAllOnSubmit(list);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 更新数据
+        /// </summary>
+        /// <param name="list"></param>
+        public static void ModifyIDPPreRunPiping(List<Model.IDP_PreRunData_Piping> list)
+        {
+            Model.SGGLDB db = Funs.DB;
+            foreach (var obj in list)
             {
-                string result = string.Empty;
-                try
+                IDP_PreRunData_Piping newItem = db.IDP_PreRunData_Piping.FirstOrDefault(x => x.ItemId == obj.ItemId);
+                if (newItem != null)
                 {
-                    rsa.FromXmlString(publicKey); //从字符串加载公钥
-                    byte[] dataBytes = Encoding.UTF8.GetBytes(data);
-                    byte[] encryptedBytes = rsa.Encrypt(dataBytes, false); //使用公钥加密数据，false表示使用OAEP填充方式
-                    result = Convert.ToBase64String(encryptedBytes); //返回Base64编码的加密数据
+                    newItem.ProjId = obj.ProjId;//主数据项目Id
+                    newItem.ProjCode = obj.ProjCode;//主数据项目Code
+                    newItem.ProjectId = obj.ProjectId;//智慧施工项目Id
+                    newItem.LastTime = DateTime.Now;//入库时间
+                    newItem.WbsCode = obj.WbsCode;//装置工序主项码
+                    newItem.DeviceCode = obj.DeviceCode;//装置码
+                    newItem.ProcessesCode = obj.ProcessesCode;//工序码
+                    newItem.SubjectCode = obj.SubjectCode;//主项码
+                    newItem.Category = obj.Category;
+                    newItem.Tag = obj.Tag;
+                    newItem.PipingCode = obj.PipingCode;
+                    newItem.Diameter = obj.Diameter;
+                    newItem.DiameterUnit = obj.DiameterUnit;
+                    newItem.MaterialLevel = obj.MaterialLevel;
+                    newItem.AdiabatType = obj.AdiabatType;
+                    newItem.AdiabatThickness = obj.AdiabatThickness;
+                    newItem.AdiabatThicknessUnit = obj.AdiabatThicknessUnit;
+                    newItem.MediumState = obj.MediumState;
+                    newItem.DrawingStartNo = obj.DrawingStartNo;
+                    newItem.DrawingEndNo = obj.DrawingEndNo;
+                    newItem.PipingStart = obj.PipingStart;
+                    newItem.PipingEnd = obj.PipingEnd;
+                    newItem.PipingLevel = obj.PipingLevel;
+                    newItem.NormalTemperature = obj.NormalTemperature;
+                    newItem.NormalTemperatureUnit = obj.NormalTemperatureUnit;
+                    newItem.NormalPressure = obj.NormalPressure;
+                    newItem.NormalPressureUnit = obj.NormalPressureUnit;
+                    newItem.DesignTemperature = obj.DesignTemperature;
+                    newItem.DesignTemperatureUnit = obj.DesignTemperatureUnit;
+                    newItem.DesignPressure = obj.DesignPressure;
+                    newItem.DesignPressureUnit = obj.DesignPressureUnit;
+                    newItem.PaintLevel = obj.PaintLevel;
+                    newItem.Remark = obj.Remark;
+                    newItem.DetailInfo = obj.DetailInfo;
+                    db.SubmitChanges();
                 }
-                catch (Exception ex)
-                {
-                    Console.WriteLine("Error encrypting: {0}", ex.Message);
-                }
-                return result;
             }
         }
 
         #endregion
 
+        #region 设备一览表
+
+        /// <summary>
+        /// 项目试车工作包——设备一览表
+        /// </summary>
+        /// <param name="session"></param>
+        /// <param name="projectId"></param>
+        public static string GetIDPProjectPreRunDataEquipment(SessionItem session, string projectId)
+        {
+            string result = string.Empty;
+            if (string.IsNullOrWhiteSpace(projectId))
+            {
+                result = "请传项目Id";
+            }
+            else
+            {
+                var project = BLL.ProjectService.GetProjectByProjectId(projectId);
+                var mainProjects = BLL.PMPDataService.GetPMPProjectListByCode(project.ProjectCode);
+
+                List<string> idpEquipmentIds = IDPPreRunDataService.GetIDPPreRunDataEquipmentIds(projectId);
+                List<IDP_PreRunData_Equipment> addItems = new List<IDP_PreRunData_Equipment>();
+                List<IDP_PreRunData_Equipment> modifyItems = new List<IDP_PreRunData_Equipment>();
+                int all = 0;
+                foreach (var pro in mainProjects)
+                {
+                    string url = $"{IDPApiUrl}OSS/projects/{pro.Code}/workitems/CP2100/objects/latest";
+                    //string url = $"{IDPApiUrl}OSS/projects/100168/workitems/CP2100/objects/latest";
+                    try
+                    {
+                        Hashtable newToken = new Hashtable { { "Cookie", $"{session.name}={session.value}" } };
+                        var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, newToken, null);
+                        if (!string.IsNullOrEmpty(returndata))
+                        {
+                            if (returndata.Contains("\"code\":404,\"message\":\"资源不存在\""))
+                            {
+                                result += $"失败！{returndata}|";
+                            }
+                            else if (returndata.Contains("\"status\":404,\"error\":\"Not Found\""))
+                            {
+                                result += $"失败！{returndata}|";
+                            }
+                            else
+                            {
+                                List<IDPPreRunEquipment> responseDatas = IDPPreRunEquipment.FromJson(returndata);
+                                all += responseDatas.Count();
+                                foreach (var item in responseDatas)
+                                {
+                                    Type type = typeof(IDPPreRunEquipment);
+
+                                    IDP_PreRunData_Equipment newItem = new IDP_PreRunData_Equipment();
+                                    newItem.ItemId = item.ItemId;
+                                    newItem.ProjId = pro.Code;//主数据项目Id
+                                    newItem.ProjCode = pro.StNum;//主数据项目Code
+                                    newItem.ProjectId = project.ProjectId;//智慧施工项目Id
+                                    newItem.LastTime = DateTime.Now;//入库时间
+                                    newItem.WbsCode = item.WbsCode;//装置工序主项码
+                                    newItem.DeviceCode = item.DeviceCode;//装置码
+                                    newItem.ProcessesCode = item.ProcessesCode;//工序码
+                                    newItem.SubjectCode = item.SubjectCode;//主项码
+                                    newItem.Category = item.Category;
+                                    newItem.Tag = item.Tag;
+                                    newItem.TagNumber = item.TagNumber;
+                                    string nameSpecifications = !string.IsNullOrWhiteSpace(item.NameSpecifications)? $"{item.NameSpecifications}。":string.Empty;
+                                    if (!string.IsNullOrWhiteSpace(item.DrivingType))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("DrivingType").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.DrivingType}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.EquipmentType))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("EquipmentType").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.EquipmentType}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.EquipmentTypeModel))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("EquipmentTypeModel").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.EquipmentTypeModel}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.EquipmentForm))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("EquipmentForm").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.EquipmentForm}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.MPaG))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("MPaG").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.MPaG} {item.MPaGUnit}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.KPa))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("KPa").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.KPa} {item.KPaUnit}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.DimensionsID))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("DimensionsID").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.DimensionsID} {item.DimensionsIDUnit}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.DimensionsHTT))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("DimensionsHTT").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.DimensionsHTT} {item.DimensionsHTTUnit}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.DesignFlow))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("DesignFlow").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.DesignFlow} {item.DesignFlowUnit}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.ShaftPower))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("ShaftPower").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.ShaftPower} {item.ShaftPowerUnit}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.RatedPower))
+                                    {
+                                        nameSpecifications = $"{nameSpecifications} {type.GetProperty("RatedPower").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.RatedPower} {item.RatedPowerUnit}；";
+                                    }
+                                    string materials = string.Empty;
+                                    if (!string.IsNullOrWhiteSpace(item.Materials))
+                                    {
+                                        materials = $"{type.GetProperty("Materials").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.Materials}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.ImpellerMaterial))
+                                    {
+                                        materials = $"{materials} {type.GetProperty("ImpellerMaterial").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.ImpellerMaterial}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.ShellMaterial))
+                                    {
+                                        materials = $"{materials} {type.GetProperty("ShellMaterial").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.ShellMaterial}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.CylinderMaterial))
+                                    {
+                                        materials = $"{materials} {type.GetProperty("CylinderMaterial").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.CylinderMaterial}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.TrayMaterial))
+                                    {
+                                        materials = $"{materials} {type.GetProperty("TrayMaterial").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.TrayMaterial}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.PackingMaterial))
+                                    {
+                                        materials = $"{materials} {type.GetProperty("PackingMaterial").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.PackingMaterial}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.PlateMaterial))
+                                    {
+                                        materials = $"{materials} {type.GetProperty("PlateMaterial").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.PlateMaterial}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.TrimMaterial))
+                                    {
+                                        materials = $"{materials} {type.GetProperty("TrimMaterial").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.TrimMaterial}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.CoilMaterial))
+                                    {
+                                        materials = $"{materials} {type.GetProperty("CoilMaterial").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.CoilMaterial}；";
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(item.PreheaterMaterial))
+                                    {
+                                        materials = $"{materials} {type.GetProperty("PreheaterMaterial").GetCustomAttribute<JsonPropertyAttribute>().PropertyName}：{item.PreheaterMaterial}；";
+                                    }
+                                    newItem.NameSpecifications = nameSpecifications;
+                                    newItem.Materials = materials;
+                                    newItem.NumOperate = item.DeviceNum;
+                                    newItem.WeightSingle = item.WeightSingle;
+                                    newItem.WeightSingleUnit = item.WeightSingleUnit;
+                                    newItem.Remark = item.Remark;
+                                    newItem.DetailInfo = JsonConvert.SerializeObject(item, Formatting.Indented);
+
+                                    if (!string.IsNullOrWhiteSpace(item.ItemId) && idpEquipmentIds.Contains(item.ItemId))
+                                    {//编辑
+                                        modifyItems.Add(newItem);
+                                    }
+                                    else
+                                    {//新增
+                                        addItems.Add(newItem);
+                                        idpEquipmentIds.Add(item.ItemId);
+                                    }
+                                }
+                            }
+                        }
+                        else
+                        {
+                            result = "失败！";
+                        }
+                    }
+                    catch (WebException ex)
+                    {
+                        result = $"程序异常：{ex.Message}";
+                    }
+                }
+
+                if (addItems.Any()) { AddIDPPreRunEquipment(addItems); }
+                if (modifyItems.Any()) { ModifyIDPPreRunEquipment(modifyItems); }
+                result = $"成功！总数：{all}条；新增：{addItems.Count()}条，维护：{(all - addItems.Count())}条";
+
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 批量插入数据
+        /// </summary>
+        /// <param name="list"></param>
+        public static void AddIDPPreRunEquipment(List<Model.IDP_PreRunData_Equipment> list)
+        {
+            Model.SGGLDB db = Funs.DB;
+            db.IDP_PreRunData_Equipment.InsertAllOnSubmit(list);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 更新数据
+        /// </summary>
+        /// <param name="list"></param>
+        public static void ModifyIDPPreRunEquipment(List<Model.IDP_PreRunData_Equipment> list)
+        {
+            Model.SGGLDB db = Funs.DB;
+            foreach (var obj in list)
+            {
+                IDP_PreRunData_Equipment newItem = db.IDP_PreRunData_Equipment.FirstOrDefault(x => x.ItemId == obj.ItemId);
+                if (newItem != null)
+                {
+                    newItem.ProjId = obj.ProjId;//主数据项目Id
+                    newItem.ProjCode = obj.ProjCode;//主数据项目Code
+                    newItem.ProjectId = obj.ProjectId;//智慧施工项目Id
+                    newItem.LastTime = DateTime.Now;//入库时间
+                    newItem.WbsCode = obj.WbsCode;//装置工序主项码
+                    newItem.DeviceCode = obj.DeviceCode;//装置码
+                    newItem.ProcessesCode = obj.ProcessesCode;//工序码
+                    newItem.SubjectCode = obj.SubjectCode;//主项码
+                    newItem.Category = obj.Category;
+                    newItem.Tag = obj.Tag;
+                    newItem.TagNumber = obj.TagNumber;
+                    newItem.NameSpecifications = obj.NameSpecifications;
+                    newItem.Materials = obj.Materials;
+                    newItem.WeightSingle = obj.WeightSingle;
+                    newItem.WeightSingleUnit = obj.WeightSingleUnit;
+                    newItem.Remark = obj.Remark;
+                    newItem.DetailInfo = obj.DetailInfo;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+        #endregion
+
+        #region 仪表索引
+
+        /// <summary>
+        /// 项目试车工作包——仪表索引
+        /// </summary>
+        /// <param name="session"></param>
+        /// <param name="projectId"></param>
+        public static string GetIDPProjectPreRunDataInstrumentation(SessionItem session, string projectId)
+        {
+            string result = string.Empty;
+            if (string.IsNullOrWhiteSpace(projectId))
+            {
+                result = "请传项目Id";
+            }
+            else
+            {
+                var project = BLL.ProjectService.GetProjectByProjectId(projectId);
+                var mainProjects = BLL.PMPDataService.GetPMPProjectListByCode(project.ProjectCode);
+
+                List<string> idpInstrumentationIds = IDPPreRunDataService.GetIDPPreRunDataInstrumentationIds(projectId);
+                List<IDP_PreRunData_Instrumentation> addItems = new List<IDP_PreRunData_Instrumentation>();
+                List<IDP_PreRunData_Instrumentation> modifyItems = new List<IDP_PreRunData_Instrumentation>();
+                int all = 0;
+                foreach (var pro in mainProjects)
+                {
+                    string urlCP7601 = $"{IDPApiUrl}OSS/projects/{pro.Code}/workitems/CP7601/objects/latest";
+                    string urlCP7603 = $"{IDPApiUrl}OSS/projects/{pro.Code}/workitems/CP7603/objects/latest";
+                    //string url = $"{IDPApiUrl}OSS/projects/{pro.Code}/workitems/IN1000/objects/latest";
+                    //string url = $"{IDPApiUrl}OSS/projects/100168/workitems/IN1000/objects/latest";
+                    //string urlCP7601 = $"{IDPApiUrl}OSS/projects/100168/workitems/CP7601/objects/latest";
+                    //string urlCP7603 = $"{IDPApiUrl}OSS/projects/100168/workitems/CP7603/objects/latest";
+                    try
+                    {
+                        Hashtable newToken = new Hashtable { { "Cookie", $"{session.name}={session.value}" } };
+                        var returndataCP7601 = BLL.APIGetHttpService.OutsideHttp(urlCP7601, "GET", null, newToken, null);
+                        var returndataCP7603 = BLL.APIGetHttpService.OutsideHttp(urlCP7603, "GET", null, newToken, null);
+                        List<IDPPreRunInstrumentation> results = new List<IDPPreRunInstrumentation>();
+                        if (!string.IsNullOrEmpty(returndataCP7601))
+                        {
+                            if (returndataCP7601.Contains("\"code\":404,\"message\":\"资源不存在\""))
+                            {
+                                result += $"失败！{returndataCP7601}|";
+                            }
+                            else if (returndataCP7601.Contains("\"status\":404,\"error\":\"Not Found\""))
+                            {
+                                result += $"失败！{returndataCP7601}|";
+                            }
+                            else
+                            {
+                                List<IDPPreRunInstrumentation> responseDatas = IDPPreRunInstrumentation.FromJson(returndataCP7601);
+                                results.AddRange(responseDatas);
+                            }
+                        }
+                        if (!string.IsNullOrEmpty(returndataCP7603))
+                        {
+                            if (returndataCP7603.Contains("\"code\":404,\"message\":\"资源不存在\""))
+                            {
+                                result += $"失败！{returndataCP7603}|";
+                            }
+                            else if (returndataCP7603.Contains("\"status\":404,\"error\":\"Not Found\""))
+                            {
+                                result += $"失败！{returndataCP7603}|";
+                            }
+                            else
+                            {
+                                List<IDPPreRunInstrumentation> responseDatas = IDPPreRunInstrumentation.FromJson(returndataCP7603);
+                                results.AddRange(responseDatas);
+                            }
+                        }
+                        if (results.Any())
+                        {
+                            all += results.Count();
+                            foreach (var item in results)
+                            {
+                                Type type = typeof(IDPPreRunInstrumentation);
+
+                                IDP_PreRunData_Instrumentation newItem = new IDP_PreRunData_Instrumentation();
+                                newItem.ItemId = item.ItemId;
+                                newItem.ProjId = pro.Code;//主数据项目Id
+                                newItem.ProjCode = pro.StNum;//主数据项目Code
+                                newItem.ProjectId = project.ProjectId;//智慧施工项目Id
+                                newItem.LastTime = DateTime.Now;//入库时间
+                                newItem.WbsCode = item.WbsCode;//装置工序主项码
+                                newItem.DeviceCode = item.DeviceCode;//装置码
+                                newItem.ProcessesCode = item.ProcessesCode;//工序码
+                                newItem.SubjectCode = item.SubjectCode;//主项码
+                                newItem.Category = item.Category;
+                                newItem.Tag = item.Tag;
+                                newItem.InstrumentTag = item.InstrumentTag;
+                                newItem.UseTo = item.UseTo;
+                                newItem.InstrumentName = item.InstrumentName;
+                                newItem.Supplier = item.Supplier;
+                                newItem.InstallationPosition = item.InstallationPosition;
+                                newItem.SignalType = item.SignalType;
+                                newItem.AssociatedSystem = item.AssociatedSystem;
+                                newItem.Cp25 = item.Cp25;
+                                newItem.In11 = item.In11;
+                                newItem.In40 = item.In40;
+                                newItem.Remark = item.Remark;
+                                newItem.DetailInfo = JsonConvert.SerializeObject(item, Formatting.Indented);
+
+                                if (!string.IsNullOrWhiteSpace(item.ItemId) && idpInstrumentationIds.Contains(item.ItemId))
+                                {//编辑
+                                    modifyItems.Add(newItem);
+                                }
+                                else
+                                {//新增
+                                    addItems.Add(newItem);
+                                    idpInstrumentationIds.Add(item.ItemId);
+                                }
+                            }
+                        }
+                    }
+                    catch (WebException ex)
+                    {
+                        result = $"程序异常：{ex.Message}";
+                    }
+                }
+
+                if (addItems.Any()) { AddIDPPreRunInstrumentation(addItems); }
+                if (modifyItems.Any()) { ModifyIDPPreRunInstrumentation(modifyItems); }
+                result = $"成功！总数：{all}条；新增：{addItems.Count()}条，维护：{(all - addItems.Count())}条";
+
+            }
+            return result;
+        }
+
+
+        /// <summary>
+        /// 批量插入数据
+        /// </summary>
+        /// <param name="list"></param>
+        public static void AddIDPPreRunInstrumentation(List<Model.IDP_PreRunData_Instrumentation> list)
+        {
+            Model.SGGLDB db = Funs.DB;
+            db.IDP_PreRunData_Instrumentation.InsertAllOnSubmit(list);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 更新数据
+        /// </summary>
+        /// <param name="list"></param>
+        public static void ModifyIDPPreRunInstrumentation(List<Model.IDP_PreRunData_Instrumentation> list)
+        {
+            Model.SGGLDB db = Funs.DB;
+            foreach (var obj in list)
+            {
+                IDP_PreRunData_Instrumentation newItem = db.IDP_PreRunData_Instrumentation.FirstOrDefault(x => x.ItemId == obj.ItemId);
+                if (newItem != null)
+                {
+                    newItem.ProjId = obj.ProjId;//主数据项目Id
+                    newItem.ProjCode = obj.ProjCode;//主数据项目Code
+                    newItem.ProjectId = obj.ProjectId;//智慧施工项目Id
+                    newItem.LastTime = DateTime.Now;//入库时间
+                    newItem.WbsCode = obj.WbsCode;//装置工序主项码
+                    newItem.DeviceCode = obj.DeviceCode;//装置码
+                    newItem.ProcessesCode = obj.ProcessesCode;//工序码
+                    newItem.SubjectCode = obj.SubjectCode;//主项码
+                    newItem.Category = obj.Category;
+                    newItem.Tag = obj.Tag;
+                    newItem.InstrumentTag = obj.InstrumentTag;
+                    newItem.UseTo = obj.UseTo;
+                    newItem.InstrumentName = obj.InstrumentName;
+                    newItem.Supplier = obj.Supplier;
+                    newItem.InstallationPosition = obj.InstallationPosition;
+                    newItem.SignalType = obj.SignalType;
+                    newItem.AssociatedSystem = obj.AssociatedSystem;
+                    newItem.Cp25 = obj.Cp25;
+                    newItem.In11 = obj.In11;
+                    newItem.In40 = obj.In40;
+                    newItem.Remark = obj.Remark;
+                    newItem.DetailInfo = obj.DetailInfo;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
         #region 质量管理设计图纸
 
         #region IDP
@@ -680,63 +1184,104 @@ namespace BLL
 
         #endregion
 
-        #region 试车工作包
+        #region IDP平台接口授权认证
 
         /// <summary>
-        /// 获取工作包结构化数据
+        /// 加密公钥
         /// </summary>
-        public static void GetIDPProjectMasterData()
+        private static readonly string publicKey = "<RSAKeyValue><Modulus>g1sk7Xtc1TJouHdY4+FAe5atGCu2n17NhoKVDV57pki1IL+9+S7BY4gxAjmMkUU2/cbCCdbPoUJLBrCBCjX7yI3UJW6FZwQWkn3kVoeulLEwdPCIq/GUjMXaWf3Iaaad5wBUFbfXAzv15VN6z48Nt1IY/O8YEzhIpuZdtEgDdos=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>";
+        //private static readonly string publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChnc2YD0YzJPx6QTh+/n7XzjR1ugFzrsmPolJhpCfWMKrSGbT7iX/Kgcm1AI+T95K4Jzv3KS42QTecZ1ziJ4Rr9Luzw+9ZCSjMZgrmAUbY5IeBaA6GzaSk8UWHZ4n5PL+GUGq+2f+COL7+KCS2AxEpaqDZVrJrIfg/UektdgNyzwIDAQAB";
+
+        /// <summary>
+        /// 第三方加密认证接口
+        /// </summary>
+        /// 五环IDP系统SessionId有效期30分钟
+        /// <returns></returns>
+        public static SessionItem GetAuthenticationSession()
         {
-            string projectId = string.Empty;//五环主数据项目Id
-            string wbsCode = string.Empty;//五环主数据wbs编码
-            string workitemCode = string.Empty;//五环主数据文件类别码
-
-            //https://idp.cwcec.com/OSS/projects/9100168/wbs/000000/workitems/CP2100/objects/latest
-            //string url = $"{IDPApiUrl}/OSS/projects/{projectId}/wbs/{wbsCode}/workitems/{workitemCode}/objects/latest";
-            string url = $"{IDPApiUrl}/OSS/projects/9100168/wbs/000000/workitems/CP2100/objects/latest";
-
-
-            //测试环境接口地址
-            var testApiUrl = "http://10.5.6.151:8100/OSS/projects/9100168/wbs/000000/workitems/CP2100/objects/latest";
+            SessionItem session = new SessionItem();
             try
             {
-                var session = GetAuthenticationSession();
+                //// 创建RSA加密服务提供者
+                ////using (RSA rsa = RSA.Create())
+                //using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+                //{
+                //// 获取公钥false表示只导出公钥
+                //string publicKey = rsa.ToXmlString(false);
+                //// 获取私钥true表示导出公钥和私钥
+                //string privateKey = rsa.ToXmlString(true);
 
-                ErrLogInfo.WriteLog($"Session——name：{session.name}；value：{session.value}");
-                Hashtable newToken = new Hashtable { { session.name, session.value } };
-                var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, newToken, null);
 
+                ////用户名加密
+                //string encryptedUsername = EncryptData("dataviewer", publicKey);
+                ////密码加密
+                //string encryptedPassword = EncryptData("a3365$!", publicKey);
+
+                //用户名加密后的密文
+                string encryptedUsername = "k0N0tx/hfRPY0v2lq1G8eH6hCO+UiMqlSZi1PD6bhGf4YpP/koJq5hfMsDSzdn3dZjzExrwyrjFWp/1jZLde0+gRbQ0D7tzm0R5D6AmriodD2cJvrEiwtDy7SeGNloSaNmpTEMuycpuueiOeGhMkKnTwWfRkEw73lxEpTmaahq4=";
+                //密码加密后的密文
+                string encryptedPassword = "HLLroiNJJzyTWJt9td1xgChbVzyQkoxWCGGXqdwI2cvlUF/A30FAPaInszSwEhNRQlJZZ01EODElemkgv36DMF+XGwfDi0BfIq9jKG+/+wq0TVOHNhiu2NPzpn5Ji2X3yXIXpH1zv6XEtkvx/qiLToZYfRQCufsl5vH1cZxk2fQ=";
+
+                string url = $"{IDPApiUrl}UAMS/authEncrypt";
+                //string url = $"http://10.5.6.151:8100/UAMS/authEncrypt";
+                string contenttype = "application/json;charset=utf-8";
+                var body = new
+                {
+                    encryptedUsername = encryptedUsername,
+                    encryptedPassword = encryptedPassword
+                };
+
+                string pushContent = JsonConvert.SerializeObject(body);
+                string strJosn = APIGetHttpService.Http(url, "POST", contenttype, null, pushContent);
+                //string strJosn = HttpHelper.Post(url, null, pushContent);
+                JObject obj = JObject.Parse(strJosn);
+                if (!string.IsNullOrEmpty(strJosn))
+                {
+                    string value = obj["value"].ToString();
+                    string name = obj["name"].ToString();
+                    session.value = value;
+                    session.name = name;
+                }
+                //}
             }
             catch (WebException ex)
             {
-
+                return null;
             }
             finally
             {
 
             }
+            return session;
         }
 
-
-        //public static void AddPMP_Project(List<Model.PMP_Project> newtables)
-        //{
-        //    Model.SGGLDB db = Funs.DB;
-        //    db.PMP_Project.InsertAllOnSubmit(newtables);
-        //    db.SubmitChanges();
-        //}
-
-        //public static void DeleteAllPMP_Project()
-        //{
-        //    Model.SGGLDB db = Funs.DB;
-        //    if (db.PMP_Project.FirstOrDefault() != null)
-        //    {
-        //        db.PMP_Project.DeleteAllOnSubmit(db.PMP_Project);
-        //        db.SubmitChanges();
-        //    }
-        //}
-
+        /// <summary>
+        /// 加密字符串
+        /// </summary>
+        /// <param name="data">加密信息</param>
+        /// <param name="publicKey">公钥</param>
+        /// <returns></returns>
+        public static string EncryptData(string data, string publicKey)
+        {
+            using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+            {
+                string result = string.Empty;
+                try
+                {
+                    rsa.FromXmlString(publicKey); //从字符串加载公钥
+                    byte[] dataBytes = Encoding.UTF8.GetBytes(data);
+                    byte[] encryptedBytes = rsa.Encrypt(dataBytes, false); //使用公钥加密数据，false表示使用OAEP填充方式
+                    result = Convert.ToBase64String(encryptedBytes); //返回Base64编码的加密数据
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Error encrypting: {0}", ex.Message);
+                }
+                return result;
+            }
+        }
 
         #endregion
-    }
 
+    }
 }

SGGL/BLL/IDP/IDPPreRunDataService.cs

@@ -0,0 +1,94 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// IDP平台试车数据服务
+    /// </summary>
+    public static class IDPPreRunDataService
+    {
+        #region 管道一览表
+
+        /// <summary>
+        /// 获取明细
+        /// </summary>
+        /// <param name="ItemId"></param>
+        /// <returns></returns>
+        public static Model.IDP_PreRunData_Piping GetPipingById(string ItemId)
+        {
+            return Funs.DB.IDP_PreRunData_Piping.FirstOrDefault(x => x.ItemId == ItemId);
+        }
+
+        /// <summary>
+        /// 获取IDP试车管道一览表
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.IDP_PreRunData_Piping> GetIDPPreRunDataPipingList(string projectId)
+        {
+            var list = (from x in Funs.DB.IDP_PreRunData_Piping where x.ProjectId == projectId orderby x.ProjCode select x).ToList();
+            return list;
+        }
+
+        /// <summary>
+        /// 获取IDP试车管道一览表Ids
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<string> GetIDPPreRunDataPipingIds(string projectId)
+        {
+            return (from x in Funs.DB.IDP_PreRunData_Piping where x.ProjectId == projectId select x.ItemId).ToList();
+        }
+
+        #endregion
+
+        #region 设备一览表
+
+        /// <summary>
+        /// 获取明细
+        /// </summary>
+        /// <param name="ItemId"></param>
+        /// <returns></returns>
+        public static Model.IDP_PreRunData_Equipment GetEquipmentById(string ItemId)
+        {
+            return Funs.DB.IDP_PreRunData_Equipment.FirstOrDefault(x => x.ItemId == ItemId);
+        }
+
+        /// <summary>
+        /// 获取IDP试车管道一览表Ids
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<string> GetIDPPreRunDataEquipmentIds(string projectId)
+        {
+            return (from x in Funs.DB.IDP_PreRunData_Equipment where x.ProjectId == projectId select x.ItemId).ToList();
+        }
+
+        #endregion
+
+        #region 仪表索引
+
+        /// <summary>
+        /// 获取明细
+        /// </summary>
+        /// <param name="ItemId"></param>
+        /// <returns></returns>
+        public static Model.IDP_PreRunData_Instrumentation GetInstrumentationById(string ItemId)
+        {
+            return Funs.DB.IDP_PreRunData_Instrumentation.FirstOrDefault(x => x.ItemId == ItemId);
+        }
+
+        /// <summary>
+        /// 获取IDP试车管道一览表Ids
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<string> GetIDPPreRunDataInstrumentationIds(string projectId)
+        {
+            return (from x in Funs.DB.IDP_PreRunData_Instrumentation where x.ProjectId == projectId select x.ItemId).ToList();
+        }
+
+        #endregion
+    }
+}

SGGL/BLL/PMP/PMPDataService.cs

@@ -16,6 +16,27 @@ namespace BLL
         //private static readonly string PmpApiUrl = "http://mdm.cwcec.com:8020/";
         private static readonly string PmpApiUrl = SysConstSetService.WuHuanPMPPath;
 
+        /// <summary>
+        /// 根据主项目code获取主项目数据
+        /// </summary>
+        /// <param name="proCode"></param>
+        /// <returns></returns>
+        public static Model.PMP_Project GetPMPProjectByCode(string proCode)
+        {
+            return Funs.DB.PMP_Project.OrderBy(x => x.RealEndDate).FirstOrDefault(e => e.StNum == proCode);
+        }
+
+        /// <summary>
+        /// 根据主项目code获取主项目数据
+        /// </summary>
+        /// <param name="proCode"></param>
+        /// <returns></returns>
+        public static List<Model.PMP_Project> GetPMPProjectListByCode(string proCode)
+        {
+            var list = (from x in Funs.DB.PMP_Project where x.StNum == proCode orderby x.Code select x).ToList();
+            return list;
+        }
+
         /// <summary>
         /// 获取token
         /// </summary>

SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs

@@ -721,7 +721,7 @@ namespace FineUIPro.Web.CQMS.Check
             {
                 lists = lists.OrderByDescending(x => x.CheckDate);
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("质量巡检模板", "质量巡检（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
+                newUrl = uploadfilepath.Replace("质量巡检模板", "质量巡检（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + "）");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs

@@ -439,7 +439,7 @@ namespace FineUIPro.Web.CQMS.Check
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("质量专项检查模板", "质量专项检查（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
+                newUrl = uploadfilepath.Replace("质量专项检查模板", "质量专项检查（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + "）");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs

@@ -263,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("施工技术交底管理导入模板", "施工技术交底管理（"+projectName+DateTime.Now.ToString("yyyyMMdd")+"）");
+                newUrl = uploadfilepath.Replace("施工技术交底管理导入模板", "施工技术交底管理（"+projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd")+"）");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs

@@ -351,7 +351,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("资料收发文登记记录导入模板", "资料收发文登记记录（" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")");
+                newUrl = uploadfilepath.Replace("资料收发文登记记录导入模板", "资料收发文登记记录（" + projectName.Replace("/", "") + "" + DateTime.Now.ToString("yyyyMMdd") + ")");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs

@@ -316,7 +316,7 @@ namespace FineUIPro.Web.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("设计变更单导入模板", "设计变更单（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")");
+                newUrl = uploadfilepath.Replace("设计变更单导入模板", "设计变更单（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs

@@ -377,7 +377,7 @@ namespace FineUIPro.Web.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("图纸收发记录导入模板", "图纸收发记录（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")");
+                newUrl = uploadfilepath.Replace("图纸收发记录导入模板", "图纸收发记录（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs

@@ -305,7 +305,7 @@ namespace FineUIPro.Web.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("施工组织设计及施工方案导入模板", "施工组织设计及施工方案（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")");
+                newUrl = uploadfilepath.Replace("施工组织设计及施工方案导入模板", "施工组织设计及施工方案（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs

@@ -312,7 +312,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 var projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
                 
-                newUrl = uploadfilepath.Replace("设备材料报验导入模板", "设备材料报验（" + projectName + "" + DateTime.Now.ToString("yyyyMMdd") + ")");
+                newUrl = uploadfilepath.Replace("设备材料报验导入模板", "设备材料报验（" + projectName.Replace("/", "") + "" + DateTime.Now.ToString("yyyyMMdd") + ")");
                 if(File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs

@@ -336,7 +336,7 @@ namespace FineUIPro.Web.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("机具报验导入模板", "机具报验（"+ projectName+DateTime.Now.ToString("yyyyMMdd")+ "）");
+                newUrl = uploadfilepath.Replace("机具报验导入模板", "机具报验（"+ projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd")+ "）");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs

@@ -414,7 +414,7 @@ namespace FineUIPro.Web.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("人员报验导入模板", "人员报验（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
+                newUrl = uploadfilepath.Replace("人员报验导入模板", "人员报验（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + "）");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs

@@ -271,7 +271,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("检验试验计划导入模板.xls", "检验试验计划（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ").xls");
+                newUrl = uploadfilepath.Replace("检验试验计划导入模板.xls", "检验试验计划（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ").xls");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs

@@ -313,7 +313,7 @@ namespace FineUIPro.Web.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("超过一定规模的危大施工方案导入模板", "超过一定规模的危大施工方案（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")");
+                newUrl = uploadfilepath.Replace("超过一定规模的危大施工方案导入模板", "超过一定规模的危大施工方案（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs

@@ -362,7 +362,7 @@ namespace FineUIPro.Web.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("NCR管理导入模板", "NCR管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")");
+                newUrl = uploadfilepath.Replace("NCR管理导入模板", "NCR管理（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs

@@ -298,7 +298,7 @@ namespace FineUIPro.Web.Comprehensive
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("压力管道管理导入模板", "压力管道管理（" + projectName + DateTime.Now.ToString("yyyyMMdd") + ")");
+                newUrl = uploadfilepath.Replace("压力管道管理导入模板", "压力管道管理（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx

@@ -124,68 +124,76 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode" SortField="projectDeviceProcedureSubjectCode"
-                            FieldType="String" HeaderText="装工主编码" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="wbsFullPath" DataField="wbsFullPath" SortField="wbsFullPath"
-                            FieldType="String" HeaderText="装工主名称" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="formatFileCode" DataField="formatFileCode" SortField="formatFileCode"
-                            FieldType="String" HeaderText="文件编码" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="formatFileName" DataField="formatFileName"
-                            FieldType="String" HeaderText="文件名称" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo" SortField="majorNo"
-                            FieldType="String" HeaderText="专业编码" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="majorName" DataField="majorName" SortField="majorName"
-                            FieldType="String" HeaderText="专业名称" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="fileVersion" DataField="fileVersion" SortField="fileVersion"
-                            FieldType="String" HeaderText="版次" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="designUserName" DataField="designUserName"
-                            FieldType="String" HeaderText="设计人" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="jiaoheUserName" DataField="jiaoheUserName"
-                            FieldType="String" HeaderText="校核人" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="shenheUserName" DataField="shenheUserName"
-                            FieldType="String" HeaderText="审核人" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="shendingUserName" DataField="shendingUserName"
-                            FieldType="String" HeaderText="审定人" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="majorResponsibleUserName" DataField="majorResponsibleUserName"
-                            FieldType="String" HeaderText="专业负责人" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="classificationLevelInProject" DataField="classificationLevelInProject" SortField="classificationLevelInProject"
-                            FieldType="String" HeaderText="保密等级" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="remark" DataField="remark"
-                            FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="updateTime" DataField="updateTime" SortField="updateTime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="入库日期" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="archnumber" DataField="archnumber"
-                            FieldType="String" HeaderText="入库档案号" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="sendtime" DataField="sendtime" SortField="sendtime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="档案室验收日期" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="printtime" DataField="printtime" SortField="printtime"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="蓝图打印日期" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="ifmail" DataField="ifmail" SortField="ifmail"
-                            FieldType="String" HeaderText="蓝图寄出" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("fileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
+                        <f:GroupField ColumnID="GroupField2" runat="server" HeaderText="IDP系统数据信息" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode" SortField="projectDeviceProcedureSubjectCode"
+                                    FieldType="String" HeaderText="装工主编码" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="wbsFullPath" DataField="wbsFullPath" SortField="wbsFullPath"
+                                    FieldType="String" HeaderText="装工主名称" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="formatFileCode" DataField="formatFileCode" SortField="formatFileCode"
+                                    FieldType="String" HeaderText="文件编码" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="formatFileName" DataField="formatFileName"
+                                    FieldType="String" HeaderText="文件名称" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo" SortField="majorNo"
+                                    FieldType="String" HeaderText="专业编码" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="majorName" DataField="majorName" SortField="majorName"
+                                    FieldType="String" HeaderText="专业名称" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="80px" ColumnID="fileVersion" DataField="fileVersion" SortField="fileVersion"
+                                    FieldType="String" HeaderText="版次" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="designUserName" DataField="designUserName"
+                                    FieldType="String" HeaderText="设计人" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="jiaoheUserName" DataField="jiaoheUserName"
+                                    FieldType="String" HeaderText="校核人" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="shenheUserName" DataField="shenheUserName"
+                                    FieldType="String" HeaderText="审核人" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="shendingUserName" DataField="shendingUserName"
+                                    FieldType="String" HeaderText="审定人" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="majorResponsibleUserName" DataField="majorResponsibleUserName"
+                                    FieldType="String" HeaderText="专业负责人" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="classificationLevelInProject" DataField="classificationLevelInProject" SortField="classificationLevelInProject"
+                                    FieldType="String" HeaderText="保密等级" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="remark" DataField="remark"
+                                    FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="updateTime" DataField="updateTime" SortField="updateTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="入库日期" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField ColumnID="GroupField2" runat="server" HeaderText="数字档案馆数据信息" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField Width="100px" ColumnID="archnumber" DataField="archnumber"
+                                    FieldType="String" HeaderText="入库档案号" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="sendtime" DataField="sendtime" SortField="sendtime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="档案室验收日期" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="printtime" DataField="printtime" SortField="printtime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="蓝图打印日期" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="ifmail" DataField="ifmail" SortField="ifmail"
+                                    FieldType="String" HeaderText="蓝图寄出" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("fileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                        </f:GroupField>
                     </Columns>
                     <%-- <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs

@@ -107,7 +107,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                     NCRStatisc.CheckNum = managementList.Count();
                     //NCRStatisc.OKNum = managementList.Count(x => x.Status == "3");
                     //NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3");
-                    int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                    //int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                    int okNum = managementList.Where(x => x.ImplementationFrontState == "已闭合").Count();
                     NCRStatisc.OKNum = okNum;
                     NCRStatisc.NotOKNum = managementList.Count() - okNum;
                     NCRStatisc.Remark = "";

SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs

@@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 {
 
                     //this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["startdate"];
-                   // this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"];
+                    // this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"];
                     this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6)) : Request.Params["startdate"];
                     this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["enddate"];
                     //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00");
@@ -929,8 +929,10 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 NCRStatisc.WorkName = item.UnitName;
                 //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
                 //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
-                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
-                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
+                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
                 NCRStatisc.CheckNum = AllList.Count();
                 if (NCRStatisc.CheckNum != 0)//被除数不能为零
                 {

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs

@@ -230,7 +230,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 var urlHz = startDate.ToString("yyyyMMdd") + "-"
                     + endDate.ToString("yyyyMMdd");
 
-                newUrl = uploadfilepath.Replace("项目质量月报", pModel.ShortName + "项目质量月报（第" + weekModel.SortId + "期）" + urlHz);
+                newUrl = uploadfilepath.Replace("项目质量月报", pModel.ShortName.Replace("/", "") + "项目质量月报（第" + weekModel.SortId + "期）" + urlHz);
 
                 if (File.Exists(newUrl))
                 {

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs

@@ -133,7 +133,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     constructionProblemsLists = (from x in Funs.DB.Report_ConstructionProblems
                                                  where x.ReportId == this.ReportId
                                                  select x).ToList();
-                    if (constructionProblemsLists.Count>0)
+                    if (constructionProblemsLists.Count > 0)
                     {
                         gvConstructionProblems.Hidden = false;
                         gvConstructionProblems.DataSource = constructionProblemsLists;
@@ -146,7 +146,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     nextQualityControlLists = (from x in Funs.DB.Report_NextQualityControl
                                                where x.ReportId == this.ReportId
                                                select x).ToList();
-                    if (nextQualityControlLists.Count>0)
+                    if (nextQualityControlLists.Count > 0)
                     {
                         gvNextQualityControl.Hidden = false;
                         gvNextQualityControl.DataSource = nextQualityControlLists;
@@ -890,12 +890,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                                 c.PressurePipeNumber
                             };
                 var AllList = query.ToList();
-                 var monethCount = query
-                    .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate)));
+                var monethCount = query
+                   .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate)));
 
                 Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                 model.Id = Guid.NewGuid().ToString();
-                model.ContentName = item.UnitName;                
+                model.ContentName = item.UnitName;
                 model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.PressurePipeNumber));
                 model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.PressurePipeNumber));
                 model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.ActualNumber));//总数
@@ -1045,15 +1045,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                                 c.SunNumber,
                                 c.MonitoringReportNumber
                             };
-                var AllList = query.ToList();             
+                var AllList = query.ToList();
                 var monethCount = query
                 .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate)));
 
                 Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                 model.Id = Guid.NewGuid().ToString();
                 model.ContentName = item.UnitName;
-                model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o=>o.SunNumber));
-                model.MonthsCount = Convert.ToInt32(monethCount.Sum(o=>o.MonitoringReportNumber));
+                model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.SunNumber));
+                model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.MonitoringReportNumber));
                 model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.MonitoringReportNumber));
                 model.ReportId = ReportId;
                 //如果是修改，查询表中数据
@@ -1141,8 +1141,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 NCRStatisc.WorkName = item.UnitName;
                 //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
                 //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
-                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
-                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
+                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
 
                 NCRStatisc.CheckNum = AllList.Count();
 
@@ -1283,7 +1285,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                             select new
                             {
                                 c.CheckDate,
-                                c.ProjectId, 
+                                c.ProjectId,
                                 c.CheckType
                             };
                 var AllList = query.ToList();
@@ -1570,7 +1572,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         #region 保存方法 
 
         #region 9.计量器具报验管理情况
-        void saveMeasuringInspection() {
+        void saveMeasuringInspection()
+        {
 
             List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
             JArray teamGroupData = gvMeasuringInspection.GetMergedData();
@@ -1959,7 +1962,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 {
                     ReportId = ReportId,
                     ReType = "13",
-                    TotalNoBackCount= values.Value<int>("TotalNoBackCount"),
+                    TotalNoBackCount = values.Value<int>("TotalNoBackCount"),
                     ContentName = values.Value<string>("ContentName"),
                     MonthsCount = values.Value<int>("MonthsCount"),
                     ProjectCount = values.Value<int>("ProjectCount"),
@@ -2012,7 +2015,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 Funs.DB.SubmitChanges();
             }
         }
-#endregion
+        #endregion
 
 
 

SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs

@@ -229,7 +229,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 var urlHz = startDate.ToString("yyyyMMdd") + "-"
                     + endDate.ToString("yyyyMMdd");
 
-                newUrl = uploadfilepath.Replace("项目质量周报", pModel.ShortName + "项目质量周报（第" + weekModel.SortId + "期）" + urlHz);
+                newUrl = uploadfilepath.Replace("项目质量周报", pModel.ShortName.Replace("/", "") + "项目质量周报（第" + weekModel.SortId + "期）" + urlHz);
 
                 if (File.Exists(newUrl))
                 {

SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs

@@ -2188,8 +2188,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 NCRStatisc.WorkName = item.UnitName;
                 //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
                 //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
-                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
-                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
+                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
 
                 NCRStatisc.CheckNum = AllList.Count();
 

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs

@@ -540,7 +540,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("共检通知单模板", "共检通知单（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
+                newUrl = uploadfilepath.Replace("共检通知单模板", "共检通知单（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + "）");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/QualityPlanning/ConExperienceSummary.aspx.cs

@@ -224,7 +224,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("类似项目施工经验总结清单导入模板", "类似项目施工经验总结清单（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
+                newUrl = uploadfilepath.Replace("类似项目施工经验总结清单导入模板", "类似项目施工经验总结清单（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + "）");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs

@@ -496,7 +496,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
                 initTemplatePath = Const.CQMS_OrganizationalUrl;
                 uploadfilepath = rootPath + initTemplatePath;
 
-                newUrl = uploadfilepath.Replace("总包质量管理组织机构图", "总包质量管理组织机构图（" + pModel.ShortName + "）");
+                newUrl = uploadfilepath.Replace("总包质量管理组织机构图", "总包质量管理组织机构图（" + pModel.ShortName.Replace("/", "") + "）");
                 //filePath = initTemplatePath.Replace(".doc", trainRecords.TrainRecordsId.Replace("/", "-") + ".pdf");
                 if (File.Exists(newUrl))
                 {

SGGL/FineUIPro.Web/CQMS/QualityPlanning/ProjectQualityPlan.aspx.cs

@@ -228,7 +228,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("项目质量计划导入模板", "项目质量计划（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
+                newUrl = uploadfilepath.Replace("项目质量计划导入模板", "项目质量计划（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + "）");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/CQMS/QualityPlanning/QualityManagementSys.aspx.cs

@@ -228,7 +228,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
-                newUrl = uploadfilepath.Replace("质量管理制度导入模板", "质量管理制度（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
+                newUrl = uploadfilepath.Replace("质量管理制度导入模板", "质量管理制度（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + "）");
                 if (File.Exists(newUrl))
                 {
                     File.Delete(newUrl);

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1926,6 +1926,7 @@
     <Content Include="TestRun\BeforeTestRun\FourDecisionProposerHandleEdit.aspx" />
     <Content Include="TestRun\BeforeTestRun\FourDecisionResponsibilityConfirm.aspx" />
     <Content Include="TestRun\BeforeTestRun\FourDecisionResponsibilityConfirmEdit.aspx" />
+    <Content Include="TestRun\BeforeTestRun\IDPPreRunDataDetail.aspx" />
     <Content Include="TestRun\BeforeTestRun\InspectTailTermEdit.aspx" />
     <Content Include="TestRun\BeforeTestRun\InspectTailTermList.aspx" />
     <Content Include="TestRun\BeforeTestRun\InspectTemplate.aspx" />
@@ -1934,7 +1935,10 @@
     <Content Include="TestRun\BeforeTestRun\InspectWanderAboutAllPassList.aspx" />
     <Content Include="TestRun\BeforeTestRun\InspectWanderAboutConfirm.aspx" />
     <Content Include="TestRun\BeforeTestRun\InspectWanderAboutList.aspx" />
+    <Content Include="TestRun\BeforeTestRun\SelectIDPEquipment.aspx" />
+    <Content Include="TestRun\BeforeTestRun\SelectIDPInstrumentation.aspx" />
     <Content Include="TestRun\BeforeTestRun\SelectInstrument.aspx" />
+    <Content Include="TestRun\BeforeTestRun\SelectIDPPiping.aspx" />
     <Content Include="TestRun\BeforeTestRun\SelectProperty.aspx" />
     <Content Include="TestRun\BeforeTestRun\SelectTailTermList.aspx" />
     <Content Include="TestRun\BeforeTestRun\SelectTechnology.aspx" />
@@ -1946,6 +1950,7 @@
     <Content Include="TestRun\BeforeTestRun\SubThreeChecksFourDecisionEdit.aspx" />
     <Content Include="TestRun\BeforeTestRun\SubThreeChecksFourDecisionList.aspx" />
     <Content Include="TestRun\BeforeTestRun\SubWorkInspect.aspx" />
+    <Content Include="TestRun\BeforeTestRun\IDPPreRunData.aspx" />
     <Content Include="TestRun\BeforeTestRun\SysPipingDeviceImport.aspx" />
     <Content Include="TestRun\BeforeTestRun\TailTermApprove.aspx" />
     <Content Include="TestRun\BeforeTestRun\TailTermApproveList.aspx" />
@@ -16760,6 +16765,13 @@
     <Compile Include="TestRun\BeforeTestRun\FourDecisionResponsibilityConfirmEdit.aspx.designer.cs">
       <DependentUpon>FourDecisionResponsibilityConfirmEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="TestRun\BeforeTestRun\IDPPreRunDataDetail.aspx.cs">
+      <DependentUpon>IDPPreRunDataDetail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\BeforeTestRun\IDPPreRunDataDetail.aspx.designer.cs">
+      <DependentUpon>IDPPreRunDataDetail.aspx</DependentUpon>
+    </Compile>
     <Compile Include="TestRun\BeforeTestRun\InspectTailTermEdit.aspx.cs">
       <DependentUpon>InspectTailTermEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16816,6 +16828,20 @@
     <Compile Include="TestRun\BeforeTestRun\InspectWanderAboutList.aspx.designer.cs">
       <DependentUpon>InspectWanderAboutList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="TestRun\BeforeTestRun\SelectIDPEquipment.aspx.cs">
+      <DependentUpon>SelectIDPEquipment.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\BeforeTestRun\SelectIDPEquipment.aspx.designer.cs">
+      <DependentUpon>SelectIDPEquipment.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="TestRun\BeforeTestRun\SelectIDPInstrumentation.aspx.cs">
+      <DependentUpon>SelectIDPInstrumentation.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\BeforeTestRun\SelectIDPInstrumentation.aspx.designer.cs">
+      <DependentUpon>SelectIDPInstrumentation.aspx</DependentUpon>
+    </Compile>
     <Compile Include="TestRun\BeforeTestRun\SelectInstrument.aspx.cs">
       <DependentUpon>SelectInstrument.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16823,6 +16849,13 @@
     <Compile Include="TestRun\BeforeTestRun\SelectInstrument.aspx.designer.cs">
       <DependentUpon>SelectInstrument.aspx</DependentUpon>
     </Compile>
+    <Compile Include="TestRun\BeforeTestRun\SelectIDPPiping.aspx.cs">
+      <DependentUpon>SelectIDPPiping.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\BeforeTestRun\SelectIDPPiping.aspx.designer.cs">
+      <DependentUpon>SelectIDPPiping.aspx</DependentUpon>
+    </Compile>
     <Compile Include="TestRun\BeforeTestRun\SelectProperty.aspx.cs">
       <DependentUpon>SelectProperty.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16900,6 +16933,13 @@
     <Compile Include="TestRun\BeforeTestRun\SubWorkInspect.aspx.designer.cs">
       <DependentUpon>SubWorkInspect.aspx</DependentUpon>
     </Compile>
+    <Compile Include="TestRun\BeforeTestRun\IDPPreRunData.aspx.cs">
+      <DependentUpon>IDPPreRunData.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\BeforeTestRun\IDPPreRunData.aspx.designer.cs">
+      <DependentUpon>IDPPreRunData.aspx</DependentUpon>
+    </Compile>
     <Compile Include="TestRun\BeforeTestRun\SysPipingDeviceImport.aspx.cs">
       <DependentUpon>SysPipingDeviceImport.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx

@@ -14,14 +14,22 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtTotalWeldQuantity" runat="server" Label="总达因数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
-                        <f:TextBox ID="txtTotalCompleted" runat="server" Label="完成达因数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
+                        <f:NumberBox ID="txtTotalWeldQuantity" NoDecimal="false" NoNegative="true" MinValue="0" runat="server" Label="总达因数">
+                        </f:NumberBox>
+                        <f:NumberBox ID="txtTotalCompleted" NoDecimal="false" NoNegative="true" MinValue="0" runat="server" Label="完成达因数">
+                        </f:NumberBox>
+                        <%-- <f:TextBox ID="txtTotalWeldQuantity" runat="server" Label="总达因数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
+                        <f:TextBox ID="txtTotalCompleted" runat="server" Label="完成达因数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>--%>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtOneTimeFilmAmount" runat="server" Label="总片数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
-                        <f:TextBox ID="txtOneTimeFilmQualifiedAmount" runat="server" Label="合格片数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
+                        <f:NumberBox ID="txtOneTimeFilmAmount" NoDecimal="true" NoNegative="true" MinValue="0" runat="server" Label="总片数">
+                        </f:NumberBox>
+                        <f:NumberBox ID="txtOneTimeFilmQualifiedAmount" NoDecimal="true" NoNegative="true" MinValue="0" runat="server" Label="合格片数">
+                        </f:NumberBox>
+                        <%-- <f:TextBox ID="txtOneTimeFilmAmount" runat="server" Label="总片数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
+                        <f:TextBox ID="txtOneTimeFilmQualifiedAmount" runat="server" Label="合格片数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>--%>
                     </Items>
                 </f:FormRow>
             </Rows>
@@ -30,7 +38,7 @@
                     <Items>
                         <f:HiddenField ID="hdAttachUrl" runat="server">
                         </f:HiddenField>
-                            <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click">
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click">
                         </f:Button>
                     </Items>
                 </f:Toolbar>

SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.FL {
-    
-    
-    public partial class HJGLDataEdit {
-        
+namespace FineUIPro.Web.HJGL.FL
+{
+
+
+    public partial class HJGLDataEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.FL {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.FL {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.FL {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtTotalWeldQuantity 控件。
         /// </summary>
@@ -46,8 +48,8 @@ namespace FineUIPro.Web.HJGL.FL {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtTotalWeldQuantity;
-        
+        protected global::FineUIPro.NumberBox txtTotalWeldQuantity;
+
         /// <summary>
         /// txtTotalCompleted 控件。
         /// </summary>
@@ -55,8 +57,8 @@ namespace FineUIPro.Web.HJGL.FL {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtTotalCompleted;
-        
+        protected global::FineUIPro.NumberBox txtTotalCompleted;
+
         /// <summary>
         /// txtOneTimeFilmAmount 控件。
         /// </summary>
@@ -64,8 +66,8 @@ namespace FineUIPro.Web.HJGL.FL {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtOneTimeFilmAmount;
-        
+        protected global::FineUIPro.NumberBox txtOneTimeFilmAmount;
+
         /// <summary>
         /// txtOneTimeFilmQualifiedAmount 控件。
         /// </summary>
@@ -73,8 +75,8 @@ namespace FineUIPro.Web.HJGL.FL {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtOneTimeFilmQualifiedAmount;
-        
+        protected global::FineUIPro.NumberBox txtOneTimeFilmQualifiedAmount;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.FL {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// hdAttachUrl 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.FL {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdAttachUrl;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>

SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx

@@ -22,7 +22,7 @@
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目信息" 
                 EnableCollapse="true" runat="server" BoxFlex="1"  EnableColumnLines="true" 
                 DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" SortField="ProjectCode" SortDirection="DESC"  
-                OnSort="Grid1_Sort"  AllowPaging="true" IsDatabasePaging="true"  PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" 
+                OnSort="Grid1_Sort"  AllowPaging="false" IsDatabasePaging="false"  PageSize="1000" OnPageIndexChange="Grid1_PageIndexChange" 
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" EnableCheckBoxSelect="true" EnableMultiSelect="true" OnRowCommand="Grid1_RowCommand">
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/IDPPreRunData.aspx

@@ -0,0 +1,369 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="IDPPreRunData.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.IDPPreRunData" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>子系统工作包管理</title>
+    <style>
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true" AutoScroll="true" AutoPostBack="true"
+                    TabPosition="Top" MarginBottom="30px" EnableTabCloseMenu="false" runat="server" OnTabIndexChanged="TabStrip1_TabIndexChanged"
+                    ActiveTabIndex="0">
+                    <Tabs>
+                        <f:Tab Title="管道一览表" BodyPadding="10px" Layout="Fit" runat="server">
+                            <Items>
+                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道一览表" EnableCollapse="true"
+                                    runat="server" BoxFlex="1" DataKeyNames="ItemId" DataIDField="ItemId" AllowSorting="true"
+                                    SortField="WbsCode,PipingCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange"
+                                    EnableTextSelection="True" OnRowCommand="PipingGrid_RowCommand" AllowColumnLocking="true">
+                                    <Toolbars>
+                                        <f:Toolbar ID="Toolbar1" runat="server">
+                                            <Items>
+                                                <f:ToolbarFill ID="ToolbarFill" runat="server"></f:ToolbarFill>
+                                                <f:Button ID="btnGetIDPData" Text="获取更新" ToolTip="获取更新" Icon="TableSave" runat="server" OnClick="btnGetIDPData_Click"></f:Button>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars>
+                                    <Columns>
+                                        <f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                                        <f:GroupField HeaderText="装置工序主项" TextAlign="Center" EnableLock="true" Locked="true">
+                                            <Columns>
+                                                <f:RenderField HeaderText="装置工序主项码" ColumnID="WbsCode" DataField="WbsCode" SortField="WbsCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="装置码" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="工序码" ColumnID="ProcessesCode" DataField="ProcessesCode" SortField="ProcessesCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="主项码" ColumnID="SubjectCode" DataField="SubjectCode" SortField="SubjectCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:RenderField HeaderText="管道号" ColumnID="PipingCode" DataField="PipingCode" SortField="PipingCode"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px" EnableLock="true" Locked="true">
+                                        </f:RenderField>
+                                        <f:GroupField HeaderText="管道说明" TextAlign="Center">
+                                            <Columns>
+                                                <f:GroupField HeaderText="公称" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="直径" ColumnID="Diameter" DataField="Diameter" HtmlEncode="false"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                                <f:RenderField HeaderText="管道材料等级" ColumnID="MaterialLevel" DataField="MaterialLevel"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                                                </f:RenderField>
+                                                <f:GroupField HeaderText="绝热伴热" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="类型" ColumnID="AdiabatType" DataField="AdiabatType"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                        <f:RenderField HeaderText="厚度mm" ColumnID="AdiabatThickness" DataField="AdiabatThickness"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                                <f:GroupField HeaderText="介质" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="相态" ColumnID="MediumState" DataField="MediumState"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                                <f:GroupField HeaderText="P&ID图号" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="起点" ColumnID="DrawingStartNo" DataField="DrawingStartNo"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                        <f:RenderField HeaderText="止点" ColumnID="DrawingEndNo" DataField="DrawingEndNo"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                                <f:GroupField HeaderText="管道起止点" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="起点" ColumnID="PipingStart" DataField="PipingStart"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                        <f:RenderField HeaderText="止点" ColumnID="PipingEnd" DataField="PipingEnd"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="压力" TextAlign="Center">
+                                            <Columns>
+                                                <f:GroupField HeaderText="管道" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="级别" ColumnID="PipingLevel" DataField="PipingLevel"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="正常条件" TextAlign="Center">
+                                            <Columns>
+                                                <f:GroupField HeaderText="温度" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="℃" ColumnID="NormalTemperature" DataField="NormalTemperature"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                                <f:GroupField HeaderText="压力" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="MPaG" ColumnID="NormalPressure" DataField="NormalPressure"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="设计条件" TextAlign="Center">
+                                            <Columns>
+                                                <f:GroupField HeaderText="温度" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="℃" ColumnID="DesignTemperature" DataField="DesignTemperature"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                                <f:GroupField HeaderText="压力" TextAlign="Center">
+                                                    <Columns>
+                                                        <f:RenderField HeaderText="MPaG" ColumnID="DesignPressure" DataField="DesignPressure"
+                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                        </f:RenderField>
+                                                    </Columns>
+                                                </f:GroupField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:RenderField HeaderText="涂漆等级" ColumnID="PaintLevel" DataField="PaintLevel"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
+                                        </f:RenderField>
+                                        <f:LinkButtonField Width="100px" ConfirmTarget="Top" Text="查看明细" CommandName="Detail" />
+                                    </Columns>
+                                    <Listeners>
+                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                    </Listeners>
+                                    <PageItems>
+                                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                        </f:ToolbarSeparator>
+                                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                    </PageItems>
+                                </f:Grid>
+                            </Items>
+                        </f:Tab>
+                        <f:Tab Title="设备一览表" BodyPadding="10px" Layout="Fit" runat="server">
+                            <Items>
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="设备一览表" EnableCollapse="true"
+                                    runat="server" BoxFlex="1" DataKeyNames="ItemId" DataIDField="ItemId" AllowSorting="true"
+                                    SortField="WbsCode,TagNumber" SortDirection="ASC" OnSort="Grid2_Sort" EnableColumnLines="true" AllowPaging="true"
+                                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid2_PageIndexChange"
+                                    EnableTextSelection="True" OnRowCommand="EquipmentGrid_RowCommand" AllowColumnLocking="true">
+                                    <Toolbars>
+                                        <f:Toolbar ID="Toolbar2" runat="server">
+                                            <Items>
+                                                <f:ToolbarFill ID="ToolbarFill2" runat="server"></f:ToolbarFill>
+                                                <f:Button ID="btnGetIDPData2" Text="获取更新" ToolTip="获取更新" Icon="TableSave" runat="server" OnClick="btnGetIDPData2_Click"></f:Button>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars>
+                                    <Columns>
+                                        <f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                                        <f:GroupField HeaderText="装置工序主项" TextAlign="Center" EnableLock="true" Locked="true">
+                                            <Columns>
+                                                <f:RenderField HeaderText="装置工序主项码" ColumnID="WbsCode" DataField="WbsCode" SortField="WbsCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="装置码" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="工序码" ColumnID="ProcessesCode" DataField="ProcessesCode" SortField="ProcessesCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="主项码" ColumnID="SubjectCode" DataField="SubjectCode" SortField="SubjectCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:RenderField HeaderText="设备位号" ColumnID="TagNumber" DataField="TagNumber" SortField="TagNumber"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px" EnableLock="true" Locked="true">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="设备名称和规格" ColumnID="NameSpecifications" DataField="NameSpecifications"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="350px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="图号或型号" ColumnID="DrawingNo" DataField="DrawingNo"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="制造材料" ColumnID="Materials" DataField="Materials"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="220px">
+                                        </f:RenderField>
+                                        <f:GroupField HeaderText="数量" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField HeaderText="操作" ColumnID="NumOperate" DataField="NumOperate" SortField="NumOperate"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="备用" ColumnID="NumStandby" DataField="NumStandby" SortField="NumStandby"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="重量（kg）" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField HeaderText="单重" ColumnID="WeightSingle" DataField="WeightSingle" SortField="WeightSingle"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="总重" ColumnID="WeightTotal" DataField="WeightTotal" SortField="WeightTotal"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px">
+                                        </f:RenderField>
+                                        <f:LinkButtonField Width="100px" ConfirmTarget="Top" Text="查看明细" CommandName="Detail" />
+                                    </Columns>
+                                    <Listeners>
+                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                    </Listeners>
+                                    <PageItems>
+                                        <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                                        </f:ToolbarSeparator>
+                                        <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize2" Width="80px" AutoPostBack="true"
+                                            OnSelectedIndexChanged="ddlPageSize2_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                    </PageItems>
+                                </f:Grid>
+                            </Items>
+                        </f:Tab>
+                        <f:Tab Title="仪表索引" BodyPadding="10px" Layout="Fit" runat="server">
+                            <Items>
+                                <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" Title="仪表索引" EnableCollapse="true"
+                                    runat="server" BoxFlex="1" DataKeyNames="ItemId" DataIDField="ItemId" AllowSorting="true" MarginRight="15px"
+                                    SortField="InstrumentTag" SortDirection="ASC" OnSort="Grid3_Sort" EnableColumnLines="true" AllowPaging="true"
+                                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid3_PageIndexChange"
+                                    EnableTextSelection="True" OnRowCommand="InstrumentationGrid_RowCommand" AllowColumnLocking="true">
+                                    <Toolbars>
+                                        <f:Toolbar ID="Toolbar3" runat="server">
+                                            <Items>
+                                                <f:ToolbarFill ID="ToolbarFill3" runat="server"></f:ToolbarFill>
+                                                <f:Button ID="btnGetIDPData3" Text="获取更新" ToolTip="获取更新" Icon="TableSave" runat="server" OnClick="btnGetIDPData3_Click"></f:Button>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars>
+                                    <Columns>
+                                        <f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                                        <f:GroupField HeaderText="装置工序主项" TextAlign="Center" EnableLock="true" Locked="true">
+                                            <Columns>
+                                                <f:RenderField HeaderText="装置工序主项码" ColumnID="WbsCode" DataField="WbsCode" SortField="WbsCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="装置码" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="工序码" ColumnID="ProcessesCode" DataField="ProcessesCode" SortField="ProcessesCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                                <f:RenderField HeaderText="主项码" ColumnID="SubjectCode" DataField="SubjectCode" SortField="SubjectCode"
+                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:RenderField HeaderText="仪表位号" ColumnID="InstrumentTag" DataField="InstrumentTag" HeaderTextAlign="Center" TextAlign="Center" EnableLock="true" Locked="true">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="用途" ColumnID="UseTo" DataField="UseTo" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="仪表名称" ColumnID="InstrumentName" DataField="InstrumentName" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="供货方" ColumnID="Supplier" DataField="Supplier" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="安装位置" ColumnID="InstallationPosition" DataField="InstallationPosition" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="信号类型" ColumnID="SignalType" DataField="SignalType" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="关联系统" ColumnID="AssociatedSystem" DataField="AssociatedSystem" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                        <f:GroupField HeaderText="P&ID" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField HeaderText="CP25" ColumnID="Cp25" DataField="Cp25" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="数据表" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField HeaderText="IN11" ColumnID="In11" DataField="In11" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="仪表位置图" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField HeaderText="IN40" ColumnID="In40" DataField="In40" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                                        </f:RenderField>
+                                        <f:LinkButtonField Width="100px" ConfirmTarget="Top" Text="查看明细" CommandName="Detail" />
+                                    </Columns>
+                                    <Listeners>
+                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                    </Listeners>
+                                    <PageItems>
+                                        <f:ToolbarSeparator ID="ToolbarSeparator3" runat="server">
+                                        </f:ToolbarSeparator>
+                                        <f:ToolbarText ID="ToolbarText3" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize3" Width="80px" AutoPostBack="true"
+                                            OnSelectedIndexChanged="ddlPageSize3_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                    </PageItems>
+                                </f:Grid>
+                            </Items>
+                        </f:Tab>
+                    </Tabs>
+                </f:TabStrip>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="IDP试车数据明细" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="true" runat="server" IsModal="true"
+            Width="900px" Height="600px">
+        </f:Window>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/IDPPreRunData.aspx.cs

@@ -0,0 +1,397 @@
+using BLL;
+using Model;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Threading.Tasks;
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+    public partial class IDPPreRunData : PageBase
+    {
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                Funs.DropDownPageSize(this.ddlPageSize);
+                Funs.DropDownPageSize(this.ddlPageSize2);
+                Funs.DropDownPageSize(this.ddlPageSize3);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                ddlPageSize2.SelectedValue = Grid2.PageSize.ToString();
+                ddlPageSize3.SelectedValue = Grid3.PageSize.ToString();
+                BindPipingGrid();
+            }
+        }
+
+        /// <summary>
+        /// Tab切换
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
+        {
+            if (TabStrip1.ActiveTabIndex == 1)
+            {
+                if (this.Grid2.Rows.Count == 0)
+                {
+                    BindEquipmentGrid();
+                }
+            }
+            else if (TabStrip1.ActiveTabIndex == 2)
+            {
+                if (this.Grid3.Rows.Count == 0)
+                {
+                    BindInstrumentationGrid();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 从IDP获取数据
+        /// </summary>
+        protected void btnGetIDPData_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                string msg = GetIDPPreRunData(1);
+                if (!string.IsNullOrWhiteSpace(msg))
+                {
+                    if (msg.Contains("成功"))
+                    {
+                        ShowNotify(msg);
+                        BindPipingGrid();
+                    }
+                    else
+                    {
+                        ShowNotify(msg, MessageBoxIcon.Error);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowNotify(ex.Message, MessageBoxIcon.Error);
+            }
+        }
+
+
+        /// <summary>
+        /// 从IDP获取数据
+        /// </summary>
+        protected void btnGetIDPData2_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                string msg = GetIDPPreRunData(2);
+                if (!string.IsNullOrWhiteSpace(msg))
+                {
+                    if (msg.Contains("成功"))
+                    {
+                        ShowNotify(msg);
+                        BindEquipmentGrid();
+                    }
+                    else
+                    {
+                        ShowNotify(msg, MessageBoxIcon.Error);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowNotify(ex.Message, MessageBoxIcon.Error);
+            }
+        }
+
+
+        #region 管道一览表
+
+        /// <summary>
+        /// 行点击事件
+        /// </summary>
+        protected void PipingGrid_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            if (e.CommandName == "Detail")
+            {
+                string itemId = e.RowID;
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("IDPPreRunDataDetail.aspx?Type=1&ItemId={0}", itemId)));
+            }
+        }
+
+        /// <summary>
+        /// 获取IDP试车数据
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        private string GetIDPPreRunData(int type)
+        {
+            string result = string.Empty;
+            var session = IDPDataService.GetAuthenticationSession();
+
+            if (type == 1)
+            {
+                string pipingMsg = IDPDataService.GetIDPProjectPreRunDataPiping(session, this.ProjectId);
+                result = pipingMsg;
+            }
+            else if (type == 2)
+            {
+                string equipmentMsg = IDPDataService.GetIDPProjectPreRunDataEquipment(session, this.ProjectId);
+                result = equipmentMsg;
+            }
+            else if (type == 3)
+            {
+                string instrumentationMsg = IDPDataService.GetIDPProjectPreRunDataInstrumentation(session, this.ProjectId);
+                result = instrumentationMsg;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// IDP项目管道数据
+        /// </summary>
+        private void BindPipingGrid()
+        {
+            string strSql = @"select * from IDP_PreRunData_Piping p where 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (!string.IsNullOrWhiteSpace(this.ProjectId))
+            {
+                strSql += " AND p.ProjectId = @projectId";
+                listStr.Add(new SqlParameter("@projectId", this.ProjectId));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindPipingGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindPipingGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindPipingGrid();
+        }
+        #endregion
+
+        #endregion
+
+
+        #region 设备一览表
+
+        /// <summary>
+        /// 行点击事件
+        /// </summary>
+        protected void EquipmentGrid_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            if (e.CommandName == "Detail")
+            {
+                string itemId = e.RowID;
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("IDPPreRunDataDetail.aspx?Type=2&ItemId={0}", itemId)));
+            }
+        }
+
+        /// <summary>
+        /// IDP项目管道数据
+        /// </summary>
+        private void BindEquipmentGrid()
+        {
+            string strSql = @"select * from IDP_PreRunData_Equipment p where 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (!string.IsNullOrWhiteSpace(this.ProjectId))
+            {
+                strSql += " AND p.ProjectId = @projectId";
+                listStr.Add(new SqlParameter("@projectId", this.ProjectId));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid2.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid2, tb);
+            Grid2.DataSource = table;
+            Grid2.DataBind();
+        }
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindEquipmentGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_Sort(object sender, GridSortEventArgs e)
+        {
+            BindEquipmentGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue);
+            BindEquipmentGrid();
+        }
+        #endregion
+
+
+        #endregion
+
+     
+        #region 仪表索引
+
+        /// <summary>
+        /// 行点击事件
+        /// </summary>
+        protected void InstrumentationGrid_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            if (e.CommandName == "Detail")
+            {
+                string itemId = e.RowID;
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("IDPPreRunDataDetail.aspx?Type=3&ItemId={0}", itemId)));
+            }
+        }
+
+        /// <summary>
+        /// 从IDP获取数据
+        /// </summary>
+        protected void btnGetIDPData3_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                string msg = GetIDPPreRunData(3);
+                if (!string.IsNullOrWhiteSpace(msg))
+                {
+                    if (msg.Contains("成功"))
+                    {
+                        ShowNotify(msg);
+                        BindInstrumentationGrid();
+                    }
+                    else
+                    {
+                        ShowNotify(msg, MessageBoxIcon.Error);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowNotify(ex.Message, MessageBoxIcon.Error);
+            }
+        }
+
+        /// <summary>
+        /// IDP项目仪表索引数据
+        /// </summary>
+        private void BindInstrumentationGrid()
+        {
+            string strSql = @"select * from IDP_PreRunData_Instrumentation p where 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (!string.IsNullOrWhiteSpace(this.ProjectId))
+            {
+                strSql += " AND p.ProjectId = @projectId";
+                listStr.Add(new SqlParameter("@projectId", this.ProjectId));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid3.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid3, tb);
+            Grid3.DataSource = table;
+            Grid3.DataBind();
+        }
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid3_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindInstrumentationGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid3_Sort(object sender, GridSortEventArgs e)
+        {
+            BindInstrumentationGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize3_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid3.PageSize = Convert.ToInt32(ddlPageSize3.SelectedValue);
+            BindInstrumentationGrid();
+        }
+        #endregion
+
+        #endregion
+
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/IDPPreRunData.aspx.designer.cs

@@ -0,0 +1,251 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+
+
+    public partial class IDPPreRunData
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ToolbarFill 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill;
+
+        /// <summary>
+        /// btnGetIDPData 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnGetIDPData;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// ToolbarFill2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill2;
+
+        /// <summary>
+        /// btnGetIDPData2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnGetIDPData2;
+
+        /// <summary>
+        /// ToolbarSeparator2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
+
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+
+        /// <summary>
+        /// ddlPageSize2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize2;
+
+        /// <summary>
+        /// Grid3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid3;
+
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// ToolbarFill3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill3;
+
+        /// <summary>
+        /// btnGetIDPData3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnGetIDPData3;
+
+        /// <summary>
+        /// ToolbarSeparator3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator3;
+
+        /// <summary>
+        /// ToolbarText3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText3;
+
+        /// <summary>
+        /// ddlPageSize3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize3;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/IDPPreRunDataDetail.aspx

@@ -0,0 +1,40 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="IDPPreRunDataDetail.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.IDPPreRunDataDetail" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>IDP试车数据明细</title>
+    <style>
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="IDP试车数据明细" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtDetaiilContent" runat="server" Height="500px" MaxLength="1000">
+                        </f:TextArea>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/IDPPreRunDataDetail.aspx.cs

@@ -0,0 +1,69 @@
+using BLL;
+using Model;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Threading.Tasks;
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+    public partial class IDPPreRunDataDetail : PageBase
+    {
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                string Type = Request.Params["Type"];
+                string ItemId = Request.Params["ItemId"];
+                if (Type == "1")
+                {
+                    Model.IDP_PreRunData_Piping model = BLL.IDPPreRunDataService.GetPipingById(ItemId);
+                    if (model != null)
+                    {
+                        this.txtDetaiilContent.Text = model.DetailInfo;
+                    }
+                }
+                else if (Type == "2")
+                {
+                    Model.IDP_PreRunData_Equipment model = BLL.IDPPreRunDataService.GetEquipmentById(ItemId);
+                    if (model != null)
+                    {
+                        this.txtDetaiilContent.Text = model.DetailInfo;
+                    }
+                }
+                else if (Type == "3")
+                {
+                    Model.IDP_PreRunData_Instrumentation model = BLL.IDPPreRunDataService.GetInstrumentationById(ItemId);
+                    if (model != null)
+                    {
+                        this.txtDetaiilContent.Text = model.DetailInfo;
+                    }
+                }
+            }
+        }
+
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/IDPPreRunDataDetail.aspx.designer.cs

@@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+
+
+    public partial class IDPPreRunDataDetail
+    {
+
+        /// <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>
+        /// txtDetaiilContent 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtDetaiilContent;
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectIDPEquipment.aspx

@@ -0,0 +1,115 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SelectIDPEquipment.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.SelectIDPEquipment" %>
+
+<!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="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="ItemId" DataIDField="ItemId"
+                    AllowSorting="true" SortField="WbsCode,TagNumber" SortDirection="ASC" OnSort="Grid1_Sort" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" KeepCurrentSelection="true"
+                    EnableTextSelection="True" EnableCheckBoxSelect="true" AllowColumnLocking="true">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnSave" Icon="Accept" runat="server" OnClick="btnSave_Click" ToolTip="确认">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:GroupField HeaderText="装置工序主项" TextAlign="Center" EnableLock="true" Locked="true">
+                            <Columns>
+                                <f:RenderField HeaderText="装置工序主项码" ColumnID="WbsCode" DataField="WbsCode" SortField="WbsCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="装置码" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="工序码" ColumnID="ProcessesCode" DataField="ProcessesCode" SortField="ProcessesCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="主项码" ColumnID="SubjectCode" DataField="SubjectCode" SortField="SubjectCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:RenderField HeaderText="设备位号" ColumnID="TagNumber" DataField="TagNumber" SortField="TagNumber"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px" EnableLock="true" Locked="true">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="设备名称和规格" ColumnID="NameSpecifications" DataField="NameSpecifications"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="350px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="图号或型号" ColumnID="DrawingNo" DataField="DrawingNo"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="制造材料" ColumnID="Materials" DataField="Materials"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="220px">
+                        </f:RenderField>
+                        <f:GroupField HeaderText="数量" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="操作" ColumnID="NumOperate" DataField="NumOperate" SortField="NumOperate"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="备用" ColumnID="NumStandby" DataField="NumStandby" SortField="NumStandby"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="重量（kg）" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="单重" ColumnID="WeightSingle" DataField="WeightSingle" SortField="WeightSingle"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="总重" ColumnID="WeightTotal" DataField="WeightTotal" SortField="WeightTotal"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px">
+                        </f:RenderField>
+                        <%--<f:LinkButtonField Width="100px" ConfirmTarget="Top" Text="查看明细" CommandName="Detail" />--%>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged1">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectIDPEquipment.aspx.cs

@@ -0,0 +1,195 @@
+using BLL;
+using Model;
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+    public partial class SelectIDPEquipment : PageBase
+    {
+        /// <summary>
+        /// ProjectId
+        /// </summary>
+        public string ProjectId
+        {
+            get { return (string)ViewState["ProjectId"]; }
+            set { ViewState["ProjectId"] = value; }
+        }
+        ///// <summary>
+        ///// 子系统id
+        ///// </summary>
+        //public string SubSystemId
+        //{
+        //    get { return (string)ViewState["SubSystemId"]; }
+        //    set { ViewState["SubSystemId"] = value; }
+        //}
+
+        /// <summary>
+        /// 系统id
+        /// </summary>
+        public string SystemId
+        {
+            get { return (string)ViewState["SystemId"]; }
+            set { ViewState["SystemId"] = value; }
+        }
+
+        ///// <summary>
+        ///// 选中的id
+        ///// </summary>
+        //public string SelectPropertyIds
+        //{
+        //    get { return (string)ViewState["SelectPropertyIds"]; }
+        //    set { ViewState["SelectPropertyIds"] = value; }
+        //}
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                //this.SubSystemId = Request["SubSystemId"];
+                this.SystemId = Request["SystemId"];
+                //this.SelectPropertyIds = Request["SelectPropertyIds"];
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select * from IDP_PreRunData_Equipment where ProjectId=@ProjectId and ItemId not in (select TechnologyId from PreRun_TechnologySysPiping) ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        #region 确认
+
+        /// <summary>
+        /// 确认
+        /// </summary>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var lastSysPiping = Funs.DB.PreRun_TechnologySysPiping.Where(x => x.ProjectId == this.ProjectId && x.SystemId == this.SystemId).OrderByDescending(x => x.Sort).FirstOrDefault();
+            int sortIndex = lastSysPiping != null ? (int)lastSysPiping.Sort + 1 : 1;
+            foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+            {
+                this.SaveData(Grid1.DataKeys[rowIndex][0].ToString(),  sortIndex);
+                sortIndex++;
+            }
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        /// <param name="ItemId">被选中的管道Id</param>
+        /// <param name="weekItem">周信息</param>
+        /// <param name="sortIndex">计划排序</param>
+        private void SaveData(string ItemId, int sortIndex)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var item = db.IDP_PreRunData_Equipment.FirstOrDefault(x => x.ItemId == ItemId);
+            if (item != null)
+            {
+                Model.PreRun_TechnologySysPiping model = new Model.PreRun_TechnologySysPiping();
+                model.ProjectId = this.ProjectId;
+                model.SystemId = this.SystemId;
+                model.TechnologyId = item.ItemId;
+                model.TagNumber = item.TagNumber;
+                model.NameSpecifications = item.NameSpecifications;
+                model.DrawingNo = item.DrawingNo;
+                model.Materials = item.Materials;
+                model.NumOperate = item.NumOperate;
+                model.NumStandby = item.NumStandby;
+                model.WeightSingle = item.WeightSingle;
+                model.WeightTotal = item.WeightTotal;
+                model.Remark = item.Remark;
+                model.AddUser = this.CurrUser.UserId;
+                model.AddTime = DateTime.Now;
+                model.Sort = sortIndex;
+                db.PreRun_TechnologySysPiping.InsertOnSubmit(model);
+                db.SubmitChanges();
+            }
+        }
+
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉框
+        /// </summary>
+        protected void ddlPageSize_SelectedIndexChanged1(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        #endregion
+
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectIDPEquipment.aspx.designer.cs

@@ -0,0 +1,98 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+
+
+    public partial class SelectIDPEquipment
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// ToolbarSeparator2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
+
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectIDPInstrumentation.aspx

@@ -0,0 +1,114 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SelectIDPInstrumentation.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.SelectIDPInstrumentation" %>
+
+<!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="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="ItemId" DataIDField="ItemId"
+                    AllowSorting="true" SortField="WbsCode,InstrumentTag" SortDirection="ASC" OnSort="Grid1_Sort" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" KeepCurrentSelection="true"
+                    EnableTextSelection="True" EnableCheckBoxSelect="true" AllowColumnLocking="true">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnSave" Icon="Accept" runat="server" OnClick="btnSave_Click" ToolTip="确认">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:GroupField HeaderText="装置工序主项" TextAlign="Center" EnableLock="true" Locked="true">
+                            <Columns>
+                                <f:RenderField HeaderText="装置工序主项码" ColumnID="WbsCode" DataField="WbsCode" SortField="WbsCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="装置码" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="工序码" ColumnID="ProcessesCode" DataField="ProcessesCode" SortField="ProcessesCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="主项码" ColumnID="SubjectCode" DataField="SubjectCode" SortField="SubjectCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:RenderField HeaderText="仪表位号" ColumnID="InstrumentTag" DataField="InstrumentTag" HeaderTextAlign="Center" TextAlign="Center" EnableLock="true" Locked="true">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="用途" ColumnID="UseTo" DataField="UseTo" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="仪表名称" ColumnID="InstrumentName" DataField="InstrumentName" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="供货方" ColumnID="Supplier" DataField="Supplier" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="安装位置" ColumnID="InstallationPosition" DataField="InstallationPosition" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="信号类型" ColumnID="SignalType" DataField="SignalType" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="关联系统" ColumnID="AssociatedSystem" DataField="AssociatedSystem" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                        </f:RenderField>
+                        <f:GroupField HeaderText="P&ID" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="CP25" ColumnID="Cp25" DataField="Cp25" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="数据表" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="IN11" ColumnID="In11" DataField="In11" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="仪表位置图" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField HeaderText="IN40" ColumnID="In40" DataField="In40" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                        </f:RenderField>
+                        <%--<f:LinkButtonField Width="100px" ConfirmTarget="Top" Text="查看明细" CommandName="Detail" />--%>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged1">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectIDPInstrumentation.aspx.cs

@@ -0,0 +1,197 @@
+using BLL;
+using Model;
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+    public partial class SelectIDPInstrumentation : PageBase
+    {
+        /// <summary>
+        /// ProjectId
+        /// </summary>
+        public string ProjectId
+        {
+            get { return (string)ViewState["ProjectId"]; }
+            set { ViewState["ProjectId"] = value; }
+        }
+        ///// <summary>
+        ///// 子系统id
+        ///// </summary>
+        //public string SubSystemId
+        //{
+        //    get { return (string)ViewState["SubSystemId"]; }
+        //    set { ViewState["SubSystemId"] = value; }
+        //}
+
+        /// <summary>
+        /// 系统id
+        /// </summary>
+        public string SystemId
+        {
+            get { return (string)ViewState["SystemId"]; }
+            set { ViewState["SystemId"] = value; }
+        }
+
+        ///// <summary>
+        ///// 选中的id
+        ///// </summary>
+        //public string SelectPropertyIds
+        //{
+        //    get { return (string)ViewState["SelectPropertyIds"]; }
+        //    set { ViewState["SelectPropertyIds"] = value; }
+        //}
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                //this.SubSystemId = Request["SubSystemId"];
+                this.SystemId = Request["SystemId"];
+                //this.SelectPropertyIds = Request["SelectPropertyIds"];
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select * from IDP_PreRunData_Instrumentation where ProjectId=@ProjectId and ItemId not in (select InstrumentId from PreRun_InstrumentSysPiping) ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        #region 确认
+
+        /// <summary>
+        /// 确认
+        /// </summary>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var lastSysPiping = Funs.DB.PreRun_InstrumentSysPiping.Where(x => x.ProjectId == this.ProjectId && x.SystemId == this.SystemId).OrderByDescending(x => x.Sort).FirstOrDefault();
+            int sortIndex = lastSysPiping != null ? (int)lastSysPiping.Sort + 1 : 1;
+            foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+            {
+                this.SaveData(Grid1.DataKeys[rowIndex][0].ToString(),  sortIndex);
+                sortIndex++;
+            }
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        /// <param name="ItemId">被选中的仪表索引Id</param>
+        /// <param name="weekItem">周信息</param>
+        /// <param name="sortIndex">计划排序</param>
+        private void SaveData(string ItemId, int sortIndex)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var item = db.IDP_PreRunData_Instrumentation.FirstOrDefault(x => x.ItemId == ItemId);
+            if (item != null)
+            {
+                Model.PreRun_InstrumentSysPiping model = new Model.PreRun_InstrumentSysPiping();
+                model.ProjectId = this.ProjectId;
+                model.SystemId = this.SystemId;
+                model.InstrumentId = item.ItemId;
+                model.InstrumentTag = item.InstrumentTag;
+                model.UseTo = item.UseTo;
+                model.InstrumentName = item.InstrumentName;
+                model.Supplier = item.Supplier;
+                model.InstallationPosition = item.InstallationPosition;
+                model.SignalType = item.SignalType;
+                model.AssociatedSystem = item.AssociatedSystem;
+                model.Cp25 = item.Cp25;
+                model.In11 = item.In11;
+                model.In40 = item.In40;
+                model.Remark = item.Remark;
+                model.AddUser = this.CurrUser.UserId;
+                model.AddTime = DateTime.Now;
+                model.Sort = sortIndex;
+                db.PreRun_InstrumentSysPiping.InsertOnSubmit(model);
+                db.SubmitChanges();
+            }
+        }
+
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉框
+        /// </summary>
+        protected void ddlPageSize_SelectedIndexChanged1(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        #endregion
+
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectIDPInstrumentation.aspx.designer.cs

@@ -0,0 +1,98 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+
+
+    public partial class SelectIDPInstrumentation
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// ToolbarSeparator2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
+
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectIDPPiping.aspx

@@ -0,0 +1,187 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SelectIDPPiping.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.SelectIDPPiping" %>
+
+<!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="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="ItemId" DataIDField="ItemId" 
+                    AllowSorting="true" SortField="WbsCode,PipingCode" SortDirection="ASC" OnSort="Grid1_Sort" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" KeepCurrentSelection="true"
+                    EnableTextSelection="True" EnableCheckBoxSelect="true" AllowColumnLocking="true">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnSave" Icon="Accept" runat="server" OnClick="btnSave_Click" ToolTip="确认">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:GroupField HeaderText="装置工序主项" TextAlign="Center" EnableLock="true" Locked="true">
+                            <Columns>
+                                <f:RenderField HeaderText="装置工序主项码" ColumnID="WbsCode" DataField="WbsCode" SortField="WbsCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="装置码" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="工序码" ColumnID="ProcessesCode" DataField="ProcessesCode" SortField="ProcessesCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="主项码" ColumnID="SubjectCode" DataField="SubjectCode" SortField="SubjectCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px" EnableLock="true" Locked="true">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:RenderField HeaderText="管道号" ColumnID="PipingCode" DataField="PipingCode" SortField="PipingCode"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px" EnableLock="true" Locked="true">
+                        </f:RenderField>
+                        <f:GroupField HeaderText="管道说明" TextAlign="Center">
+                            <Columns>
+                                <f:GroupField HeaderText="公称" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="直径" ColumnID="Diameter" DataField="Diameter" HtmlEncode="false"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:RenderField HeaderText="管道材料等级" ColumnID="MaterialLevel" DataField="MaterialLevel"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
+                                </f:RenderField>
+                                <f:GroupField HeaderText="绝热伴热" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="类型" ColumnID="AdiabatType" DataField="AdiabatType"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="厚度mm" ColumnID="AdiabatThickness" DataField="AdiabatThickness"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField HeaderText="介质" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="相态" ColumnID="MediumState" DataField="MediumState"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField HeaderText="P&ID图号" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="起点" ColumnID="DrawingStartNo" DataField="DrawingStartNo"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="止点" ColumnID="DrawingEndNo" DataField="DrawingEndNo"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField HeaderText="管道起止点" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="起点" ColumnID="PipingStart" DataField="PipingStart"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="止点" ColumnID="PipingEnd" DataField="PipingEnd"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="压力" TextAlign="Center">
+                            <Columns>
+                                <f:GroupField HeaderText="管道" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="级别" ColumnID="PipingLevel" DataField="PipingLevel"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="正常条件" TextAlign="Center">
+                            <Columns>
+                                <f:GroupField HeaderText="温度" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="℃" ColumnID="NormalTemperature" DataField="NormalTemperature"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField HeaderText="压力" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="MPaG" ColumnID="NormalPressure" DataField="NormalPressure"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField HeaderText="设计条件" TextAlign="Center">
+                            <Columns>
+                                <f:GroupField HeaderText="温度" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="℃" ColumnID="DesignTemperature" DataField="DesignTemperature"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField HeaderText="压力" TextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="MPaG" ColumnID="DesignPressure" DataField="DesignPressure"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:RenderField HeaderText="涂漆等级" ColumnID="PaintLevel" DataField="PaintLevel"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
+                        </f:RenderField>
+                        <%--<f:LinkButtonField Width="100px" ConfirmTarget="Top" Text="查看明细" CommandName="Detail" />--%>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged1">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            return false;
+        }
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectIDPPiping.aspx.cs

@@ -0,0 +1,203 @@
+using BLL;
+using Model;
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+    public partial class SelectIDPPiping : PageBase
+    {
+        /// <summary>
+        /// ProjectId
+        /// </summary>
+        public string ProjectId
+        {
+            get { return (string)ViewState["ProjectId"]; }
+            set { ViewState["ProjectId"] = value; }
+        }
+        ///// <summary>
+        ///// 子系统id
+        ///// </summary>
+        //public string SubSystemId
+        //{
+        //    get { return (string)ViewState["SubSystemId"]; }
+        //    set { ViewState["SubSystemId"] = value; }
+        //}
+
+        /// <summary>
+        /// 系统id
+        /// </summary>
+        public string SystemId
+        {
+            get { return (string)ViewState["SystemId"]; }
+            set { ViewState["SystemId"] = value; }
+        }
+
+        ///// <summary>
+        ///// 选中的id
+        ///// </summary>
+        //public string SelectPropertyIds
+        //{
+        //    get { return (string)ViewState["SelectPropertyIds"]; }
+        //    set { ViewState["SelectPropertyIds"] = value; }
+        //}
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                //this.SubSystemId = Request["SubSystemId"];
+                this.SystemId = Request["SystemId"];
+                //this.SelectPropertyIds = Request["SelectPropertyIds"];
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select * from IDP_PreRunData_Piping where ProjectId=@ProjectId and ItemId not in (select PropertyId from PreRun_PropertySysPiping) ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        #region 确认
+
+        /// <summary>
+        /// 确认
+        /// </summary>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var lastSysPiping = Funs.DB.PreRun_PropertySysPiping.Where(x => x.ProjectId == this.ProjectId && x.SystemId == this.SystemId).OrderByDescending(x => x.Sort).FirstOrDefault();
+            int sortIndex = lastSysPiping != null ? (int)lastSysPiping.Sort + 1 : 1;
+            foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+            {
+                this.SaveData(Grid1.DataKeys[rowIndex][0].ToString(),  sortIndex);
+                sortIndex++;
+            }
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        /// <param name="ItemId">被选中的管道Id</param>
+        /// <param name="weekItem">周信息</param>
+        /// <param name="sortIndex">计划排序</param>
+        private void SaveData(string ItemId, int sortIndex)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var item = db.IDP_PreRunData_Piping.FirstOrDefault(x => x.ItemId == ItemId);
+            if (item != null)
+            {
+                Model.PreRun_PropertySysPiping model = new Model.PreRun_PropertySysPiping();
+                model.ProjectId = this.ProjectId;
+                model.SystemId = this.SystemId;
+                model.PropertyId = item.ItemId;
+                model.PipingCode = item.PipingCode;
+                model.Diameter = item.Diameter;
+                model.MaterialLevel = item.MaterialLevel;
+                model.AdiabatType = item.AdiabatType;
+                model.AdiabatThickness = item.AdiabatThickness;
+                model.MediumState = item.MediumState;
+                model.DrawingNo = item.DrawingStartNo;
+                model.DrawingEndNo = item.DrawingEndNo;
+                model.PipingStart = item.PipingStart;
+                model.PipingEnd = item.PipingEnd;
+                model.PipingLevel = item.PipingLevel;
+                model.NormalTemperature = item.NormalTemperature;
+                model.NormalPressure = item.NormalPressure;
+                model.DesignTemperature = item.DesignTemperature;
+                model.DesignPressure = item.DesignPressure;
+                model.PaintLevel = item.PaintLevel;
+                model.Remark = item.Remark;
+                model.AddUser = this.CurrUser.UserId;
+                model.AddTime = DateTime.Now;
+                model.Sort = sortIndex;
+                db.PreRun_PropertySysPiping.InsertOnSubmit(model);
+                db.SubmitChanges();
+            }
+        }
+
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉框
+        /// </summary>
+        protected void ddlPageSize_SelectedIndexChanged1(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        #endregion
+
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectIDPPiping.aspx.designer.cs

@@ -0,0 +1,98 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.BeforeTestRun
+{
+
+
+    public partial class SelectIDPPiping
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// ToolbarSeparator2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
+
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectInstrument.aspx.cs

@@ -56,15 +56,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select * from PreRun_InstrumentSysPiping where ProjectId=@ProjectId and SystemId=@SystemId ";
+            //string strSql = @"select * from PreRun_InstrumentSysPiping where ProjectId=@ProjectId and SystemId=@SystemId ";
+            string strSql = @"select * from PreRun_InstrumentSysPiping where ProjectId=@ProjectId and SystemId=@SystemId and InstrumentId not in (select InstrumentId from PreRun_SubInstrumentSelect) ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             listStr.Add(new SqlParameter("@SystemId", this.SystemId));
-            if (!string.IsNullOrWhiteSpace(SelectInstrumentIds))
-            {
-                var ids = SelectInstrumentIds.Split(',').ToList();
-                strSql += $" and InstrumentId not in ('{string.Join("','", ids)}')";
-            }
+            //if (!string.IsNullOrWhiteSpace(SelectInstrumentIds))
+            //{
+            //    var ids = SelectInstrumentIds.Split(',').ToList();
+            //    strSql += $" and InstrumentId not in ('{string.Join("','", ids)}')";
+            //}
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectProperty.aspx.cs

@@ -56,15 +56,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and PropertyId not in (select PropertyId from PreRun_SubPropertySelect where SystemId=@SystemId) ";
+            //string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and PropertyId not in (select PropertyId from PreRun_SubPropertySelect where SystemId=@SystemId) ";
+            string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and PropertyId not in (select PropertyId from PreRun_SubPropertySelect) ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             listStr.Add(new SqlParameter("@SystemId", this.SystemId));
-            if (!string.IsNullOrWhiteSpace(SelectPropertyIds))
-            {
-                var ids = SelectPropertyIds.Split(',').ToList();
-                strSql += $" and PropertyId not in ('{string.Join("','", ids)}')";
-            }
+            //if (!string.IsNullOrWhiteSpace(SelectPropertyIds))
+            //{
+            //    var ids = SelectPropertyIds.Split(',').ToList();
+            //    strSql += $" and PropertyId not in ('{string.Join("','", ids)}')";
+            //}
 
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectTechnology.aspx.cs

@@ -57,15 +57,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and TechnologyId not in (select TechnologyId from PreRun_SubTechnologySelect where SystemId=@SystemId) ";
+            //string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and TechnologyId not in (select TechnologyId from PreRun_SubTechnologySelect where SystemId=@SystemId) ";
+            string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and TechnologyId not in (select TechnologyId from PreRun_SubTechnologySelect ) ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             listStr.Add(new SqlParameter("@SystemId", this.SystemId));
-            if (!string.IsNullOrWhiteSpace(SelectTechnologyIds))
-            {
-                var ids = SelectTechnologyIds.Split(',').ToList();
-                strSql += $" and TechnologyId not in ('{string.Join("','", ids)}')";
-            }
+            //if (!string.IsNullOrWhiteSpace(SelectTechnologyIds))
+            //{
+            //    var ids = SelectTechnologyIds.Split(',').ToList();
+            //    strSql += $" and TechnologyId not in ('{string.Join("','", ids)}')";
+            //}
 
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx

@@ -34,6 +34,7 @@
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
                                 <f:HiddenField runat="server" ID="hdTrustID"></f:HiddenField>
+                                <f:Button ID="btnIDPPreRunData" Text="IDP工作包数据" ToolTip="IDP工作包数据" Icon="ApplicationViewDetail" runat="server" OnClick="btnIDPPreRunData_Click"></f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -83,13 +84,14 @@
                                                                         <f:Button ID="btnZxtgdImport" runat="server" OnClick="btnZxtgdImport_Click" Text="导入">
                                                                         </f:Button>
                                                                         <f:ToolbarFill ID="ToolbarFill" runat="server"></f:ToolbarFill>
+                                                                        <f:Button ID="btnIDPSelectPiping" Text="选择" ToolTip="从IDP工作包选择" Icon="TableSave" runat="server" OnClick="btnIDPSelectPiping_Click"></f:Button>
                                                                         <f:Button ID="btnGdDownLoad" runat="server" Icon="ApplicationGo" Text="管道模板下载" ToolTip="管道模板下载" OnClick="btnGdDownLoad_Click"></f:Button>
                                                                         <f:Button ID="btnZxtgdSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnZxtgdSave_Click"></f:Button>
                                                                     </Items>
                                                                 </f:Toolbar>
                                                             </Toolbars>
                                                             <Columns>
-                                                                <f:RowNumberField EnablePagingNumber="true" Width="100px" HeaderTextAlign="Center" TextAlign="Center" />
+                                                                <f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
                                                                 <f:GroupField HeaderText="管道说明" TextAlign="Center">
                                                                     <Columns>
                                                                         <f:RenderField HeaderText="管道号" ColumnID="PipingCode" HtmlEncode="false" DataField="PipingCode" SortField="PipingCode"
@@ -139,12 +141,22 @@
                                                                                 </f:RenderField>
                                                                             </Columns>
                                                                         </f:GroupField>
-                                                                        <f:RenderField HeaderText="P&ID图号" ColumnID="DrawingNo" HtmlEncode="false" DataField="DrawingNo" SortField="DrawingNo"
-                                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
-                                                                            <Editor>
-                                                                                <f:TextBox runat="server" ID="txtDrawingNo"></f:TextBox>
-                                                                            </Editor>
-                                                                        </f:RenderField>
+                                                                        <f:GroupField HeaderText="P&ID图号起止点" TextAlign="Center">
+                                                                            <Columns>
+                                                                                <f:RenderField HeaderText="起点" ColumnID="DrawingNo" HtmlEncode="false" DataField="DrawingNo" SortField="DrawingNo"
+                                                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                                                    <Editor>
+                                                                                        <f:TextBox runat="server" ID="txtDrawingNo"></f:TextBox>
+                                                                                    </Editor>
+                                                                                </f:RenderField>
+                                                                                <f:RenderField HeaderText="止点" ColumnID="DrawingEndNo" HtmlEncode="false" DataField="DrawingEndNo" SortField="DrawingEndNo"
+                                                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                                                    <Editor>
+                                                                                        <f:TextBox runat="server" ID="txtDrawingEndNo"></f:TextBox>
+                                                                                    </Editor>
+                                                                                </f:RenderField>
+                                                                            </Columns>
+                                                                        </f:GroupField>
                                                                         <f:GroupField HeaderText="管道起止点" TextAlign="Center">
                                                                             <Columns>
                                                                                 <f:RenderField HeaderText="起点" ColumnID="PipingStart" HtmlEncode="false" DataField="PipingStart" SortField="PipingStart"
@@ -270,13 +282,14 @@
                                                                         </f:FileUpload>
                                                                         <f:Button ID="btnZxtgyImport" runat="server" OnClick="btnZxtgyImport_Click" Text="导入"></f:Button>
                                                                         <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                                                        <f:Button ID="btnIDPSelectEquipment" Text="选择" ToolTip="选择" Icon="TableSave" runat="server" OnClick="btnIDPSelectEquipment_Click"></f:Button>
                                                                         <f:Button ID="btnGysbDownLoad" runat="server" Icon="ApplicationGo" Text="工艺设备模板下载" ToolTip="工艺设备模板下载" OnClick="btnGysbDownLoad_Click"></f:Button>
                                                                         <f:Button ID="btnZxtgySave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnZxtgySave_Click"></f:Button>
                                                                     </Items>
                                                                 </f:Toolbar>
                                                             </Toolbars>
                                                             <Columns>
-                                                                <f:RowNumberField EnablePagingNumber="true" Width="100px" HeaderTextAlign="Center" TextAlign="Center" />
+                                                                <f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
                                                                 <f:RenderField HeaderText="设备位号" ColumnID="TagNumber" HtmlEncode="false" DataField="TagNumber" SortField="TagNumber"
                                                                     FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
                                                                     <Editor>
@@ -284,7 +297,7 @@
                                                                     </Editor>
                                                                 </f:RenderField>
                                                                 <f:RenderField HeaderText="设备名称和规格" ColumnID="NameSpecifications" HtmlEncode="false" DataField="NameSpecifications" SortField="NameSpecifications"
-                                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="300px">
                                                                     <Editor>
                                                                         <f:TextBox runat="server" ID="txtNameSpecifications"></f:TextBox>
                                                                     </Editor>
@@ -296,7 +309,7 @@
                                                                     </Editor>
                                                                 </f:RenderField>
                                                                 <f:RenderField HeaderText="制造材料" ColumnID="Materials" HtmlEncode="false" DataField="Materials" SortField="Materials"
-                                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="200px">
                                                                     <Editor>
                                                                         <f:TextBox runat="server" ID="txtMaterials"></f:TextBox>
                                                                     </Editor>
@@ -310,7 +323,7 @@
                                                                             </Editor>
                                                                         </f:RenderField>
                                                                         <f:RenderField HeaderText="备用" ColumnID="NumStandby" HtmlEncode="false" DataField="NumStandby" SortField="NumStandby"
-                                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="180px">
                                                                             <Editor>
                                                                                 <f:TextBox runat="server" ID="txtNumStandby"></f:TextBox>
                                                                             </Editor>
@@ -372,13 +385,14 @@
                                                                         </f:FileUpload>
                                                                         <f:Button ID="btnZxtybImport" runat="server" OnClick="btnZxtybImport_Click" Text="导入"></f:Button>
                                                                         <f:ToolbarFill ID="ToolbarFill4" runat="server"></f:ToolbarFill>
+                                                                        <f:Button ID="btnIDPSelectInstrumentation" Text="选择" ToolTip="从IDP工作包选择" Icon="TableSave" runat="server" OnClick="btnIDPSelectInstrumentation_Click"></f:Button>
                                                                         <f:Button ID="btnYbsyDownLoad" runat="server" Icon="ApplicationGo" Text="仪表索引模板下载" ToolTip="仪表索引模板下载" OnClick="btnYbsyDownLoad_Click"></f:Button>
                                                                         <f:Button ID="btnZxtybSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnZxtybSave_Click"></f:Button>
                                                                     </Items>
                                                                 </f:Toolbar>
                                                             </Toolbars>
                                                             <Columns>
-                                                                <f:RowNumberField EnablePagingNumber="true" Width="100px" HeaderTextAlign="Center" TextAlign="Center" />
+                                                                <f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
                                                                 <f:RenderField HeaderText="仪表位号" ColumnID="InstrumentTag" HtmlEncode="false" DataField="InstrumentTag" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
                                                                     <Editor>
                                                                         <f:TextBox runat="server" ID="txtInstrumentTag"></f:TextBox>
@@ -732,6 +746,22 @@
                         </f:Form>
                     </Items>
                 </f:Panel>
+                <f:Window ID="IdpWindow" Title="IDP试车数据" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+                    Target="Top" EnableResize="true" runat="server" IsModal="true"
+                    Width="1600px" Height="800px">
+                </f:Window>
+                <f:Window ID="IdpWindow2" Title="选择IDP试车管道数据" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+                    Target="Top" EnableResize="true" runat="server" IsModal="true" OnClose="IdpWindow2_Close"
+                    Width="1600px" Height="800px">
+                </f:Window>
+                <f:Window ID="IdpWindow3" Title="选择IDP试车工艺设备数据" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+                    Target="Top" EnableResize="true" runat="server" IsModal="true" OnClose="IdpWindow3_Close"
+                    Width="1600px" Height="800px">
+                </f:Window>
+                <f:Window ID="IdpWindow4" Title="选择IDP试车仪表索引数据" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+                    Target="Top" EnableResize="true" runat="server" IsModal="true" OnClose="IdpWindow4_Close"
+                    Width="1600px" Height="800px">
+                </f:Window>
                 <f:Window ID="Window1" Title="SS子系统管道一览表选择" Hidden="true" EnableIFrame="true" EnableMaximize="true"
                     Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
                     Width="1090px" Height="660px">

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.cs

@@ -177,6 +177,68 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
 
         #endregion
 
+        #region IDP试车数据库
+
+        /// <summary>
+        /// IDP试车数据库
+        /// </summary>
+        protected void btnIDPPreRunData_Click(object sender, EventArgs e)
+        {
+            string window = $"IDPPreRunData.aspx";
+            PageContext.RegisterStartupScript(IdpWindow.GetSaveStateReference(this.hidSelectProperty.ClientID) + IdpWindow.GetShowReference(window));
+        }
+
+        /// <summary>
+        /// 从IDP选择管道数据
+        /// </summary>
+        protected void btnIDPSelectPiping_Click(object sender, EventArgs e)
+        {
+            string window = $"SelectIDPPiping.aspx?SystemId={this.tvControlItem.SelectedNodeID}";
+            PageContext.RegisterStartupScript(IdpWindow2.GetShowReference(window, "从IDP选择管道数据"));
+        }
+
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        protected void IdpWindow2_Close(object sender, WindowCloseEventArgs e)
+        {
+            ZxtgdBrid();
+        }
+        /// <summary>
+        /// 从IDP选择工艺设备数据
+        /// </summary>
+        protected void btnIDPSelectEquipment_Click(object sender, EventArgs e)
+        {
+            string window = $"SelectIDPEquipment.aspx?SystemId={this.tvControlItem.SelectedNodeID}";
+            PageContext.RegisterStartupScript(IdpWindow3.GetShowReference(window, "从IDP选择工艺设备数据"));
+        }
+
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        protected void IdpWindow3_Close(object sender, WindowCloseEventArgs e)
+        {
+            ZxtgyBrid();
+        }
+
+        /// <summary>
+        /// 从IDP选择仪表索引数据
+        /// </summary>
+        protected void btnIDPSelectInstrumentation_Click(object sender, EventArgs e)
+        {
+            string window = $"SelectIDPInstrumentation.aspx?SystemId={this.tvControlItem.SelectedNodeID}";
+            PageContext.RegisterStartupScript(IdpWindow4.GetShowReference(window, "从IDP选择仪表索引数据"));
+        }
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        protected void IdpWindow4_Close(object sender, WindowCloseEventArgs e)
+        {
+            ZxtybBrid();
+        }
+
+        #endregion
+
         #region S系统管道一览表导入
 
         /// <summary>
@@ -1118,7 +1180,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
             string window = $"SelectProperty.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}&SelectPropertyIds={hidSelectProperty.Text}";
             PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hidSelectProperty.ClientID) + Window1.GetShowReference(window));
         }
-
+        
         /// <summary>
         /// 关闭
         /// </summary>
@@ -1253,7 +1315,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </summary>
         protected void btngySelect_Click(object sender, EventArgs e)
         {
-            string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}&SelectTechnologyIds={hidSelectTechnology.Text}";
+            //string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}&SelectTechnologyIds={hidSelectTechnology.Text}";
+            string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}";
             PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hidSelectTechnology.ClientID) + Window2.GetShowReference(window));
         }
 

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.designer.cs

@@ -86,6 +86,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </remarks>
         protected global::FineUIPro.HiddenField hdTrustID;
 
+        /// <summary>
+        /// btnIDPPreRunData 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnIDPPreRunData;
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -266,6 +275,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill;
 
+        /// <summary>
+        /// btnIDPSelectPiping 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnIDPSelectPiping;
+
         /// <summary>
         /// btnGdDownLoad 控件。
         /// </summary>
@@ -347,6 +365,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </remarks>
         protected global::FineUIPro.TextBox txtDrawingNo;
 
+        /// <summary>
+        /// txtDrawingEndNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDrawingEndNo;
+
         /// <summary>
         /// txtPipingStart 控件。
         /// </summary>
@@ -500,6 +527,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
 
+        /// <summary>
+        /// btnIDPSelectEquipment 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnIDPSelectEquipment;
+
         /// <summary>
         /// btnGysbDownLoad 控件。
         /// </summary>
@@ -671,6 +707,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill4;
 
+        /// <summary>
+        /// btnIDPSelectInstrumentation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnIDPSelectInstrumentation;
+
         /// <summary>
         /// btnYbsyDownLoad 控件。
         /// </summary>
@@ -1004,6 +1049,42 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
         /// </remarks>
         protected global::FineUIPro.TextBox hidSelectInstrument;
 
+        /// <summary>
+        /// IdpWindow 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window IdpWindow;
+
+        /// <summary>
+        /// IdpWindow2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window IdpWindow2;
+
+        /// <summary>
+        /// IdpWindow3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window IdpWindow3;
+
+        /// <summary>
+        /// IdpWindow4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window IdpWindow4;
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs

@@ -448,12 +448,13 @@ namespace FineUIPro.Web.ZHGL.Information
                         {
                             a += item.TotalWorkNum ?? 0;
                         }
-                    }
-                    decimal b = a / list.Count();
-                    if (d > b * 5)
-                    {
-                        err = name + "的总工时数超过前三个月平均值5倍，请核对后重新录入！";
-                        break;
+
+                        //decimal b = a / list.Count();
+                        //if (d > b * 5)
+                        //{
+                        //    err = name + "的总工时数超过前三个月平均值5倍，请核对后重新录入！";
+                        //    break;
+                        //}
                     }
                 }
             }

SGGL/Model/IDP/IDPPreRunData.cs

@@ -0,0 +1,177 @@
+// <auto-generated />
+//
+// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do:
+//
+//    using Model;
+//
+//    var response = Response.FromJson(jsonString);
+
+
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// 数据结果对象
+    /// </summary>
+    public partial class IDPPreRunData
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        [JsonProperty("id")]
+        public string id { get; set; }
+        /// <summary>
+        /// categoryName
+        /// </summary>
+        [JsonProperty("categoryName")]
+        public string categoryName { get; set; }
+        /// <summary>
+        /// tag
+        /// </summary>
+        [JsonProperty("tag")]
+        public string tag { get; set; }
+        /// <summary>
+        /// name
+        /// </summary>
+        [JsonProperty("name")]
+        public string name { get; set; }
+        /// <summary>
+        /// parentId
+        /// </summary>
+        [JsonProperty("parentId")]
+        public string parentId { get; set; }
+        /// <summary>
+        /// projectId
+        /// </summary>
+        [JsonProperty("projectId")]
+        public string projectId { get; set; }
+        /// <summary>
+        /// wbsCode
+        /// </summary>
+        [JsonProperty("wbsCode")]
+        public string wbsCode { get; set; }
+        /// <summary>
+        /// itemType
+        /// </summary>
+        [JsonProperty("itemType")]
+        public string itemType { get; set; }
+        /// <summary>
+        /// versionId
+        /// </summary>
+        [JsonProperty("versionId")]
+        public string versionId { get; set; }
+        /// <summary>
+        /// fileCode
+        /// </summary>
+        [JsonProperty("fileCode")]
+        public string fileCode { get; set; }
+        /// <summary>
+        /// projectCode
+        /// </summary>
+        [JsonProperty("projectCode")]
+        public string projectCode { get; set; }
+        /// <summary>
+        /// workItemCode
+        /// </summary>
+        [JsonProperty("workItemCode")]
+        public string workItemCode { get; set; }
+        /// <summary>
+        /// tagnumber
+        /// </summary>
+        [JsonProperty("tagnumber")]
+        public string tagnumber { get; set; }
+        /// <summary>
+        /// sequence
+        /// </summary>
+        [JsonProperty("sequence")]
+        public string sequence { get; set; }
+        /// <summary>
+        /// version
+        /// </summary>
+        [JsonProperty("version")]
+        public string version { get; set; }
+        /// <summary>
+        /// createTime
+        /// </summary>
+        [JsonProperty("createTime")]
+        public DateTime? createTime { get; set; }
+        /// <summary>
+        /// updateTime
+        /// </summary>
+        [JsonProperty("updateTime")]
+        public DateTime? updateTime { get; set; }
+
+        /// <summary>
+        /// 返回数据属性对象
+        /// </summary>
+        [JsonProperty("properties")]
+        public System.Collections.Generic.List<Property> properties { get; set; }
+    }
+
+
+    /// <summary>
+    /// 数据属性对象
+    /// </summary>
+    public partial class Property
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        [JsonProperty("id")]
+        public string id { get; set; }
+        /// <summary>
+        /// propertyName
+        /// </summary>
+        [JsonProperty("propertyName")]
+        public string propertyName { get; set; }
+        /// <summary>
+        /// propertyValue
+        /// </summary>
+        [JsonProperty("propertyValue")]
+        public string propertyValue { get; set; }
+        /// <summary>
+        /// unit
+        /// </summary>
+        [JsonProperty("unit")]
+        public string unit { get; set; }
+        /// <summary>
+        /// pwiItemId
+        /// </summary>
+        [JsonProperty("pwiItemId")]
+        public string pwiItemId { get; set; }
+        ///// <summary>
+        ///// createTime
+        ///// </summary>
+        //[JsonProperty("createTime")]
+        //public DateTime? createTime { get; set; }
+        ///// <summary>
+        ///// updateTime
+        ///// </summary>
+        //[JsonProperty("updateTime")]
+        //public DateTime? updateTime { get; set; }
+        ///// <summary>
+        ///// versionId
+        ///// </summary>
+        //[JsonProperty("versionId")]
+        //public string versionId { get; set; }
+        ///// <summary>
+        ///// ownerItemId
+        ///// </summary>
+        //[JsonProperty("ownerItemId")]
+        //public string ownerItemId { get; set; }
+    }
+
+
+    public partial class IDPPreRunData
+    {
+        public static List<IDPPreRunData> FromJson(string json)
+        {
+            return JsonConvert.DeserializeObject<List<IDPPreRunData>>(json, Model.Converter.Settings);
+        }
+    }
+
+}
+

SGGL/Model/IDP/IDPPreRunEquipment.cs

@@ -0,0 +1,287 @@
+// <auto-generated />
+//
+// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do:
+//
+//    using Model;
+//
+//    var response = Response.FromJson(jsonString);
+
+
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// 设备一览表数据结果对象
+    /// </summary>
+    public partial class IDPPreRunEquipment
+    {
+        /// <summary>
+        /// itemId
+        /// </summary>
+        [JsonProperty("itemId")]
+        public string ItemId { get; set; }
+        /// <summary>
+        /// category
+        /// </summary>
+        [JsonProperty("category")]
+        public string Category { get; set; }
+        /// <summary>
+        /// tag
+        /// </summary>
+        [JsonProperty("tag")]
+        public string Tag { get; set; }
+        /// <summary>
+        /// 装置工序主项码
+        /// </summary>
+        [JsonProperty("wbsCode")]
+        public string WbsCode { get; set; }
+        /// <summary>
+        /// 装置码
+        /// </summary>
+        [JsonProperty("deviceCode")]
+        public string DeviceCode { get; set; }
+        /// <summary>
+        /// 工序码
+        /// </summary>
+        [JsonProperty("processesCode")]
+        public string ProcessesCode { get; set; }
+        /// <summary>
+        /// 主项码
+        /// </summary>
+        [JsonProperty("subjectCode")]
+        public string SubjectCode { get; set; }
+        /// <summary>
+        /// 设备位号
+        /// </summary>
+        [JsonProperty("设备位号")]
+        public string TagNumber { get; set; }
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        [JsonProperty("设备名称")]
+        public string NameSpecifications { get; set; }
+
+        ///// <summary>
+        ///// 图号或型号
+        ///// </summary>
+        //[JsonProperty("图号或型号")]
+        //public string DrawingNo { get; set; }
+
+        ///// <summary>
+        ///// 操作数量
+        ///// </summary>
+        //[JsonProperty("操作数量")]
+        //public string NumOperate { get; set; }
+        /// <summary>
+        /// 设备数量
+        /// </summary>
+        [JsonProperty("设备数量")]
+        public string DeviceNum { get; set; }
+        /// <summary>
+        /// 备用数量
+        /// </summary>
+        [JsonProperty("备用数量")]
+        public string NumStandby { get; set; }
+
+        /// <summary>
+        /// 单重
+        /// </summary>
+        [JsonProperty("单重")]
+        public string WeightSingle { get; set; }
+        /// <summary>
+        /// 【单位】单重
+        /// </summary>
+        [JsonProperty("【单位】单重")]
+        public string WeightSingleUnit { get; set; }
+
+        ///// <summary>
+        ///// 重量总重
+        ///// </summary>
+        //[JsonProperty("重量总重")]
+        //public string WeightTotal { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [JsonProperty("备注")]
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 【单位】设备数量
+        /// </summary>
+        [JsonProperty("【单位】设备数量")]
+        public string DeviceNumUnit { get; set; }
+
+        /// <summary>
+        /// 材料
+        /// </summary>
+        [JsonProperty("材料")]
+        public string Materials { get; set; }
+        /// <summary>
+        /// 叶轮材料
+        /// </summary>
+        [JsonProperty("叶轮材料")]
+        public string ImpellerMaterial { get; set; }
+        /// <summary>
+        /// 壳体材料
+        /// </summary>
+        [JsonProperty("壳体材料")]
+        public string ShellMaterial { get; set; }
+        /// <summary>
+        /// 缸体材料
+        /// </summary>
+        [JsonProperty("缸体材料")]
+        public string CylinderMaterial { get; set; }
+        /// <summary>
+        /// 填料/塔盘材料
+        /// </summary>
+        [JsonProperty("填料/塔盘材料")]
+        public string TrayMaterial { get; set; }
+        /// <summary>
+        /// 填料材料
+        /// </summary>
+        [JsonProperty("填料材料")]
+        public string PackingMaterial { get; set; }
+        /// <summary>
+        /// 板片材料
+        /// </summary>
+        [JsonProperty("板片材料")]
+        public string PlateMaterial { get; set; }
+        /// <summary>
+        /// 内件材料
+        /// </summary>
+        [JsonProperty("内件材料")]
+        public string TrimMaterial { get; set; }
+        /// <summary>
+        /// 材料(盘管)
+        /// </summary>
+        [JsonProperty("材料(盘管)")]
+        public string CoilMaterial { get; set; }
+        /// <summary>
+        /// 材料(燃烧空气预热器)
+        /// </summary>
+        [JsonProperty("材料(燃烧空气预热器)")]
+        public string PreheaterMaterial { get; set; }
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        [JsonProperty("序号")]
+        public string SerialNumber { get; set; }
+        /// <summary>
+        /// 主要尺寸-I.D
+        /// </summary>
+        [JsonProperty("主要尺寸-I.D")]
+        public string DimensionsID { get; set; }
+        /// <summary>
+        /// 【单位】主要尺寸-I.D
+        /// </summary>
+        [JsonProperty("【单位】主要尺寸-I.D")]
+        public string DimensionsIDUnit { get; set; }
+        /// <summary>
+        /// 主要尺寸-H(T-T)
+        /// </summary>
+        [JsonProperty("主要尺寸-H(T-T)")]
+        public string DimensionsHTT { get; set; }
+        /// <summary>
+        /// 【单位】主要尺寸-H(T-T)
+        /// </summary>
+        [JsonProperty("【单位】主要尺寸-H(T-T)")]
+        public string DimensionsHTTUnit { get; set; }
+        /// <summary>
+        /// 入口压力
+        /// </summary>
+        [JsonProperty("入口压力")]
+        public string MPaG { get; set; }
+        /// <summary>
+        /// 【单位】入口压力
+        /// </summary>
+        [JsonProperty("【单位】入口压力")]
+        public string MPaGUnit { get; set; }
+        /// <summary>
+        /// 出口压力
+        /// </summary>
+        [JsonProperty("出口压力")]
+        public string KPa { get; set; }
+        /// <summary>
+        /// 【单位】出口压力
+        /// </summary>
+        [JsonProperty("【单位】出口压力")]
+        public string KPaUnit { get; set; }
+        /// <summary>
+        /// 扬程
+        /// </summary>
+        [JsonProperty("扬程")]
+        public string Lift { get; set; }
+        /// <summary>
+        /// 【单位】扬程
+        /// </summary>
+        [JsonProperty("【单位】扬程")]
+        public string LiftUnit { get; set; }
+        /// <summary>
+        /// 设计流量
+        /// </summary>
+        [JsonProperty("设计流量")]
+        public string DesignFlow { get; set; }
+        /// <summary>
+        /// 【单位】设计流量
+        /// </summary>
+        [JsonProperty("【单位】设计流量")]
+        public string DesignFlowUnit { get; set; }
+        /// <summary>
+        /// 驱动型式
+        /// </summary>
+        [JsonProperty("驱动型式")]
+        public string DrivingType { get; set; }
+        /// <summary>
+        /// 设备型式
+        /// </summary>
+        [JsonProperty("设备型式")]
+        public string EquipmentType { get; set; }
+        /// <summary>
+        /// 设备型式或型号
+        /// </summary>
+        [JsonProperty("设备型式或型号")]
+        public string EquipmentTypeModel { get; set; }
+        /// <summary>
+        /// 设备形式
+        /// </summary>
+        [JsonProperty("设备形式")]
+        public string EquipmentForm { get; set; }
+        /// <summary>
+        /// 轴功率
+        /// </summary>
+        [JsonProperty("轴功率")]
+        public string ShaftPower { get; set; }
+        /// <summary>
+        /// 【单位】轴功率
+        /// </summary>
+        [JsonProperty("【单位】轴功率")]
+        public string ShaftPowerUnit { get; set; }
+        /// <summary>
+        /// 额定功率
+        /// </summary>
+        [JsonProperty("额定功率")]
+        public string RatedPower { get; set; }
+        /// <summary>
+        /// 【单位】额定功率
+        /// </summary>
+        [JsonProperty("【单位】额定功率")]
+        public string RatedPowerUnit { get; set; }
+
+
+    }
+
+    public partial class IDPPreRunEquipment
+    {
+        public static List<IDPPreRunEquipment> FromJson(string json)
+        {
+            return JsonConvert.DeserializeObject<List<IDPPreRunEquipment>>(json, Model.Converter.Settings);
+        }
+    }
+
+}
+

SGGL/Model/IDP/IDPPreRunInstrumentation.cs

@@ -0,0 +1,151 @@
+// <auto-generated />
+//
+// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do:
+//
+//    using Model;
+//
+//    var response = Response.FromJson(jsonString);
+
+
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Security.Policy;
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// 设备一览表数据结果对象
+    /// </summary>
+    public partial class IDPPreRunInstrumentation
+    {
+        /// <summary>
+        /// itemId
+        /// </summary>
+        [JsonProperty("itemId")]
+        public string ItemId { get; set; }
+        /// <summary>
+        /// category
+        /// </summary>
+        [JsonProperty("category")]
+        public string Category { get; set; }
+        /// <summary>
+        /// tag
+        /// </summary>
+        [JsonProperty("tag")]
+        public string Tag { get; set; }
+        /// <summary>
+        /// 装置工序主项码
+        /// </summary>
+        [JsonProperty("wbsCode")]
+        public string WbsCode { get; set; }
+        /// <summary>
+        /// 装置码
+        /// </summary>
+        [JsonProperty("deviceCode")]
+        public string DeviceCode { get; set; }
+        /// <summary>
+        /// 工序码
+        /// </summary>
+        [JsonProperty("processesCode")]
+        public string ProcessesCode { get; set; }
+        /// <summary>
+        /// 主项码
+        /// </summary>
+        [JsonProperty("subjectCode")]
+        public string SubjectCode { get; set; }
+        /// <summary>
+        /// 位号
+        /// </summary>
+        [JsonProperty("位号")]
+        public string InstrumentTag { get; set; }
+        /// <summary>
+        /// 用途
+        /// </summary>
+        [JsonProperty("用途")]
+        public string UseTo { get; set; }
+        /// <summary>
+        /// 仪表名称
+        /// </summary>
+        [JsonProperty("仪表名称")]
+        public string InstrumentName { get; set; }
+        /// <summary>
+        /// 供货方
+        /// </summary>
+        [JsonProperty("供货方")]
+        public string Supplier { get; set; }
+        /// <summary>
+        /// 安装位置
+        /// </summary>
+        [JsonProperty("安装位置")]
+        public string InstallationPosition { get; set; }
+        /// <summary>
+        /// 信号类型
+        /// </summary>
+        [JsonProperty("信号类型")]
+        public string SignalType { get; set; }
+        /// <summary>
+        /// 关联系统
+        /// </summary>
+        [JsonProperty("关联系统")]
+        public string AssociatedSystem { get; set; }
+        /// <summary>
+        /// P&ID图号
+        /// </summary>
+        [JsonProperty("P&ID图号")]
+        public string Cp25 { get; set; }
+        /// <summary>
+        /// 数据表
+        /// </summary>
+        [JsonProperty("数据表")]
+        public string In11 { get; set; }
+        /// <summary>
+        /// 仪表位置图
+        /// </summary>
+        [JsonProperty("仪表位置图")]
+        public string In40 { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [JsonProperty("备注")]
+        public string Remark { get; set; }
+
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        [JsonProperty("描述")]
+        public string Describe { get; set; }
+        /// <summary>
+        /// 管道或设备位号
+        /// </summary>
+        [JsonProperty("管道或设备位号")]
+        public string PipingOrEquipmentTagNumber { get; set; }
+        /// <summary>
+        /// 回路号
+        /// </summary>
+        [JsonProperty("回路号")]
+        public string CircuitNumber { get; set; }
+
+        /// <summary>
+        /// 介质名称
+        /// </summary>
+        [JsonProperty("介质名称")]
+        public string MediaName { get; set; }
+        /// <summary>
+        /// 介质相态
+        /// </summary>
+        [JsonProperty("介质相态")]
+        public string MediumPhaseState { get; set; }
+    }
+
+    public partial class IDPPreRunInstrumentation
+    {
+        public static List<IDPPreRunInstrumentation> FromJson(string json)
+        {
+            return JsonConvert.DeserializeObject<List<IDPPreRunInstrumentation>>(json, Model.Converter.Settings);
+        }
+    }
+
+}
+

SGGL/Model/IDP/IDPPreRunPiping.cs

@@ -0,0 +1,254 @@
+// <auto-generated />
+//
+// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do:
+//
+//    using Model;
+//
+//    var response = Response.FromJson(jsonString);
+
+
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// 管道一览表数据结果对象
+    /// </summary>
+    public partial class IDPPreRunPiping
+    {
+        /// <summary>
+        /// itemId
+        /// </summary>
+        [JsonProperty("itemId")]
+        public string ItemId { get; set; }
+        /// <summary>
+        /// category
+        /// </summary>
+        [JsonProperty("category")]
+        public string Category { get; set; }
+        /// <summary>
+        /// tag
+        /// </summary>
+        [JsonProperty("tag")]
+        public string Tag { get; set; }
+        /// <summary>
+        /// 装置工序主项码
+        /// </summary>
+        [JsonProperty("wbsCode")]
+        public string WbsCode { get; set; }
+        /// <summary>
+        /// 装置码
+        /// </summary>
+        [JsonProperty("deviceCode")]
+        public string DeviceCode { get; set; }
+        /// <summary>
+        /// 工序码
+        /// </summary>
+        [JsonProperty("processesCode")]
+        public string ProcessesCode { get; set; }
+        /// <summary>
+        /// 主项码
+        /// </summary>
+        [JsonProperty("subjectCode")]
+        public string SubjectCode { get; set; }
+        /// <summary>
+        /// 管道号
+        /// </summary>
+        [JsonProperty("管道号")]
+        public string PipingCode { get; set; }
+
+        /// <summary>
+        /// 公称直径
+        /// </summary>
+        [JsonProperty("公称直径")]
+        public string Diameter { get; set; }
+        /// <summary>
+        /// 【单位】公称直径
+        /// </summary>
+        [JsonProperty("【单位】公称直径")]
+        public string DiameterUnit { get; set; }
+        /// <summary>
+        /// 管道材料等级
+        /// </summary>
+        [JsonProperty("管道材料等级")]
+        public string MaterialLevel { get; set; }
+        /// <summary>
+        /// 绝热伴热类型
+        /// </summary>
+        [JsonProperty("绝热伴热类型")]
+        public string AdiabatType { get; set; }
+        /// <summary>
+        /// 绝热伴热厚度
+        /// </summary>
+        [JsonProperty("绝热伴热厚度")]
+        public string AdiabatThickness { get; set; }
+        /// <summary>
+        /// 【单位】绝热伴热厚度
+        /// </summary>
+        [JsonProperty("【单位】绝热伴热厚度")]
+        public string AdiabatThicknessUnit { get; set; }
+        /// <summary>
+        /// 介质相态
+        /// </summary>
+        [JsonProperty("介质相态")]
+        public string MediumState { get; set; }
+        /// <summary>
+        /// 管道起点P&ID图号
+        /// </summary>
+        [JsonProperty("管道起点P&ID图号")]
+        public string DrawingStartNo { get; set; }
+        /// <summary>
+        /// 管道终点P&ID图号
+        /// </summary>
+        [JsonProperty("管道终点P&ID图号")]
+        public string DrawingEndNo { get; set; }
+        /// <summary>
+        /// 管道起点管号
+        /// </summary>
+        [JsonProperty("管道起点管号")]
+        public string PipingStart { get; set; }
+        /// <summary>
+        /// 管道终点管号
+        /// </summary>
+        [JsonProperty("管道终点管号")]
+        public string PipingEnd { get; set; }
+        /// <summary>
+        /// 压力管道级别
+        /// </summary>
+        [JsonProperty("压力管道级别")]
+        public string PipingLevel { get; set; }
+        /// <summary>
+        /// 正常工作条件温度
+        /// </summary>
+        [JsonProperty("正常工作条件温度")]
+        public string NormalTemperature { get; set; }
+        /// <summary>
+        /// 【单位】正常工作条件温度
+        /// </summary>
+        [JsonProperty("【单位】正常工作条件温度")]
+        public string NormalTemperatureUnit { get; set; }
+        /// <summary>
+        /// 正常工作条件压力
+        /// </summary>
+        [JsonProperty("正常工作条件压力")]
+        public string NormalPressure { get; set; }
+        /// <summary>
+        /// 【单位】正常工作条件压力
+        /// </summary>
+        [JsonProperty("【单位】正常工作条件压力")]
+        public string NormalPressureUnit { get; set; }
+        /// <summary>
+        /// 设计条件温度
+        /// </summary>
+        [JsonProperty("设计条件温度")]
+        public string DesignTemperature { get; set; }
+        /// <summary>
+        /// 【单位】设计条件温度
+        /// </summary>
+        [JsonProperty("【单位】设计条件温度")]
+        public string DesignTemperatureUnit { get; set; }
+        /// <summary>
+        /// 设计条件压力
+        /// </summary>
+        [JsonProperty("设计条件压力")]
+        public string DesignPressure { get; set; }
+        /// <summary>
+        /// 【单位】设计条件压力
+        /// </summary>
+        [JsonProperty("【单位】设计条件压力")]
+        public string DesignPressureUnit { get; set; }
+        /// <summary>
+        /// 涂漆等级
+        /// </summary>
+        [JsonProperty("涂漆等级")]
+        public string PaintLevel { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [JsonProperty("备注")]
+        public string Remark { get; set; }
+
+        /******************
+
+        /// <summary>
+        /// 伴热介质
+        /// </summary>
+        [JsonProperty("伴热介质")]
+        public string 伴热介质 { get; set; }
+        /// <summary>
+        /// 无损检测（RT比例）
+        /// </summary>
+        [JsonProperty("无损检测（RT比例）")]
+        public string 无损检测比例 { get; set; }
+        /// <summary>
+        /// 试压介质
+        /// </summary>
+        [JsonProperty("试压介质")]
+        public string 试压介质 { get; set; }
+        /// <summary>
+        /// 试压压力
+        /// </summary>
+        [JsonProperty("试压压力")]
+        public string 试压压力 { get; set; }
+        /// <summary>
+        /// 伴热管规格
+        /// </summary>
+        [JsonProperty("伴热管规格")]
+        public string 伴热管规格 { get; set; }
+        /// <summary>
+        /// 介质代码
+        /// </summary>
+        [JsonProperty("介质代码")]
+        public string 介质代码 { get; set; }
+        /// <summary>
+        /// 毒性
+        /// </summary>
+        [JsonProperty("毒性")]
+        public string 毒性 { get; set; }
+        /// <summary>
+        /// 热处理
+        /// </summary>
+        [JsonProperty("热处理")]
+        public string 热处理 { get; set; }
+        /// <summary>
+        /// 无毒、不可燃、无腐蚀性
+        /// </summary>
+        [JsonProperty("无毒、不可燃、无腐蚀性")]
+        public string 无毒不可燃无腐蚀性 { get; set; }
+        /// <summary>
+        /// 无损检测（检查等级）
+        /// </summary>
+        [JsonProperty("无损检测（检查等级）")]
+        public string 无损检测检查等级 { get; set; }
+        /// <summary>
+        /// 静电接地
+        /// </summary>
+        [JsonProperty("静电接地")]
+        public string 静电接地 { get; set; }
+        /// <summary>
+        /// 泄漏性试验
+        /// </summary>
+        [JsonProperty("泄漏性试验")]
+        public string 泄漏性试验 { get; set; }
+        /// <summary>
+        /// 可燃
+        /// </summary>
+        [JsonProperty("可燃")]
+        public string 可燃 { get; set; }
+
+
+        **********************/
+    }
+
+    public partial class IDPPreRunPiping
+    {
+        public static List<IDPPreRunPiping> FromJson(string json)
+        {
+            return JsonConvert.DeserializeObject<List<IDPPreRunPiping>>(json, Model.Converter.Settings);
+        }
+    }
+
+}
+

SGGL/Model/Model.csproj

@@ -237,6 +237,10 @@
     <Compile Include="HSSE\SpResourceCollection.cs" />
     <Compile Include="HSSE\WorkPostStatisticItem.cs" />
     <Compile Include="HSSE\HSSE_HazardTemplate.cs" />
+    <Compile Include="IDP\IDPPreRunInstrumentation.cs" />
+    <Compile Include="IDP\IDPPreRunEquipment.cs" />
+    <Compile Include="IDP\IDPPreRunPiping.cs" />
+    <Compile Include="IDP\IDPPreRunData.cs" />
     <Compile Include="IDP\SessionItem.cs" />
     <Compile Include="IDP\OADesignDrawingData.cs" />
     <Compile Include="IDP\IDPDesignDrawingResponseData.cs" />

SGGL/WebAPI/Controllers/IDP/IDPController.cs

@@ -3,6 +3,7 @@ using Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Web.Http;
 
 namespace WebAPI.Controllers
@@ -110,16 +111,25 @@ namespace WebAPI.Controllers
         #region IDP系统项目开车数据
 
         /// <summary>
-        /// 每天夜间同步获取IDP系统项目开车数据
+        /// 获取IDP系统项目开车数据【测试用，接口不上线】
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public Model.ResponeData SynIDPPreRunData()
+        public Model.ReturnData SynIDPPreRunData()
         {
-            var responeData = new Model.ResponeData();
+            var responeData = new Model.ReturnData();
+            responeData.time = DateTime.Now.ToString();
             try
             {
-                IDPDataService.GetIDPProjectMasterData();
+                var session = IDPDataService.GetAuthenticationSession();
+                //ErrLogInfo.WriteLog($"Session——name：{session.name}；value：{session.value}");
+
+                string pipingMsg = IDPDataService.GetIDPProjectPreRunDataPiping(session, "32d0bca0-7693-4bd6-813d-6ee174ba29d3");
+                string equipmentMsg = IDPDataService.GetIDPProjectPreRunDataEquipment(session, "32d0bca0-7693-4bd6-813d-6ee174ba29d3");
+                string instrumentationMsg = IDPDataService.GetIDPProjectPreRunDataInstrumentation(session, "32d0bca0-7693-4bd6-813d-6ee174ba29d3");
+                responeData.message = $"管道一览表：{pipingMsg}；设备一览表：{equipmentMsg}；索引表：{instrumentationMsg}";
+                //responeData.message = $"管道一览表：{pipingMsg}；设备一览表：{equipmentMsg}；";
+                //responeData.message = $"索引表：{instrumentationMsg}";
             }
             catch (Exception ex)
             {

SGGL/WebAPI/ErrLog.txt

@@ -18,3 +18,18 @@
 【Session】name：FULONGTECH_SESSION；value：02f5ac63-9220-4f81-91cd-dc4dd2c98d10
 【Session】name：FULONGTECH_SESSION；value：ef252925-fece-4129-b084-30e58a6abfd7
 【Session】name：FULONGTECH_SESSION；value：58084872-8dad-44eb-ba52-6b42c291dc22
+Session——name：FULONGTECH_SESSION；value：ae0e7740-ae1e-4f5a-b24a-a970987b9419
+Session——name：FULONGTECH_SESSION；value：6d2854e6-a222-4953-a3a7-ed1adc9e11ce
+Session——name：FULONGTECH_SESSION；value：51b1fd2e-32a7-43d0-8166-46b4591466b2
+Session——name：FULONGTECH_SESSION；value：49c05bdb-1c60-4c65-a386-87ee27cef516
+Session——name：FULONGTECH_SESSION；value：c6a4700e-c105-4c66-be8b-ea64ffbb5c9b
+Session——name：FULONGTECH_SESSION；value：4906bae7-ffdf-43a1-941b-ee94107a1191
+Session——name：FULONGTECH_SESSION；value：b3af649a-5b6e-4a25-b0ac-ebb1fd5255f4
+Session——name：FULONGTECH_SESSION；value：66bcf05a-f7ec-49ed-9029-92f6e069d6ce
+Session——name：FULONGTECH_SESSION；value：6b20a356-1626-4470-b5f4-fb2aebc341f5
+Session——name：FULONGTECH_SESSION；value：c6796910-7fd9-4d92-9e1f-5518240c5072
+Session——name：FULONGTECH_SESSION；value：582f0790-fab9-4fe7-b4c8-823a92b99de8
+Session——name：FULONGTECH_SESSION；value：5cce6bd2-f8f9-4e3a-9088-9dfbe72226fc
+Session——name：FULONGTECH_SESSION；value：7547d5d7-fa75-4832-8616-99bc8a92541d
+Session——name：FULONGTECH_SESSION；value：16a1bbe8-c7bb-45c7-88bc-c783a20ab5ab
+Session——name：FULONGTECH_SESSION；value：9d0e8396-8524-4689-9a50-659cdfead83e

SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,7 +6,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
-    <History>True|2025-07-23T02:36:09.9990536Z||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
+    <History>True|2025-08-04T10:56:13.9675910Z||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -86,22 +86,22 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>07/23/2025 10:36:08</publishTime>
+      <publishTime>08/04/2025 18:56:12</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>07/23/2025 10:36:08</publishTime>
+      <publishTime>08/04/2025 18:56:12</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
       <publishTime>12/06/2024 20:13:58</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>07/23/2025 10:35:29</publishTime>
+      <publishTime>08/04/2025 18:55:48</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>12/26/2024 09:46:52</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>07/23/2025 10:35:29</publishTime>
+      <publishTime>08/04/2025 18:55:48</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
@@ -128,10 +128,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>07/21/2025 17:04:55</publishTime>
+      <publishTime>08/04/2025 18:55:40</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>07/21/2025 17:04:55</publishTime>
+      <publishTime>08/04/2025 18:55:40</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
       <publishTime>07/04/2024 14:13:01</publishTime>
@@ -389,13 +389,13 @@
       <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>07/23/2025 10:35:59</publishTime>
+      <publishTime>08/04/2025 18:55:51</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>07/23/2025 10:35:59</publishTime>
+      <publishTime>08/04/2025 18:55:51</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>07/23/2025 10:35:59</publishTime>
+      <publishTime>08/04/2025 18:55:51</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 21:57:34</publishTime>
@@ -458,7 +458,7 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="ErrLog.txt">
-      <publishTime>07/16/2025 18:09:47</publishTime>
+      <publishTime>07/30/2025 15:40:50</publishTime>
     </File>
     <File Include="favicon.ico">
       <publishTime>10/28/2024 14:02:50</publishTime>
@@ -479,7 +479,7 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>07/23/2025 10:36:00</publishTime>
+      <publishTime>08/04/2025 18:55:53</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
       <publishTime>10/28/2024 14:02:50</publishTime>