diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-07-24-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-07-24-phf.sql
new file mode 100644
index 00000000..02f9bc3d
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-07-24-phf.sql
@@ -0,0 +1,64 @@
+ALTER TABLE Transfer_Piping ADD PWD nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Piping ADD Apunchclosed nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Piping ADD NDTReport nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Piping ADD TemperaryMeasurement nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Piping ADD FWDfinished nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Piping ADD HydrostaticTest nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Piping ADD Report nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Piping ADD Blowingflushing nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Piping ADD Systemreinstalled nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Piping ADD BlowingReport nvarchar(50)  NULL
+GO	
+
+-----------------------------------------
+ALTER TABLE Transfer_StaticEquipment ADD Internalinspection  nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_StaticEquipment ADD InternalsPacking   nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_StaticEquipment ADD BOXupRecord  nvarchar(50)  NULL
+GO
+-----------------------------------------
+ALTER TABLE Transfer_RotatingEquipment ADD Alignment  nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_RotatingEquipment ADD Motorsoloruntest   nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_RotatingEquipment ADD Standalonetest  nvarchar(50)  NULL
+GO	
+
+------------------------------------------------
+ALTER TABLE Transfer_Instrumentation ADD InstallationCalibration   nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Instrumentation ADD PipingPressuretest  nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Instrumentation ADD PipingLeak  nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Instrumentation ADD PipingBlowing  nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Instrumentation ADD Looptest  nvarchar(50)  NULL
+GO	
diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-07-25-li.sql b/DataBase/版本日志/SGGLDB_WH_V2024-07-25-li.sql
new file mode 100644
index 00000000..55f9ad7b
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-07-25-li.sql
@@ -0,0 +1,14 @@
+update Sys_Menu set IsUsed=0 where MenuId in ('C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0','BB5EC5E1-A23D-4A3F-8772-CD40757974EC','F97BCF55-E450-4007-AD84-AB64B3496204','E6F5125D-DD94-4978-B7EB-D9C26694D86D')
+
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('2352E44F-BE12-4012-B43F-AAF649EDAC32','Punchlist from完成统计表',null,'Transfer/Chart/PunchlistFromChartNew.aspx',30,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('CB76462E-9444-4946-B787-ECB33C21E6D0','Punchlist from分类表',null,'Transfer/Chart/PunchlistFromSort.aspx',35,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('549DD0B6-05CB-4C75-B8F5-9AADDEDF399F','Punchlist from进度跟踪表',null,'Transfer/Chart/PunchlistFromProgress.aspx',40,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+GO
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-07-25-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-07-25-phf.sql
new file mode 100644
index 00000000..19c63bc1
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-07-25-phf.sql
@@ -0,0 +1,41 @@
+
+UPDATE SYS_MENU SET IsUsed=0 WHERE MENUID='05442049-1310-45B1-9D3D-CAAE759D8F3E';
+
+ALTER TABLE Transfer_Electrical ADD Installation nvarchar(50)  NULL
+GO	
+
+ALTER TABLE Transfer_Electrical ADD Communicationtest nvarchar(50)  NULL
+GO
+
+ALTER TABLE Transfer_Electrical ADD CableLaying nvarchar(50)  NULL
+GO
+
+ALTER TABLE Transfer_Electrical ADD LoopTest nvarchar(50)  NULL
+GO
+
+------------------------------------------------------------------------
+ALTER TABLE Transfer_Civil_Structure ADD Foundation nvarchar(50)  NULL
+GO
+
+ALTER TABLE Transfer_Civil_Structure ADD Mainstructure nvarchar(50)  NULL
+GO
+
+ALTER TABLE Transfer_Civil_Structure ADD Buildingdecoration nvarchar(50)  NULL
+GO
+
+ALTER TABLE Transfer_Civil_Structure ADD Equipment nvarchar(50)  NULL
+GO
+
+ALTER TABLE Transfer_Civil_Structure ADD Instrument nvarchar(50)  NULL
+GO
+
+ALTER TABLE Transfer_Civil_Structure ADD Electrical nvarchar(50)  NULL
+GO
+
+ALTER TABLE Transfer_Civil_Structure ADD FireFighting nvarchar(50)  NULL
+GO
+
+ALTER TABLE Transfer_Civil_Structure ADD HVAC nvarchar(50)  NULL
+GO
+
+-----------------------------------------------
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 54e8e448..83bd7d69 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1,508 +1,752 @@
-
-错误信息开始=====>
-错误类型:HttpParseException
-错误信息:无法从其“Hidden”属性的字符串表示形式“500px”创建“System.Boolean”类型的对象。
-错误堆栈:
-   在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
-   在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
-   在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
-----错误类型:HttpException
-----错误信息:
-----无法从其“Hidden”属性的字符串表示形式“500px”创建“System.Boolean”类型的对象。
-----错误堆栈:
-       在 System.Web.UI.PropertyConverter.ObjectFromString(Type objType, MemberInfo propertyInfo, String value)
-       在 System.Web.UI.ControlBuilder.AddProperty(String filter, String name, String value, Boolean mainDirectiveMode)
-       在 System.Web.UI.ControlBuilder.PreprocessAttribute(String filter, String attribname, String attribvalue, Boolean mainDirectiveMode, Int32 line, Int32 column)
-       在 System.Web.UI.ControlBuilder.PreprocessAttributes(ParsedAttributeCollection attribs)
-       在 System.Web.UI.ControlBuilder.Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs)
-       在 System.Web.UI.ControlBuilder.CreateBuilderFromType(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs, Int32 line, String sourceFileName)
-       在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty)
-       在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText)
-       在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
-出错时间:06/26/2024 15:05:45
-出错文件:http://localhost:8579/JDGL/Check/WeekPlan.aspx
-IP地址:::1
-
-出错时间:06/26/2024 15:05:45
-
-
-错误信息开始=====>
-错误类型:ArgumentOutOfRangeException
-错误信息:索引超出范围。必须为非负值并小于集合大小。
-参数名: index
-错误堆栈:
-   在 System.ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument argument, ExceptionResource resource)
-   在 System.Collections.Generic.List`1.get_Item(Int32 index)
-   在 FineUIPro.Web.JDGL.Check.WeekPlanEdit.Grid2_RowCommand(Object sender, GridCommandEventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\JDGL\Check\WeekPlanEdit.aspx.cs:行号 450
-   在 FineUIPro.Grid.OnRowCommand(GridCommandEventArgs e)
-   在 (Grid , GridCommandEventArgs )
-   在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:06/26/2024 15:25:22
-出错文件:http://localhost:8579/JDGL/Check/WeekPlanEdit.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:06/26/2024 15:25:22
-
-
-错误信息开始=====>
-错误类型:HttpCompileException
-错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\PersonList.aspx(185): error CS1061: “ASP.hsse_siteperson_personlist_aspx”不包含“btnMenuBlack_Click”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_personlist_aspx”的第一个参数的扩展方法“btnMenuBlack_Click”(是否缺少 using 指令或程序集引用?)
-错误堆栈:
-   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:07/01/2024 17:11:58
-出错文件:http://localhost:8579/HSSE/SitePerson/PersonList.aspx
-IP地址:::1
-
-出错时间:07/01/2024 17:11:58
-
-
-错误信息开始=====>
-错误类型:HttpCompileException
-错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\PersonList.aspx(185): error CS1061: “ASP.hsse_siteperson_personlist_aspx”不包含“btnMenuBlack_Click”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_personlist_aspx”的第一个参数的扩展方法“btnMenuBlack_Click”(是否缺少 using 指令或程序集引用?)
-错误堆栈:
-   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:07/01/2024 17:14:10
-出错文件:http://localhost:8579/HSSE/SitePerson/PersonList.aspx
-IP地址:::1
-
-出错时间:07/01/2024 17:14:10
-
-
-错误信息开始=====>
-错误类型:HttpCompileException
-错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\PersonList.aspx(185): error CS1061: “ASP.hsse_siteperson_personlist_aspx”不包含“btnMenuBlack_Click”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_personlist_aspx”的第一个参数的扩展方法“btnMenuBlack_Click”(是否缺少 using 指令或程序集引用?)
-错误堆栈:
-   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:07/01/2024 17:14:36
-出错文件:http://localhost:8579/HSSE/SitePerson/PersonList.aspx
-IP地址:::1
-
-出错时间:07/01/2024 17:14:36
-
-
-错误信息开始=====>
-错误类型:HttpCompileException
-错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\BlackPersonList.aspx(28): error CS1061: “ASP.hsse_siteperson_blackpersonlist_aspx”不包含“drpPost_SelectedIndexChanged”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_blackpersonlist_aspx”的第一个参数的扩展方法“drpPost_SelectedIndexChanged”(是否缺少 using 指令或程序集引用?)
-错误堆栈:
-   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:07/01/2024 17:35:05
-出错文件:http://localhost:8579/HSSE/SitePerson/BlackPersonList.aspx
-IP地址:::1
-
-出错时间:07/01/2024 17:35:05
-
-
-错误信息开始=====>
-错误类型:HttpCompileException
-错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\BlackPersonList.aspx(28): error CS1061: “ASP.hsse_siteperson_blackpersonlist_aspx”不包含“drpPost_SelectedIndexChanged”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_blackpersonlist_aspx”的第一个参数的扩展方法“drpPost_SelectedIndexChanged”(是否缺少 using 指令或程序集引用?)
-错误堆栈:
-   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:07/01/2024 17:37:14
-出错文件:http://localhost:8579/HSSE/SitePerson/BlackPersonList.aspx
-IP地址:::1
-
-出错时间:07/01/2024 17:37:14
-
-
-错误信息开始=====>
-错误类型:FormatException
-错误信息:输入字符串的格式不正确。
-错误堆栈:
-   在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
-   在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
-   在 System.Int32.Parse(String s)
-   在 FineUIPro.Web.BaseInfo.RiskLevelEdit.btnSave_Click(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BaseInfo\RiskLevelEdit.aspx.cs:行号 91
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/02/2024 14:59:40
-出错文件:http://localhost:8579/BaseInfo/RiskLevelEdit.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:07/02/2024 14:59:40
-
-
-错误信息开始=====>
-错误类型:MissingMethodException
-错误信息:找不到方法:“Model.Base_RiskLevel BLL.RiskLevelService.GetRiskLevelBy(System.String)”。
-错误堆栈:
-   在 FineUIPro.Web.HSSE.Hazard.HazardListEdit.Window2_Close(Object sender, WindowCloseEventArgs e)
-   在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
-   在 (Window , WindowCloseEventArgs )
-   在 FineUIPro.Window.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/02/2024 15:07:45
-出错文件:http://localhost:8579/HSSE/Hazard/HazardListEdit.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:07/02/2024 15:07:45
-
-
-错误信息开始=====>
-错误类型:MissingMethodException
-错误信息:找不到方法:“Model.Base_RiskLevel BLL.RiskLevelService.GetRiskLevelBy(System.String)”。
-错误堆栈:
-   在 FineUIPro.Web.HSSE.Hazard.HazardListEdit.Window2_Close(Object sender, WindowCloseEventArgs e)
-   在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
-   在 (Window , WindowCloseEventArgs )
-   在 FineUIPro.Window.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/02/2024 15:07:59
-出错文件:http://localhost:8579/HSSE/Hazard/HazardListEdit.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:07/02/2024 15:07:59
-
-
-错误信息开始=====>
-错误类型:SqlException
-错误信息:列名 'CompileMan' 无效。
-错误堆栈:
-   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
-   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
-   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
-   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
-   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
-   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
-   在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.BindGrid() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\CostGoods\FeeRegistration.aspx.cs:行号 99
-   在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.Page_Load(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\CostGoods\FeeRegistration.aspx.cs:行号 55
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   在 System.EventHandler.Invoke(Object sender, EventArgs e)
-   在 System.Web.UI.Control.OnLoad(EventArgs e)
-   在 System.Web.UI.Control.LoadRecursive()
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/02/2024 16:46:52
-出错文件:http://localhost:8579/HSSE/CostGoods/FeeRegistration.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:07/02/2024 16:46:52
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 (Object )
-   在 FineUIPro.GridRow.uwEUVXJIBfEGVvHqMvTlecFpBACr()
-   在 (GridRow )
-   在 FineUIPro.GridRow.InitTemplateContainers()
-   在 (GridRow )
-   在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
-   在 (Grid , Int32 , Object )
-   在 FineUIPro.Grid.BCddVmyfIadUytlhvgnchfKxYmAe(DataTable , Boolean )
-   在 (Grid , DataTable , Boolean )
-   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
-   在 (Grid , Boolean )
-   在 FineUIPro.Grid.DataBind()
-   在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.BindGrid()
-   在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.Page_Load(Object sender, EventArgs e)
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   在 System.EventHandler.Invoke(Object sender, EventArgs e)
-   在 System.Web.UI.Control.OnLoad(EventArgs e)
-   在 System.Web.UI.Control.LoadRecursive()
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/02/2024 16:50:32
-出错文件:http://localhost:8579/HSSE/CostGoods/FeeRegistration.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:07/02/2024 16:50:32
-
-
-错误信息开始=====>
-错误类型:HttpCompileException
-错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\CostGoods\PayRegistrationNewEdit.aspx(36): error CS1061: “ASP.hsse_costgoods_payregistrationnewedit_aspx”不包含“SMonthTypeText_TextChanged”的定义，并且找不到可接受类型为“ASP.hsse_costgoods_payregistrationnewedit_aspx”的第一个参数的扩展方法“SMonthTypeText_TextChanged”(是否缺少 using 指令或程序集引用?)
-错误堆栈:
-   在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:07/04/2024 09:53:49
-出错文件:http://localhost:8579/HSSE/CostGoods/PayRegistrationNewEdit.aspx
-IP地址:::1
-
-出错时间:07/04/2024 09:53:49
-
-
-错误信息开始=====>
-错误类型:InvalidOperationException
-错误信息:不能添加已经存在的实体。
-错误堆栈:
-   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
-   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
-   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
-出错时间:07/15/2024 11:49:20
-出错时间:07/15/2024 11:49:21
-
-
-错误信息开始=====>
-错误类型:InvalidOperationException
-错误信息:不能添加已经存在的实体。
-错误堆栈:
-   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
-   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
-   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
-出错时间:07/15/2024 12:19:20
-出错时间:07/15/2024 12:19:20
-
-
-错误信息开始=====>
-错误类型:InvalidOperationException
-错误信息:不能添加已经存在的实体。
-错误堆栈:
-   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
-   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
-   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
-出错时间:07/15/2024 12:49:20
-出错时间:07/15/2024 12:49:20
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13827
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
-出错时间:07/15/2024 13:19:20
-出错时间:07/15/2024 13:19:20
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13851
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
-出错时间:07/15/2024 13:19:20
-出错时间:07/15/2024 13:19:20
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13843
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
-出错时间:07/15/2024 13:19:20
-出错时间:07/15/2024 13:19:20
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13643
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
-出错时间:07/15/2024 13:19:20
-出错时间:07/15/2024 13:19:20
-
-
-错误信息开始=====>
-错误类型:InvalidOperationException
-错误信息:不能添加已经存在的实体。
-错误堆栈:
-   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
-   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
-   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
-出错时间:07/15/2024 13:19:20
-出错时间:07/15/2024 13:19:20
-
-
-错误信息开始=====>
-错误类型:ChangeConflictException
-错误信息:2 的 1 更新失败。
-错误堆栈:
-   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
-   在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\ProjectData\ProjectService.cs:行号 193
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 284
-   在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 189
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:07/23/2024 17:52:24
-出错文件:http://localhost:8579/ProjectData/ProjectSetSave.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:07/23/2024 17:52:24
-
-
-错误信息开始=====>
-错误类型:InvalidOperationException
-错误信息:不能添加已经存在的实体。
-错误堆栈:
-   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
-   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
-   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
-出错时间:07/23/2024 18:18:27
-出错时间:07/23/2024 18:18:27
-
-
-错误信息开始=====>
-错误类型:InvalidOperationException
-错误信息:不能添加已经存在的实体。
-错误堆栈:
-   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
-   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
-   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
-出错时间:07/24/2024 10:37:35
-出错时间:07/24/2024 10:37:35
-
-
-错误信息开始=====>
-错误类型:InvalidOperationException
-错误信息:不能添加已经存在的实体。
-错误堆栈:
-   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
-   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
-   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
-出错时间:07/24/2024 11:14:23
-出错时间:07/24/2024 11:14:23
-
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:无法从其“Hidden”属性的字符串表示形式“500px”创建“System.Boolean”类型的对象。
+错误堆栈:
+   在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
+   在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+   在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
+----错误类型:HttpException
+----错误信息:
+----无法从其“Hidden”属性的字符串表示形式“500px”创建“System.Boolean”类型的对象。
+----错误堆栈:
+       在 System.Web.UI.PropertyConverter.ObjectFromString(Type objType, MemberInfo propertyInfo, String value)
+       在 System.Web.UI.ControlBuilder.AddProperty(String filter, String name, String value, Boolean mainDirectiveMode)
+       在 System.Web.UI.ControlBuilder.PreprocessAttribute(String filter, String attribname, String attribvalue, Boolean mainDirectiveMode, Int32 line, Int32 column)
+       在 System.Web.UI.ControlBuilder.PreprocessAttributes(ParsedAttributeCollection attribs)
+       在 System.Web.UI.ControlBuilder.Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs)
+       在 System.Web.UI.ControlBuilder.CreateBuilderFromType(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs, Int32 line, String sourceFileName)
+       在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty)
+       在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText)
+       在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+出错时间:06/26/2024 15:05:45
+出错文件:http://localhost:8579/JDGL/Check/WeekPlan.aspx
+IP地址:::1
+
+出错时间:06/26/2024 15:05:45
+
+
+错误信息开始=====>
+错误类型:ArgumentOutOfRangeException
+错误信息:索引超出范围。必须为非负值并小于集合大小。
+参数名: index
+错误堆栈:
+   在 System.ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument argument, ExceptionResource resource)
+   在 System.Collections.Generic.List`1.get_Item(Int32 index)
+   在 FineUIPro.Web.JDGL.Check.WeekPlanEdit.Grid2_RowCommand(Object sender, GridCommandEventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\JDGL\Check\WeekPlanEdit.aspx.cs:行号 450
+   在 FineUIPro.Grid.OnRowCommand(GridCommandEventArgs e)
+   在 (Grid , GridCommandEventArgs )
+   在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/26/2024 15:25:22
+出错文件:http://localhost:8579/JDGL/Check/WeekPlanEdit.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:06/26/2024 15:25:22
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\PersonList.aspx(185): error CS1061: “ASP.hsse_siteperson_personlist_aspx”不包含“btnMenuBlack_Click”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_personlist_aspx”的第一个参数的扩展方法“btnMenuBlack_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:11:58
+出错文件:http://localhost:8579/HSSE/SitePerson/PersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:11:58
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\PersonList.aspx(185): error CS1061: “ASP.hsse_siteperson_personlist_aspx”不包含“btnMenuBlack_Click”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_personlist_aspx”的第一个参数的扩展方法“btnMenuBlack_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:14:10
+出错文件:http://localhost:8579/HSSE/SitePerson/PersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:14:10
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\PersonList.aspx(185): error CS1061: “ASP.hsse_siteperson_personlist_aspx”不包含“btnMenuBlack_Click”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_personlist_aspx”的第一个参数的扩展方法“btnMenuBlack_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:14:36
+出错文件:http://localhost:8579/HSSE/SitePerson/PersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:14:36
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\BlackPersonList.aspx(28): error CS1061: “ASP.hsse_siteperson_blackpersonlist_aspx”不包含“drpPost_SelectedIndexChanged”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_blackpersonlist_aspx”的第一个参数的扩展方法“drpPost_SelectedIndexChanged”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:35:05
+出错文件:http://localhost:8579/HSSE/SitePerson/BlackPersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:35:05
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\SitePerson\BlackPersonList.aspx(28): error CS1061: “ASP.hsse_siteperson_blackpersonlist_aspx”不包含“drpPost_SelectedIndexChanged”的定义，并且找不到可接受类型为“ASP.hsse_siteperson_blackpersonlist_aspx”的第一个参数的扩展方法“drpPost_SelectedIndexChanged”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/01/2024 17:37:14
+出错文件:http://localhost:8579/HSSE/SitePerson/BlackPersonList.aspx
+IP地址:::1
+
+出错时间:07/01/2024 17:37:14
+
+
+错误信息开始=====>
+错误类型:FormatException
+错误信息:输入字符串的格式不正确。
+错误堆栈:
+   在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
+   在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
+   在 System.Int32.Parse(String s)
+   在 FineUIPro.Web.BaseInfo.RiskLevelEdit.btnSave_Click(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BaseInfo\RiskLevelEdit.aspx.cs:行号 91
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 14:59:40
+出错文件:http://localhost:8579/BaseInfo/RiskLevelEdit.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 14:59:40
+
+
+错误信息开始=====>
+错误类型:MissingMethodException
+错误信息:找不到方法:“Model.Base_RiskLevel BLL.RiskLevelService.GetRiskLevelBy(System.String)”。
+错误堆栈:
+   在 FineUIPro.Web.HSSE.Hazard.HazardListEdit.Window2_Close(Object sender, WindowCloseEventArgs e)
+   在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
+   在 (Window , WindowCloseEventArgs )
+   在 FineUIPro.Window.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 15:07:45
+出错文件:http://localhost:8579/HSSE/Hazard/HazardListEdit.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 15:07:45
+
+
+错误信息开始=====>
+错误类型:MissingMethodException
+错误信息:找不到方法:“Model.Base_RiskLevel BLL.RiskLevelService.GetRiskLevelBy(System.String)”。
+错误堆栈:
+   在 FineUIPro.Web.HSSE.Hazard.HazardListEdit.Window2_Close(Object sender, WindowCloseEventArgs e)
+   在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
+   在 (Window , WindowCloseEventArgs )
+   在 FineUIPro.Window.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 15:07:59
+出错文件:http://localhost:8579/HSSE/Hazard/HazardListEdit.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 15:07:59
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'CompileMan' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.BindGrid() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\CostGoods\FeeRegistration.aspx.cs:行号 99
+   在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.Page_Load(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\CostGoods\FeeRegistration.aspx.cs:行号 55
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 16:46:52
+出错文件:http://localhost:8579/HSSE/CostGoods/FeeRegistration.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 16:46:52
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 (Object )
+   在 FineUIPro.GridRow.uwEUVXJIBfEGVvHqMvTlecFpBACr()
+   在 (GridRow )
+   在 FineUIPro.GridRow.InitTemplateContainers()
+   在 (GridRow )
+   在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.BCddVmyfIadUytlhvgnchfKxYmAe(DataTable , Boolean )
+   在 (Grid , DataTable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.BindGrid()
+   在 FineUIPro.Web.HSSE.CostGoods.FeeRegistration.Page_Load(Object sender, EventArgs e)
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/02/2024 16:50:32
+出错文件:http://localhost:8579/HSSE/CostGoods/FeeRegistration.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/02/2024 16:50:32
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\CostGoods\PayRegistrationNewEdit.aspx(36): error CS1061: “ASP.hsse_costgoods_payregistrationnewedit_aspx”不包含“SMonthTypeText_TextChanged”的定义，并且找不到可接受类型为“ASP.hsse_costgoods_payregistrationnewedit_aspx”的第一个参数的扩展方法“SMonthTypeText_TextChanged”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:07/04/2024 09:53:49
+出错文件:http://localhost:8579/HSSE/CostGoods/PayRegistrationNewEdit.aspx
+IP地址:::1
+
+出错时间:07/04/2024 09:53:49
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
+出错时间:07/15/2024 11:49:20
+出错时间:07/15/2024 11:49:21
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
+出错时间:07/15/2024 12:19:20
+出错时间:07/15/2024 12:19:20
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
+出错时间:07/15/2024 12:49:20
+出错时间:07/15/2024 12:49:20
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13827
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:07/15/2024 13:19:20
+出错时间:07/15/2024 13:19:20
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13851
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:07/15/2024 13:19:20
+出错时间:07/15/2024 13:19:20
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13843
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:07/15/2024 13:19:20
+出错时间:07/15/2024 13:19:20
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13643
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:07/15/2024 13:19:20
+出错时间:07/15/2024 13:19:20
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
+出错时间:07/15/2024 13:19:20
+出错时间:07/15/2024 13:19:20
+
+
+错误信息开始=====>
+错误类型:ChangeConflictException
+错误信息:2 的 1 更新失败。
+错误堆栈:
+   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
+   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
+   在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\ProjectData\ProjectService.cs:行号 193
+   在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 284
+   在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 189
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/23/2024 17:52:24
+出错文件:http://localhost:8579/ProjectData/ProjectSetSave.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/23/2024 17:52:24
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
+出错时间:07/23/2024 18:18:27
+出错时间:07/23/2024 18:18:27
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
+出错时间:07/24/2024 10:37:35
+出错时间:07/24/2024 10:37:35
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:不能添加已经存在的实体。
+错误堆栈:
+   在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
+   在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
+   在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
+出错时间:07/24/2024 11:14:23
+出错时间:07/24/2024 11:14:23
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:参数化查询 '(@ProjectId nvarchar(4000))select*from Transfer_Civil_Structure
' 需要参数 '@ProjectId'，但未提供该参数。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.Transfer.CivilStructure.BindGrid() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\CivilStructure.aspx.cs:行号 61
+   在 FineUIPro.Web.Transfer.CivilStructure.Page_Load(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\CivilStructure.aspx.cs:行号 24
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:07/25/2024 09:25:40
+出错文件:http://localhost:8579/Transfer/CivilStructure.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:07/25/2024 09:25:40
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13827
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:07/25/2024 11:36:34
+出错时间:07/25/2024 11:36:34
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13851
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:07/25/2024 11:36:34
+出错时间:07/25/2024 11:36:34
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13843
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:07/25/2024 11:36:34
+出错时间:07/25/2024 11:36:34
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13643
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:07/25/2024 11:36:34
+出错时间:07/25/2024 11:36:34
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13827
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:07/25/2024 13:36:33
+出错时间:07/25/2024 13:36:33
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13851
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:07/25/2024 13:36:33
+出错时间:07/25/2024 13:36:33
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13843
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:07/25/2024 13:36:33
+出错时间:07/25/2024 13:36:33
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13643
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:07/25/2024 13:36:33
+出错时间:07/25/2024 13:36:33
+
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls
index bcabcaae..97f359e0 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Electrical导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Electrical导入模板.xls
index 24c5688b..59c1ddce 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/Electrical导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Electrical导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls
index e9d02061..88065a68 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls
index 3297ee8a..ec1bea39 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls
index 25111830..e8121c47 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls
index 640e8001..c69fc1ca 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
new file mode 100644
index 00000000..860f1125
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
@@ -0,0 +1,71 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFromChartNew.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFromChartNew" %>
+
+<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
+<!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>Punchlist from完成统计表</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />
+        <f:Panel ID="Panel3" CssClass="blockpanel" runat="server" EnableCollapse="false"
+            BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+            <Items>
+                <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+                    <Rows>
+                        <f:FormRow ColumnWidths="25% 30% 35%  10%">
+                            <Items>
+                                <f:DropDownList ID="ddlSystemNo" runat="server" Label="System No" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlSystemNo_SelectedIndexChanged" Width="300px" LabelWidth="100px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlDateType" runat="server" Label="日期类型" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlDateType_SelectedIndexChanged" Width="200px" LabelWidth="80px">
+                                    <f:ListItem Value="1" Text="一周"></f:ListItem>
+                                    <f:ListItem Value="2" Text="月份"></f:ListItem>
+                                </f:DropDownList>
+                                <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                    OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
+                                    <f:ListItem Value="Line" Text="折线图"></f:ListItem>
+                                    <f:ListItem Value="Column" Text="柱形图"></f:ListItem>
+                               <%--     <f:ListItem Value="Pie" Text="饼形图"></f:ListItem>
+                                    <f:ListItem Value="StackedArea" Text="堆积面积图"></f:ListItem>
+                                    <f:ListItem Value="Spline" Text="样条图"></f:ListItem>
+                                    <f:ListItem Value="SplineArea" Text="样条面积图"></f:ListItem>
+                                    <f:ListItem Value="StepLine" Text="阶梯线图"></f:ListItem>
+                                    <f:ListItem Value="Stock" Text="股价图"></f:ListItem>
+                                    <f:ListItem Value="Radar" Text="雷达图"></f:ListItem>--%>
+                                </f:DropDownList>
+                                <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
+                                </f:Button>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+        </f:Panel>
+        <f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false"
+            BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+            <Items>
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="600px" ShowBorder="true"
+                    TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                    <Tabs>
+                        <f:Tab ID="Tab2" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
+                            TitleToolTip="图形">
+                            <Items>
+                                <f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
+                                    <div id="divAccidentTime">
+                                        <uc1:ChartControl ID="ChartAccidentTime" runat="server" />
+                                    </div>
+                                </f:ContentPanel>
+                            </Items>
+                        </f:Tab>
+                    </Tabs>
+                </f:TabStrip>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
new file mode 100644
index 00000000..611f28d4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web.Services.Description;
+using BLL;
+using NPOI.SS.Formula.Functions;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class PunchlistFromChartNew : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                var systemNos = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).GroupBy(p => new { p.System_No }).Select(p => new { System_No = p.Key.System_No }).ToList();
+                int indexRow = 1;
+                ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
+                foreach (var t in systemNos)
+                {
+                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.System_No, t.System_No));
+                    indexRow++;
+                }
+
+            }
+        }
+
+        /// <summary>
+        /// 统计方法
+        /// </summary>
+        private void AnalyseData()
+        {
+            string _systemNo = ddlSystemNo.SelectedValue;
+            if (_systemNo == null)
+                _systemNo = "";
+            _systemNo = _systemNo.Trim();
+            //_systemNo为空则查全部
+            var forms = from x in Funs.DB.Transfer_PunchlistFrom
+                        where x.ProjectId == this.CurrUser.LoginProjectId && (x.System_No == _systemNo || _systemNo == "")
+                        select x;
+
+            string _dateType = ddlDateType.SelectedValue;
+
+            #region 按照当前日期前一周数据
+            if (_dateType == "1")
+            {
+                ///按单位统计
+                DataTable dtTime = new DataTable();
+                dtTime.Columns.Add("日期", typeof(string));
+                dtTime.Columns.Add("计划完成数量", typeof(string));
+                dtTime.Columns.Add("实际完成数量", typeof(string));
+                for (int i = 6; i >= 0; i--)
+                {
+                    DataRow rowTime = dtTime.NewRow();
+                    DateTime QueryTime = DateTime.Now.AddDays(i * -1);
+                    rowTime["日期"] = QueryTime.ToString("yyyy/MM/dd");
+                    DateTime startTime = Convert.ToDateTime(QueryTime.ToString("yyyy-MM-dd") + " 00:00:00");
+                    DateTime endTime = Convert.ToDateTime(QueryTime.ToString("yyyy-MM-dd") + " 23:59:59");
+                    rowTime["计划完成数量"] = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
+                    rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
+                    dtTime.Rows.Add(rowTime);
+                }
+                this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false));
+            }
+            #endregion
+
+            //按照当前月份到一月份的数据
+            if (_dateType == "2")
+            {
+                ///按单位统计
+                DataTable dtTime = new DataTable();
+                dtTime.Columns.Add("月份", typeof(string));
+                dtTime.Columns.Add("计划完成数量", typeof(string));
+                dtTime.Columns.Add("实际完成数量", typeof(string));
+                for (int i = 1; i <= DateTime.Now.Month; i++)
+                {
+                    DataRow rowTime = dtTime.NewRow();
+                    DateTime QueryTime =Convert.ToDateTime($"{DateTime.Now.Year.ToString()}-{i}-1 00:00:00");
+                    rowTime["月份"] = QueryTime.ToString("yyyy/MM");
+                    DateTime startTime = QueryTime;
+                    DateTime endTime = Convert.ToDateTime(QueryTime.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd") + " 23:59:59");
+                    rowTime["计划完成数量"] = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
+                    rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
+                    dtTime.Rows.Add(rowTime);
+                }
+                this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false));
+            }
+
+        }
+
+        /// <summary>
+        /// 统计分析
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        /// <summary>
+        /// 图形变换 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpChartType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        /// <summary>
+        /// 现在日期类型
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlDateType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        /// <summary>
+        /// 选择System No
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlSystemNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
new file mode 100644
index 00000000..6997ce9c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+
+
+    public partial class PunchlistFromChartNew
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// ddlSystemNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlSystemNo;
+
+        /// <summary>
+        /// ddlDateType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlDateType;
+
+        /// <summary>
+        /// drpChartType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpChartType;
+
+        /// <summary>
+        /// BtnAnalyse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// Panel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel4;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+
+        /// <summary>
+        /// cpAccidentTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel cpAccidentTime;
+
+        /// <summary>
+        /// ChartAccidentTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::Web.Controls.ChartControl ChartAccidentTime;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx
new file mode 100644
index 00000000..1486abcc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx
@@ -0,0 +1,61 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFromProgress.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFromProgress" %>
+
+<!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>Punchlist from进度跟踪表</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
+        <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="System_No" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="System_No" AllowSorting="true" OnSort="Grid1_Sort"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" EnableTextSelection="true">
+                    <Toolbars>
+                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
+                                </f:Button>
+
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+
+                        <f:BoundField Width="180px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No." />
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="SystemNoCount" DataField="SystemNoCount" HeaderText="尾项数量" FieldType="Double" />
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="ActualDateCount" DataField="ActualDateCount" HeaderText="已完成数量" FieldType="Double"/>
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="ClearedByCount" DataField="ClearedByCount" HeaderText="Cleared(PIC)" FieldType="Double"/>
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="ConfirmedByCount" DataField="ConfirmedByCount" HeaderText="Confirmed(WUH)" FieldType="Double"/>
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="VerifiedByCount" DataField="VerifiedByCount" HeaderText="Verified(BASF)" FieldType="Double"/>
+                    </Columns>
+                    <PageItems>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <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>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.cs
new file mode 100644
index 00000000..01fa6c0a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.cs
@@ -0,0 +1,96 @@
+using BLL;
+using BLL.CQMS.Comprehensive;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class PunchlistFromProgress : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void BindGrid()
+        {
+            StringBuilder strSql = new StringBuilder("");
+            strSql.AppendLine("IF OBJECT_ID('tempdb..#AllPunchlistFromProgressTemp') IS NOT NULL drop table #AllPunchlistFromProgressTemp; ");
+            strSql.AppendLine("IF OBJECT_ID('tempdb..#PunchlistFromProgressTemp') IS NOT NULL drop table #PunchlistFromProgressTemp; ");
+            strSql.AppendLine(" select System_No,Actual_Date,Cleared_By,Confirmed_By,Verified_By,ProjectId ");
+            strSql.AppendLine(" INTO #AllPunchlistFromProgressTemp from Transfer_PunchlistFrom where ProjectId = @ProjectId ");
+            strSql.AppendLine(" select System_No,count(System_No) SystemNoCount,cast(0 as decimal(18,2)) ActualDateCount ");
+            strSql.AppendLine(" ,cast(0 as decimal(18,2)) ClearedByCount,cast(0 as decimal(18,2)) ConfirmedByCount,cast(0 as decimal(18,2)) VerifiedByCount ");
+            strSql.AppendLine(" INTO #PunchlistFromProgressTemp from #AllPunchlistFromProgressTemp where ProjectId = @ProjectId group by System_No ");
+            strSql.AppendLine(" update  a set a.ActualDateCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Actual_Date,'')<>'')  ");
+            strSql.AppendLine(" ,a.ClearedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Cleared_By,'')<>'') ");
+            strSql.AppendLine(" ,a.ConfirmedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Confirmed_By,'')<>'')  ");
+            strSql.AppendLine(" ,a.VerifiedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Verified_By,'')<>'') ");
+            strSql.AppendLine(" from #PunchlistFromProgressTemp a ");
+            strSql.AppendLine(" select *  from #PunchlistFromProgressTemp ");
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+
+            strSql.AppendLine(" order by System_No ");
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.designer.cs
new file mode 100644
index 00000000..253b2cb7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.designer.cs
@@ -0,0 +1,89 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+
+
+    public partial class PunchlistFromProgress
+    {
+
+        /// <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>
+        /// ToolSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar ToolSearch;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx
new file mode 100644
index 00000000..f8c2f5b5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx
@@ -0,0 +1,120 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFromSort.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFromSort" %>
+
+<!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>Punchlist from分类表</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+
+        .LabelColor {
+            color: Red;
+            font-size: small;
+        }
+
+        .f-grid-row-summary .f-grid-cell-inner {
+            font-weight: bold;
+            color: red;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="TabStrip1" />
+        <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="ddlSystemNo" runat="server" Label="System No" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlSystemNo_SelectedIndexChanged" Width="300px" LabelWidth="100px">
+                        </f:DropDownList>
+                        <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
+                        </f:Button>
+                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+        <f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px">
+            <Items>
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="550px" ShowBorder="true"
+                    TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server" AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged"
+                    ActiveTabIndex="0">
+                    <Tabs>
+                        <f:Tab ID="Tab1" Title="按专业统计" BodyPadding="5px" Layout="VBox" IconFont="ListAlt" runat="server">
+                            <Items>
+                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                                    runat="server" DataKeyNames="Disc" AllowCellEditing="true" EnableColumnLines="true"
+                                    ClicksToEdit="2" DataIDField="Disc" AllowSorting="true" OnSort="Grid1_Sort"
+                                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                                    EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow">
+                                    <Columns>
+                                        <f:BoundField DataField="Disc" ColumnID="Disc" HeaderText="专业" ExpandUnusedSpace="true" MinWidth="150px" />
+                                        <f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
+                                            <Columns>
+                                                <f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
+                                            </Columns>
+                                        </f:GroupField>
+                                    </Columns>
+                                    <PageItems>
+                                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                            <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:Tab>
+                        <f:Tab ID="Tab2" Title="按单位统计" BodyPadding="5px" Layout="VBox" IconFont="ListAlt" runat="server">
+                            <Items>
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                                    runat="server" DataKeyNames="Action_By" AllowCellEditing="true" EnableColumnLines="true"
+                                    ClicksToEdit="2" DataIDField="Action_By" AllowSorting="true" OnSort="Grid2_Sort"
+                                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid2_PageIndexChange"
+                                    EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow">
+                                    <Columns>
+                                        <f:BoundField DataField="Action_By" ColumnID="Action_By" HeaderText="单位" ExpandUnusedSpace="true" MinWidth="150px" />
+                                        <f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
+                                            <Columns>
+                                                <f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
+                                            </Columns>
+                                        </f:GroupField>
+                                    </Columns>
+                                    <PageItems>
+                                        <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize2" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize2_SelectedIndexChanged">
+                                            <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:Tab>
+                    </Tabs>
+                </f:TabStrip>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.cs
new file mode 100644
index 00000000..969123b8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.cs
@@ -0,0 +1,252 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class PunchlistFromSort : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                var systemNos = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).GroupBy(p => new { p.System_No }).Select(p => new { System_No = p.Key.System_No }).ToList();
+                int indexRow = 1;
+                ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
+                foreach (var t in systemNos)
+                {
+                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.System_No, t.System_No));
+                    indexRow++;
+                }
+
+                BindGrid1();
+            }
+        }
+
+        /// <summary>
+        /// 选择System No
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlSystemNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid1();
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid1();
+            BindGrid2();
+        }
+
+        #region 分页、排序
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue);
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid2.SortDirection = e.SortDirection;
+            Grid2.SortField = e.SortField;
+            BindGrid2();
+        }
+        #endregion
+
+        /// <summary>
+        /// 查询绑定数据
+        /// </summary>
+        public void BindGrid1()
+        {
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string _systemNo = string.Empty;
+            _systemNo = ddlSystemNo.SelectedValue;
+            StringBuilder strSql = new StringBuilder("");
+            strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllPunchlistFromSortTemp1') IS NOT NULL drop table #AllPunchlistFromSortTemp1; ");
+            strSql.AppendLine(" IF OBJECT_ID('tempdb..#PunchlistFromSortTemp1') IS NOT NULL drop table #PunchlistFromSortTemp1; ");
+            strSql.AppendLine(" select * INTO #AllPunchlistFromSortTemp1 from  Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
+            if (!string.IsNullOrWhiteSpace(_systemNo))
+            {
+                strSql.AppendLine(" AND System_No=@System_No ");
+                listStr.Add(new SqlParameter("@System_No", _systemNo));
+            }
+            strSql.AppendLine(" select Disc,cast(0 as decimal(18,2)) Cat_A_Count,cast(0 as decimal(18,2)) Cat_B_Count,cast(0 as decimal(18,2)) Cat_C_Count,cast(0 as decimal(18,2)) Cat_D_Count INTO #PunchlistFromSortTemp1 from #AllPunchlistFromSortTemp1 Group by Disc; ");
+            strSql.AppendLine(" update  a set a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')) ");
+            strSql.AppendLine(",a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ");
+            strSql.AppendLine(",a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ");
+            strSql.AppendLine(",a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ");
+            strSql.AppendLine("from #PunchlistFromSortTemp1 a;");
+            strSql.AppendLine("select *  from #PunchlistFromSortTemp1 ");
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            strSql.AppendLine(" order by Disc ");
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+
+            //合计
+            int cat_A_Count = 0;
+            int cat_B_Count = 0;
+            int cat_C_Count = 0;
+            int cat_D_Count = 0;
+            foreach (DataRow row in tb.Rows)
+            {
+                cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
+                cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
+                cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
+                cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
+            }
+
+
+            JObject summary = new JObject();
+            summary.Add("Disc", "合计");
+            summary.Add("Cat_A_Count", cat_A_Count.ToString());
+            summary.Add("Cat_B_Count", cat_B_Count.ToString());
+            summary.Add("Cat_C_Count", cat_C_Count.ToString());
+            summary.Add("Cat_D_Count", cat_D_Count.ToString());
+
+
+            Grid1.SummaryData = summary;
+        }
+
+        /// <summary>
+        /// 查询绑定数据
+        /// </summary>
+        public void BindGrid2()
+        {
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string _systemNo = string.Empty;
+            _systemNo = ddlSystemNo.SelectedValue;
+            StringBuilder strSql = new StringBuilder("");
+            strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllPunchlistFromSortTemp2') IS NOT NULL drop table #AllPunchlistFromSortTemp2; ");
+            strSql.AppendLine(" IF OBJECT_ID('tempdb..#PunchlistFromSortTemp2') IS NOT NULL drop table #PunchlistFromSortTemp2; ");
+            strSql.AppendLine(" select * INTO #AllPunchlistFromSortTemp2 from  Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
+            if (!string.IsNullOrWhiteSpace(_systemNo))
+            {
+                strSql.AppendLine(" AND System_No=@System_No ");
+                listStr.Add(new SqlParameter("@System_No", _systemNo));
+            }
+            strSql.AppendLine(" select Action_By,cast(0 as decimal(18,2)) Cat_A_Count,cast(0 as decimal(18,2)) Cat_B_Count,cast(0 as decimal(18,2)) Cat_C_Count,cast(0 as decimal(18,2)) Cat_D_Count INTO #PunchlistFromSortTemp2 from #AllPunchlistFromSortTemp2 Group by Action_By; ");
+            strSql.AppendLine(" update  a set a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')) ");
+            strSql.AppendLine(",a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ");
+            strSql.AppendLine(",a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ");
+            strSql.AppendLine(",a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ");
+            strSql.AppendLine("from #PunchlistFromSortTemp2 a;");
+            strSql.AppendLine("select *  from #PunchlistFromSortTemp2 ");
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            strSql.AppendLine(" order by Action_By ");
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
+            Grid2.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid2.DataSource = table;
+            Grid2.DataBind();
+
+            //合计
+            int cat_A_Count = 0;
+            int cat_B_Count = 0;
+            int cat_C_Count = 0;
+            int cat_D_Count = 0;
+            foreach (DataRow row in tb.Rows)
+            {
+                cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
+                cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
+                cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
+                cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
+            }
+
+
+            JObject summary = new JObject();
+            summary.Add("Action_By", "合计");
+            summary.Add("Cat_A_Count", cat_A_Count.ToString());
+            summary.Add("Cat_B_Count", cat_B_Count.ToString());
+            summary.Add("Cat_C_Count", cat_C_Count.ToString());
+            summary.Add("Cat_D_Count", cat_D_Count.ToString());
+
+
+            Grid2.SummaryData = summary;
+        }
+
+        protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
+        {
+            if (TabStrip1.ActiveTabIndex == 0)
+            {
+                BindGrid1();
+            }
+            else if (TabStrip1.ActiveTabIndex == 1)
+            {
+                BindGrid2();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.designer.cs
new file mode 100644
index 00000000..7574e5e5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+
+
+    public partial class PunchlistFromSort
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// ddlSystemNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlSystemNo;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Tab1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+
+        /// <summary>
+        /// ddlPageSize2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize2;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
index eae82268..c8ca38dc 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
@@ -26,13 +26,19 @@
 
                                  <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                    <f:ListItem Value="" Text="All" Selected="true"/>
+                                    <f:ListItem Value="Not Start" Text="Not Start"/>
+                                    <f:ListItem Value="In progress" Text="In progress"/>
+                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                </f:DropDownList>
+                                <%--<f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="至">
                                 </f:Label>
                                 <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
-                                </f:DatePicker>
+                                </f:DatePicker>--%>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -62,12 +68,39 @@
                             </Columns>
                         </f:GroupField>
                        
-                         <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
+                         <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
                             <Columns>
-                                <f:RenderField Width="200px" ColumnID="Test_Package_START" DataField="Test_Package_START" HeaderText="Test Package START"  TextAlign="Center"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
-                                <f:RenderField Width="200px" ColumnID="Test_Package_FINISH" DataField="Test_Package_FINISH" HeaderText="Test Package FINISH"  TextAlign="Center"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
+                                   <f:RenderField ColumnID="Foundation" DataField="Foundation" FieldType="String" HeaderText="Foundation" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                 <f:RenderField ColumnID="Mainstructure" DataField="Mainstructure" FieldType="String" HeaderText="Main structure<br/> acceptance" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                 <f:RenderField ColumnID="Buildingdecoration" DataField="Buildingdecoration" FieldType="String" HeaderText="Building<br/> decoration" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                 <f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Equipment" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                 <f:RenderField ColumnID="Instrument" DataField="Instrument" FieldType="String" HeaderText="Instrument" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                 <f:RenderField ColumnID="Electrical" DataField="Electrical" FieldType="String" HeaderText="Electrical" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                 <f:RenderField ColumnID="FireFighting" DataField="FireFighting" FieldType="String" HeaderText="Fire<br/> Fighting" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                 <f:RenderField ColumnID="HVAC" DataField="HVAC" FieldType="String" HeaderText="HVAC" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
                             </Columns>
                         </f:GroupField>
                        
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
index 24c855b6..71547de1 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
@@ -40,22 +40,27 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Civil_Structure like @Civil_Structure";
                 listStr.Add(new SqlParameter("@Civil_Structure", "%" + this.txtCivil_Structure.Text.Trim() + "%"));
             }
-            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
-            {
-                strSql += " AND Test_Package_START >= @InspectionDateA";
-                listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
-            {
-                strSql += " AND Test_Package_START <= @InspectionDateZ";
-                listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
-            }
+            //if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            //{
+            //    strSql += " AND Test_Package_START >= @InspectionDateA";
+            //    listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            //{
+            //    strSql += " AND Test_Package_START <= @InspectionDateZ";
+            //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+            //}
             if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
             {
                 strSql += " AND SystemName like @SystemName";
                 listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
             }
 
+            if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
+            {
+                strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
+            }
+
             strSql += " order by  Civil_Structure ";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
index 4fbe8adf..f91ecef9 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
@@ -78,31 +78,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtSystem;
 
         /// <summary>
-        /// txtStarTime 控件。
+        /// ddStatus 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtStarTime;
-
-        /// <summary>
-        /// Label1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label1;
-
-        /// <summary>
-        /// txtEndTime 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndTime;
+        protected global::FineUIPro.DropDownList ddStatus;
 
         /// <summary>
         /// btnSearch 控件。
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
index adb45470..3ec42e7c 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 7);
+                AddDatasetToSQL(ds.Tables[0], 12);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -168,30 +168,12 @@ namespace FineUIPro.Web.Transfer
             {
                 for (int i = 1; i < ir; i++)
                 {
-                    string row4 = pds.Rows[i][4].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    string row4 = pds.Rows[i][0].ToString();
+                    if (string.IsNullOrEmpty(row4))
                     {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row4.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
-                        }
-                    }
-                    string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row5))
-                    {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row5.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
-                        }
+                        result += (i + 3).ToString() + "," + "Structure/Civil/Architecture" + "," + "不能为空！" + "|";
                     }
+
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -298,7 +280,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 7);
+                AddDatasetToSQL2(ds.Tables[0], 12);
             }
             catch (Exception ex)
             {
@@ -329,57 +311,95 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_Civil_Structure> list = new List<Model.Transfer_Civil_Structure>();
                 for (int i = 1; i < ir; i++)
                 {
-                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
+                    //if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
+                    //{
+                    //    //查询第一列，没查到的情况下作导入处理
+                    //    var modelOnly = Funs.DB.Transfer_Civil_Structure.FirstOrDefault(x => x.Civil_Structure == pds.Rows[i][0].ToString().Trim()
+                    //&& x.ProjectId == CurrUser.LoginProjectId);
+                    //    if (modelOnly == null)
+                    //    {
+                    Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
+                    model.Id = Guid.NewGuid().ToString();
+                    model.ProjectId = CurrUser.LoginProjectId;
+                    model.Civil_Structure = pds.Rows[i][0].ToString().Trim();
+                    model.SystemName = pds.Rows[i][1].ToString().Trim();
+                    model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    model.Test_Package = pds.Rows[i][3].ToString().Trim();
+
+                    var obj1 = model.Foundation = pds.Rows[i][4].ToString().Trim();
+                    var obj2 = model.Mainstructure = pds.Rows[i][5].ToString().Trim();
+                    var obj3 = model.Buildingdecoration = pds.Rows[i][6].ToString().Trim();
+                    var obj4 = model.Equipment = pds.Rows[i][7].ToString().Trim();
+                    var obj5 = model.Instrument = pds.Rows[i][8].ToString().Trim();
+                    var obj6 = model.Electrical = pds.Rows[i][9].ToString().Trim();
+                    var obj7 = model.FireFighting = pds.Rows[i][10].ToString().Trim();
+                    var obj8 = model.HVAC = pds.Rows[i][11].ToString().Trim();
+                    #region 判断状态
+                    var listObj = new List<string>();
+                    listObj.Add(obj1);
+                    listObj.Add(obj2);
+                    listObj.Add(obj3);
+                    listObj.Add(obj4);
+                    listObj.Add(obj5);
+                    listObj.Add(obj6);
+                    listObj.Add(obj7);
+                    listObj.Add(obj8);
+                    //全是NA或Completed 状态是Completed
+                    if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 8)
                     {
-                        //查询第一列，没查到的情况下作导入处理
-                        var modelOnly = Funs.DB.Transfer_Civil_Structure.FirstOrDefault(x => x.Civil_Structure == pds.Rows[i][0].ToString().Trim()
-                    && x.ProjectId == CurrUser.LoginProjectId);
-                        if (modelOnly == null)
-                        {
-                            Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
-                            model.Id = Guid.NewGuid().ToString();
-                            model.ProjectId = CurrUser.LoginProjectId;
-                            model.Civil_Structure = pds.Rows[i][0].ToString().Trim();
-                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                            DateTime t1, t2;
-                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                                model.Test_Package_START = t1;
-                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                                model.Test_Package_FINISH = t2;
-
-                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                            if (model.FINAL_Status.ToLower() == "finished")
-                            {
-                                model.CompleteTime = DateTime.Now;
-                            }
-                            list.Add(model);
-                        }
-                        else
-                        {
-                            //修改
-                            modelOnly.Civil_Structure = pds.Rows[i][0].ToString().Trim();
-                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                            DateTime t1, t2;
-                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                                modelOnly.Test_Package_START = t1;
-                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                                modelOnly.Test_Package_FINISH = t2;
-
-                            //更改前不是finished，更改后是finished的，才修改实际完成时间
-                            if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim()== "finished")
-                            {
-                                modelOnly.CompleteTime = DateTime.Now;
-                            }
-                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-
-                            
-                            Funs.DB.SubmitChanges();
-                        }
+                        model.FINAL_Status = "Completed";
+                        list.Add(model);
+                        continue;
                     }
+
+
+                    //如果全是Not Start 就是 Not Start
+                    if (listObj.Where(x => x == "Not Start").ToList().Count == 8)
+                    {
+                        model.FINAL_Status = "Not Start";
+                        list.Add(model);
+                        continue;
+                    }
+
+                    //如果其中有一项是In progress 或Not Start 是 In progress
+                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    {
+                        model.FINAL_Status = "In progress";
+                        list.Add(model);
+                        continue;
+                    }
+
+                    model.FINAL_Status = "Not Start";
+                    list.Add(model);
+
+                    #endregion
+
+                    list.Add(model);
+                    //    }
+                    //    else
+                    //    {
+                    //        //修改
+                    //        modelOnly.Civil_Structure = pds.Rows[i][0].ToString().Trim();
+                    //        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                    //        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    //        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                    //        DateTime t1, t2;
+                    //        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                    //            modelOnly.Test_Package_START = t1;
+                    //        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                    //            modelOnly.Test_Package_FINISH = t2;
+
+                    //        //更改前不是finished，更改后是finished的，才修改实际完成时间
+                    //        if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim()== "finished")
+                    //        {
+                    //            modelOnly.CompleteTime = DateTime.Now;
+                    //        }
+                    //        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+
+
+                    //        Funs.DB.SubmitChanges();
+                    //    }
+                    //}
                 }
                 if (list.Count > 0)
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
index 22689192..dd3bc5e2 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
@@ -22,17 +22,24 @@
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 
-                                <f:TextBox runat="server" ID="txtELECTRICAL" Label="ELECTRICAL" LabelWidth="150px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtELECTRICAL" Label="Tag. No" LabelWidth="110px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                    <f:ListItem Value="" Text="All" Selected="true"/>
+                                    <f:ListItem Value="Not Start" Text="Not Start"/>
+                                    <f:ListItem Value="In progress" Text="In progress"/>
+                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                </f:DropDownList>
+
+                               <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="至">
                                 </f:Label>
                                 <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
-                                </f:DatePicker>
+                                </f:DatePicker>--%>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -50,24 +57,35 @@
                       
                           <f:GroupField HeaderText="ELECTRICAL" TextAlign="Center" MinWidth="200px">
                             <Columns>
-                                <f:BoundField Width="200px"  TextAlign="Center"  ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="ELECTRICAL" />
+                                <f:BoundField Width="200px"  TextAlign="Center"  ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
                             </Columns>
                         </f:GroupField>
                        
                          <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
                             <Columns>
-                                <f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
-                                <f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
-                                <f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
+                                <f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="System" TextAlign="Center"/>
+                                <f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
+                                <f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
                             </Columns>
                         </f:GroupField>
                        
                          <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
                             <Columns>
-                                <f:RenderField Width="200px" ColumnID="Test_Package_START" DataField="Test_Package_START" HeaderText="Test Package START"  TextAlign="Center"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
-                                <f:RenderField Width="200px" ColumnID="Test_Package_FINISH" DataField="Test_Package_FINISH" HeaderText="Test Package FINISH"  TextAlign="Center"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
+                                    <f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/> &Inspection Reocrd" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="Communicationtest" DataField="Communicationtest" FieldType="String" HeaderText="Communication<br/> test" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+                    
+                                <f:RenderField ColumnID="CableLaying" DataField="CableLaying" FieldType="String" HeaderText="Cable Laying and<br/> Insulation Test<br/> Record" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="LoopTest" DataField="LoopTest" FieldType="String" HeaderText="Loop Test" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
                             </Columns>
                         </f:GroupField>
                        
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
index 12d64925..6851b722 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
@@ -40,16 +40,7 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND ELECTRICAL like @ELECTRICAL";
                 listStr.Add(new SqlParameter("@ELECTRICAL", "%" + this.txtELECTRICAL.Text.Trim() + "%"));
             }
-            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
-            {
-                strSql += " AND Test_Package_START >= @InspectionDateA";
-                listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
-            {
-                strSql += " AND Test_Package_START <= @InspectionDateZ";
-                listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
-            }
+            
 
             if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
             {
@@ -57,6 +48,11 @@ namespace FineUIPro.Web.Transfer
                 listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
             }
 
+            if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
+            {
+                strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
+            }
+
             strSql += " order by ELECTRICAL ";
 
             SqlParameter[] parameter = listStr.ToArray();
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
index da5c48b7..fe7892fc 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
@@ -78,31 +78,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtSystem;
 
         /// <summary>
-        /// txtStarTime 控件。
+        /// ddStatus 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtStarTime;
-
-        /// <summary>
-        /// Label1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label1;
-
-        /// <summary>
-        /// txtEndTime 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndTime;
+        protected global::FineUIPro.DropDownList ddStatus;
 
         /// <summary>
         /// btnSearch 控件。
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
index aeeea6c2..1e4331a3 100644
--- a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
@@ -129,7 +129,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 7);
+                AddDatasetToSQL(ds.Tables[0], 8);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -156,9 +156,9 @@ namespace FineUIPro.Web.Transfer
             string result = string.Empty;
             int ic, ir;
             ic = pds.Columns.Count;
-            if (ic < Cols)
+            if (ic != Cols)
             {
-                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                ShowNotify("导入Excel格式错误！Excel必须是" + Cols.ToString().Trim() + "列", MessageBoxIcon.Warning);
                 return false;
             }
 
@@ -167,30 +167,12 @@ namespace FineUIPro.Web.Transfer
             {
                 for (int i = 1; i < ir; i++)
                 {
-                    string row4 = pds.Rows[i][4].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    string row4 = pds.Rows[i][0].ToString();
+                    if (string.IsNullOrEmpty(row4))
                     {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row4.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
-                        }
-                    }
-                    string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row5))
-                    {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row5.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
-                        }
+                        result += (i + 2).ToString() + "," + "Tag. No" + "," + "不能为空！" + "|";
                     }
+
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -297,7 +279,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 7);
+                AddDatasetToSQL2(ds.Tables[0], 9);
             }
             catch (Exception ex)
             {
@@ -328,60 +310,90 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_Electrical> list = new List<Model.Transfer_Electrical>();
                 for (int i = 1; i < ir; i++)
                 {
-                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
+                    //if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
+                    //{
+                    //    //查询第一列，没查到的情况下作导入处理
+                    //    var modelOnly = Funs.DB.Transfer_Electrical.FirstOrDefault(x => x.ELECTRICAL == pds.Rows[i][0].ToString().Trim()
+                    //&& x.ProjectId == CurrUser.LoginProjectId);
+                    //    if (modelOnly == null)
+                    //    {
+                    Model.Transfer_Electrical model = new Model.Transfer_Electrical();
+                    model.Id = Guid.NewGuid().ToString();
+                    model.ProjectId = CurrUser.LoginProjectId;
+                    model.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
+                    model.SystemName = pds.Rows[i][1].ToString().Trim();
+                    model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    model.Test_Package = pds.Rows[i][3].ToString().Trim();
+
+                    var obj1 = model.Installation = pds.Rows[i][4].ToString().Trim();
+                    var obj2 = model.Communicationtest = pds.Rows[i][5].ToString().Trim();
+                    var obj3 = model.CableLaying = pds.Rows[i][6].ToString().Trim();
+                    var obj4 = model.LoopTest = pds.Rows[i][7].ToString().Trim();
+                    #region 判断状态
+                    var listObj = new List<string>();
+                    listObj.Add(obj1);
+                    listObj.Add(obj2);
+                    listObj.Add(obj3);
+                    listObj.Add(obj4);
+                    //全是NA或Completed 状态是Completed
+                    if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
                     {
-                        //查询第一列，没查到的情况下作导入处理
-                        var modelOnly = Funs.DB.Transfer_Electrical.FirstOrDefault(x => x.ELECTRICAL == pds.Rows[i][0].ToString().Trim()
-                    && x.ProjectId == CurrUser.LoginProjectId);
-                        if (modelOnly == null)
-                        {
-                            Model.Transfer_Electrical model = new Model.Transfer_Electrical();
-                            model.Id = Guid.NewGuid().ToString();
-                            model.ProjectId = CurrUser.LoginProjectId;
-                            model.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
-                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                            DateTime t1, t2;
-                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                                model.Test_Package_START = t1;
-                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                                model.Test_Package_FINISH = t2;
-
-                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                            if (model.FINAL_Status.ToLower() == "finished")
-                            {
-                                model.CompleteTime = DateTime.Now;
-                            }
-
-                            list.Add(model);
-                        }
-                        else
-                        {
-                            //修改
-                            modelOnly.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
-                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                            DateTime t1, t2;
-                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                                modelOnly.Test_Package_START = t1;
-                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                                modelOnly.Test_Package_FINISH = t2;
-
-                            //更改前不是finished，更改后是finished的，才修改实际完成时间
-                            if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
-                            {
-                                modelOnly.CompleteTime = DateTime.Now;
-                            }
-                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                            //if (modelOnly.FINAL_Status.ToLower() == "finished")
-                            //{
-                            //    modelOnly.CompleteTime = DateTime.Now;
-                            //}
-                            Funs.DB.SubmitChanges();
-                        }
+                        model.FINAL_Status = "Completed";
+                        list.Add(model);
+                        continue;
                     }
+
+
+                    //如果全是Not Start 就是 Not Start
+                    if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
+                    {
+                        model.FINAL_Status = "Not Start";
+                        list.Add(model);
+                        continue;
+                    }
+
+                    //如果其中有一项是In progress 或Not Start 是 In progress
+                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    {
+                        model.FINAL_Status = "In progress";
+                        list.Add(model);
+                        continue;
+                    }
+
+                    model.FINAL_Status = "Not Start";
+                    list.Add(model);
+
+                    #endregion
+
+
+                    list.Add(model);
+                    //    }
+                    //    else
+                    //    {
+                    //        //修改
+                    //        modelOnly.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
+                    //        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                    //        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    //        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                    //        DateTime t1, t2;
+                    //        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                    //            modelOnly.Test_Package_START = t1;
+                    //        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                    //            modelOnly.Test_Package_FINISH = t2;
+
+                    //        //更改前不是finished，更改后是finished的，才修改实际完成时间
+                    //        if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
+                    //        {
+                    //            modelOnly.CompleteTime = DateTime.Now;
+                    //        }
+                    //        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                    //        //if (modelOnly.FINAL_Status.ToLower() == "finished")
+                    //        //{
+                    //        //    modelOnly.CompleteTime = DateTime.Now;
+                    //        //}
+                    //        Funs.DB.SubmitChanges();
+                    //    }
+                    //}
                 }
                 if (list.Count > 0)
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
index 6ce2465d..999b3a27 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
@@ -22,17 +22,24 @@
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 
-                                <f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="INSTRUMENTATION" LabelWidth="150px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="Tag No" LabelWidth="120px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                    <f:ListItem Value="" Text="All" Selected="true"/>
+                                    <f:ListItem Value="Not Start" Text="Not Start"/>
+                                    <f:ListItem Value="In progress" Text="In progress"/>
+                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                </f:DropDownList>
+
+                               <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="至">
                                 </f:Label>
                                 <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
-                                </f:DatePicker>
+                                </f:DatePicker>--%>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -50,28 +57,43 @@
                       
                           <f:GroupField HeaderText="INSTRUMENTATION" TextAlign="Center" MinWidth="200px">
                             <Columns>
-                                <f:BoundField Width="200px"  TextAlign="Center"  ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="INSTRUMENTATION" />
+                                <f:BoundField Width="200px"  TextAlign="Center"  ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" />
                             </Columns>
                         </f:GroupField>
                        
                          <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
                             <Columns>
-                                <f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
-                                <f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
-                                <f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
+                                <f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="System" TextAlign="Center"/>
+                                <f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
+                                <f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
                             </Columns>
                         </f:GroupField>
                        
                          <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
                             <Columns>
-                                <f:RenderField Width="200px" ColumnID="Test_Package_START" DataField="Test_Package_START" HeaderText="Test Package START"  TextAlign="Center"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
-                                <f:RenderField Width="200px" ColumnID="Test_Package_FINISH" DataField="Test_Package_FINISH" HeaderText="Test Package FINISH"  TextAlign="Center"
-                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
+                                <f:RenderField ColumnID="InstallationCalibration" DataField="InstallationCalibration" FieldType="String" HeaderText="Installation<br/> &Calibration " TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="PipingPressuretest" DataField="PipingPressuretest" FieldType="String" HeaderText="Piping Pressure test" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="PipingLeak" DataField="PipingLeak" FieldType="String" HeaderText="Piping Leak/<br/>Vacuum Test" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="PipingBlowing" DataField="PipingBlowing" FieldType="String" HeaderText="Piping Blowing" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="Looptest" DataField="Looptest" FieldType="String" HeaderText="Loop test" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
                             </Columns>
                         </f:GroupField>
                        
-                         <f:BoundField MinWidth="200px"  ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status"  TextAlign="Center"/>
+                         <f:BoundField MinWidth="200px"  ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="Mechanical FINAL Status"  TextAlign="Center"/>
 
                     </Columns>
                     <Listeners>
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
index 2d7a5239..b937b0ec 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
@@ -40,17 +40,23 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND INSTRUMENTATION like @INSTRUMENTATION";
                 listStr.Add(new SqlParameter("@INSTRUMENTATION", "%" + this.txtINSTRUMENTATION.Text.Trim() + "%"));
             }
-            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+
+            if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
             {
-                strSql += " AND Test_Package_START >= @InspectionDateA";
-                listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
-            {
-                strSql += " AND Test_Package_START <= @InspectionDateZ";
-                listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+                strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
             }
 
+            //if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            //{
+            //    strSql += " AND Test_Package_START >= @InspectionDateA";
+            //    listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            //{
+            //    strSql += " AND Test_Package_START <= @InspectionDateZ";
+            //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+            //}
+
             if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
             {
                 strSql += " AND SystemName like @SystemName";
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
index 5272a8ec..a7420b4b 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
@@ -78,31 +78,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtSystem;
 
         /// <summary>
-        /// txtStarTime 控件。
+        /// ddStatus 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtStarTime;
-
-        /// <summary>
-        /// Label1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label1;
-
-        /// <summary>
-        /// txtEndTime 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndTime;
+        protected global::FineUIPro.DropDownList ddStatus;
 
         /// <summary>
         /// btnSearch 控件。
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
index d9d6b047..683a75de 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 7);
+                AddDatasetToSQL(ds.Tables[0], 9);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -157,9 +157,9 @@ namespace FineUIPro.Web.Transfer
             string result = string.Empty;
             int ic, ir;
             ic = pds.Columns.Count;
-            if (ic < Cols)
+            if (ic != Cols)
             {
-                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                ShowNotify("导入Excel格式错误！Excel必须是" + Cols.ToString().Trim() + "列", MessageBoxIcon.Warning);
                 return false;
             }
 
@@ -169,29 +169,11 @@ namespace FineUIPro.Web.Transfer
                 for (int i = 1; i < ir; i++)
                 {
                     string row4 = pds.Rows[i][4].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    if (string.IsNullOrEmpty(row4))
                     {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row4.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
-                        }
-                    }
-                    string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row5))
-                    {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row5.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 2).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
-                        }
+                        result += (i + 2).ToString() + "," + "Tag No" + "," + "不能为空！" + "|";
                     }
+
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -298,7 +280,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 7);
+                AddDatasetToSQL2(ds.Tables[0], 9);
             }
             catch (Exception ex)
             {
@@ -318,9 +300,9 @@ namespace FineUIPro.Web.Transfer
         {
             int ic, ir;
             ic = pds.Columns.Count;
-            if (ic < Cols)
+            if (ic != Cols)
             {
-                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                ShowNotify("导入Excel格式错误！Excel只能有" + Cols.ToString().Trim() + "列", MessageBoxIcon.Warning);
             }
             string result = string.Empty;
             ir = pds.Rows.Count;
@@ -331,58 +313,90 @@ namespace FineUIPro.Web.Transfer
                 {
                     if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
                     {
-                        //查询第一列，没查到的情况下作导入处理
-                        var modelOnly = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.INSTRUMENTATION == pds.Rows[i][0].ToString().Trim()
-                        && x.ProjectId == CurrUser.LoginProjectId);
-                        if (modelOnly == null)
+                        ////查询第一列，没查到的情况下作导入处理
+                        //var modelOnly = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.INSTRUMENTATION == pds.Rows[i][0].ToString().Trim()
+                        //&& x.ProjectId == CurrUser.LoginProjectId);
+                        //if (modelOnly == null)
+                        //{
+                        Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
+                        model.Id = Guid.NewGuid().ToString();
+                        model.ProjectId = CurrUser.LoginProjectId;
+                        model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
+                        model.SystemName = pds.Rows[i][1].ToString().Trim();
+                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
+
+                        var obj1 = model.InstallationCalibration = pds.Rows[i][4].ToString().Trim();
+                        var obj2 = model.PipingPressuretest = pds.Rows[i][5].ToString().Trim();
+                        var obj3 = model.PipingLeak = pds.Rows[i][6].ToString().Trim();
+                        var obj4 = model.PipingBlowing = pds.Rows[i][7].ToString().Trim();
+                        var obj5 = model.Looptest = pds.Rows[i][8].ToString().Trim();
+                        #region 判断状态
+                        var listObj = new List<string>();
+                        listObj.Add(obj1);
+                        listObj.Add(obj2);
+                        listObj.Add(obj3);
+                        listObj.Add(obj4);
+                        listObj.Add(obj5);
+                        //全是NA或Completed 状态是Completed
+                        if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
                         {
-                            Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
-                            model.Id = Guid.NewGuid().ToString();
-                            model.ProjectId = CurrUser.LoginProjectId;
-                            model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
-                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                            DateTime t1, t2;
-                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                                model.Test_Package_START = t1;
-                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                                model.Test_Package_FINISH = t2;
-
-                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                            if (model.FINAL_Status.ToLower() == "finished")
-                            {
-                                model.CompleteTime = DateTime.Now;
-                            }
-
+                            model.FINAL_Status = "Completed";
                             list.Add(model);
+                            continue;
                         }
-                        else
-                        {
-                            //修改
-                            modelOnly.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
-                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                            DateTime t1, t2;
-                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                                modelOnly.Test_Package_START = t1;
-                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                                modelOnly.Test_Package_FINISH = t2;
 
-                            //更改前不是finished，更改后是finished的，才修改实际完成时间
-                            if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
-                            {
-                                modelOnly.CompleteTime = DateTime.Now;
-                            }
-                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                            //if (modelOnly.FINAL_Status.ToLower() == "finished")
-                            //{
-                            //    modelOnly.CompleteTime = DateTime.Now;
-                            //}
-                            Funs.DB.SubmitChanges();
+
+                        //如果全是Not Start 就是 Not Start
+                        if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
+                        {
+                            model.FINAL_Status = "Not Start";
+                            list.Add(model);
+                            continue;
                         }
 
+                        //如果其中有一项是In progress 或Not Start 是 In progress
+                        if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                        {
+                            model.FINAL_Status = "In progress";
+                            list.Add(model);
+                            continue;
+                        }
+
+                        model.FINAL_Status = "Not Start";
+                        list.Add(model);
+
+                        #endregion
+
+                        list.Add(model);
+
+                        //}
+                        //else
+                        //{
+                        //    //修改
+                        //    modelOnly.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
+                        //    modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                        //    modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                        //    modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                        //    DateTime t1, t2;
+                        //    if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                        //        modelOnly.Test_Package_START = t1;
+                        //    if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                        //        modelOnly.Test_Package_FINISH = t2;
+
+                        //    //更改前不是finished，更改后是finished的，才修改实际完成时间
+                        //    if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
+                        //    {
+                        //        modelOnly.CompleteTime = DateTime.Now;
+                        //    }
+                        //    modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                        //    //if (modelOnly.FINAL_Status.ToLower() == "finished")
+                        //    //{
+                        //    //    modelOnly.CompleteTime = DateTime.Now;
+                        //    //}
+                        //    Funs.DB.SubmitChanges();
+                        //}
+
 
                     }
                 }
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
index fb0d0de3..75d86f91 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
@@ -22,17 +22,17 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="PIPINGLINENUMBER" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="Test Package No" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
 
-                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM NO" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
+
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                    <f:ListItem Value="" Text="All" Selected="true"/>
+                                    <f:ListItem Value="Not Start" Text="Not Start"/>
+                                    <f:ListItem Value="In progress" Text="In progress"/>
+                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                </f:DropDownList>
 
-                                <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
-                                     Width="280px">
-                                </f:DatePicker>
-                                <f:Label ID="Label1" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
-                                </f:DatePicker>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -43,59 +43,83 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
                         <f:GroupField ID="g1" HeaderText="PIPING" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="PIPINGLINENUMBER" DataField="PIPINGLINENUMBER" FieldType="String" HeaderText="PIPING/LINE NUMBER" TextAlign="Center"
+                                <f:RenderField ColumnID="PIPINGLINENUMBER" DataField="PIPINGLINENUMBER" FieldType="String" HeaderText="Test Package No" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="170px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
+                                <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM No" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
-                                <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
+                                <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
-                                <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
+                                <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
-                        <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
+
+                        <f:GroupField ID="g3" HeaderText="Ready for Test " HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>START" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="130px">
+                                <f:RenderField ColumnID="PWD" DataField="PWD" FieldType="String" HeaderText="PWD" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
-                                <f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="130px">
+
+                                <f:RenderField ColumnID="Apunchclosed" DataField="Apunchclosed" FieldType="String" HeaderText="A punch closed" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="NDTReport" DataField="NDTReport" FieldType="String" HeaderText="NDT Report" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="TemperaryMeasurement" DataField="TemperaryMeasurement" FieldType="String" HeaderText="Temperary<br/> Measurement" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="FWDfinished" DataField="FWDfinished" FieldType="String" HeaderText="FWD finished" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
-                        <f:GroupField ID="g4" HeaderText="PRE-TEST/CHECK" HeaderTextAlign="Center">
+
+                        <f:GroupField ID="g4" HeaderText="Hydrostatic test schedule" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="PreTestFINISHED" DataField="PreTestFINISHED" FieldType="String" HeaderText="Ready for test" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="170px">
+                                      <f:RenderField ColumnID="HydrostaticTest" DataField="HydrostaticTest" FieldType="String" HeaderText="Hydrostatic Test<br/>(Golden joint) " TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
                                 </f:RenderField>
-                                <f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="FINAL Status" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="130px">
+
+                                  <f:RenderField ColumnID="Report" DataField="Report" FieldType="String" HeaderText="Report" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
-                        <f:GroupField ID="g5" HeaderText="WITNESS TEST/CHECK<br/>BY OWNER" HeaderTextAlign="Center">
+
+                        <f:GroupField ID="g5" HeaderText="Pre-Commissioning" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="FinalTestFINISHED" DataField="FinalTestFINISHED" FieldType="String" HeaderText="Final Test FINISHED?" ExpandUnusedSpace="true" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="200px">
+                                      <f:RenderField ColumnID="Blowingflushing" DataField="Blowingflushing" FieldType="String" HeaderText="Blowing /flushing &<br/> Dry out" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="160px">
+                                </f:RenderField>
+
+                                  <f:RenderField ColumnID="Systemreinstalled" DataField="Systemreinstalled" FieldType="String" HeaderText="System  reinstalled" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="150px">
+                                </f:RenderField>
+
+                                <f:RenderField ColumnID="BlowingReport" DataField="BlowingReport" FieldType="String" HeaderText="Blowing & flushing<br/> Report" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="150px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
+
+                         <f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="Final Status" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="120px">
+                        </f:RenderField>
+
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
index f1f900ba..5dc9ae0a 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
@@ -39,15 +39,19 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND PIPINGLINENUMBER like @PIPINGLINENUMBER";
                 listStr.Add(new SqlParameter("@PIPINGLINENUMBER", "%" + this.txtPIPINGLINENUMBER.Text.Trim() + "%"));
             }
-            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            //if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            //{
+            //    strSql += " AND TestPackageSTART >= @InspectionDateA";
+            //    listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            //{
+            //    strSql += " AND TestPackageSTART <= @InspectionDateZ";
+            //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+            //}
+            if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
             {
-                strSql += " AND TestPackageSTART >= @InspectionDateA";
-                listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
-            {
-                strSql += " AND TestPackageSTART <= @InspectionDateZ";
-                listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+                strSql += " And FINALStatus='" + ddStatus.SelectedValue + "' ";
             }
             if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
             {
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
index 282fb9a7..008b6e73 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
@@ -78,31 +78,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtSystem;
 
         /// <summary>
-        /// txtStarTime 控件。
+        /// ddStatus 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtStarTime;
-
-        /// <summary>
-        /// Label1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label1;
-
-        /// <summary>
-        /// txtEndTime 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndTime;
+        protected global::FineUIPro.DropDownList ddStatus;
 
         /// <summary>
         /// btnSearch 控件。
@@ -122,15 +104,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
-        /// <summary>
-        /// lblPageIndex 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblPageIndex;
-
         /// <summary>
         /// g1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
index d963d8b1..42de876f 100644
--- a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 9);
+                AddDatasetToSQL(ds.Tables[0], 13);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -164,30 +164,12 @@ namespace FineUIPro.Web.Transfer
             {
                 for (int i = 1; i < ir; i++)
                 {
-                    string row4 = pds.Rows[i][4].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    string row4 = pds.Rows[i][0].ToString();
+                    if (string.IsNullOrEmpty(row4))
                     {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row4.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
-                        }
-                    }
-                    string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
-                    {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row5.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
-                        }
+                        result += (i + 3).ToString() + "," + "Test Package No" + "," + "不能为空！" + "|";
                     }
+
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -294,7 +276,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 9);
+                AddDatasetToSQL2(ds.Tables[0], 13);
             }
             catch (Exception ex)
             {
@@ -325,61 +307,102 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_Piping> list = new List<Model.Transfer_Piping>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.PIPINGLINENUMBER == pds.Rows[i][0].ToString().Trim()
-                    && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
+                    ////查询第一列，没查到的情况下作导入处理
+                    //var modelOnly = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.PIPINGLINENUMBER == pds.Rows[i][0].ToString().Trim()
+                    //&& x.ProjectId == CurrUser.LoginProjectId);
+                    //if (modelOnly == null)
+                    //{
+                    Model.Transfer_Piping model = new Model.Transfer_Piping();
+                    model.Id = Guid.NewGuid().ToString();
+                    model.ProjectId = CurrUser.LoginProjectId;
+                    model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
+                    model.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                    model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    model.TestPackage = pds.Rows[i][3].ToString().Trim();
+
+                    var obj1 = model.PWD= pds.Rows[i][4].ToString().Trim();
+                    var obj2 =model.Apunchclosed = pds.Rows[i][5].ToString().Trim();
+                    var obj3 =model.NDTReport = pds.Rows[i][6].ToString().Trim();
+                    var obj4 =model.TemperaryMeasurement = pds.Rows[i][7].ToString().Trim();
+                    var obj5 =model.FWDfinished = pds.Rows[i][8].ToString().Trim();
+                    var obj6 =model.HydrostaticTest = pds.Rows[i][9].ToString().Trim();
+                    var obj7 =model.Report = pds.Rows[i][10].ToString().Trim();
+                    var obj8 =model.Blowingflushing = pds.Rows[i][11].ToString().Trim();
+                    var obj9 = model.Systemreinstalled = pds.Rows[i][12].ToString().Trim();
+                    
+                    model.BlowingReport= pds.Rows[i][13].ToString().Trim();
+
+                    #region 判断状态
+                    var listObj = new List<string>();
+                    listObj.Add(obj1);
+                    listObj.Add(obj2);
+                    listObj.Add(obj3);
+                    listObj.Add(obj4);
+                    listObj.Add(obj5);
+                    listObj.Add(obj6);
+                    listObj.Add(obj7);
+                    listObj.Add(obj8);
+                    listObj.Add(obj9);
+                    //全是NA或Completed 状态是Completed
+                    if (listObj.Where(x=>x=="NA" || x== "Completed").ToList().Count==9)
                     {
-                        Model.Transfer_Piping model = new Model.Transfer_Piping();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
-                        model.SYSTEM = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.TestPackage = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.TestPackageSTART = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.TestPackageFINISH = t2;
-
-                        model.FINALStatus = pds.Rows[i][6].ToString().Trim();
-                        if (model.FINALStatus.ToLower()== "finished")
-                        {
-                            model.CompleteTime = DateTime.Now;
-                        }
-
-                        model.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
-                        model.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
+                        model.FINALStatus = "Completed";
                         list.Add(model);
+                        continue ;
                     }
-                    else
-                    {
-                        //修改
-                        modelOnly.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.TestPackageSTART = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.TestPackageFINISH = t2;
+                    
 
-                        //更改前不是finished，更改后是finished的，才修改实际完成时间
-                        if (modelOnly.FINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
-                        {
-                            modelOnly.CompleteTime = DateTime.Now;
-                        }
-                        modelOnly.FINALStatus = pds.Rows[i][6].ToString().Trim();
-                        //if (modelOnly.FINALStatus.ToLower() == "finished")
-                        //{
-                        //    modelOnly.CompleteTime = DateTime.Now;
-                        //}
-                        modelOnly.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
-                        modelOnly.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                    //如果全是Not Start 就是 Not Start
+                    if (listObj.Where(x=>x== "Not Start").ToList().Count==9)
+                    {
+                        model.FINALStatus = "Not Start";
+                        list.Add(model);
+                        continue;
                     }
+
+                    //如果其中有一项是In progress 或Not Start 是 In progress
+                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    {
+                        model.FINALStatus = "In progress";
+                        list.Add(model);
+                        continue;
+                    }
+
+                    model.FINALStatus = "Not Start";
+                    list.Add(model);
+
+                    #endregion
+
+
+
+                    //}
+                    //else
+                    //{
+                    //    //修改
+                    //    modelOnly.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
+                    //    modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                    //    modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    //    modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim();
+                    //    DateTime t1, t2;
+                    //    if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                    //        modelOnly.TestPackageSTART = t1;
+                    //    if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                    //        modelOnly.TestPackageFINISH = t2;
+
+                    //    //更改前不是finished，更改后是finished的，才修改实际完成时间
+                    //    if (modelOnly.FINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
+                    //    {
+                    //        modelOnly.CompleteTime = DateTime.Now;
+                    //    }
+                    //    modelOnly.FINALStatus = pds.Rows[i][6].ToString().Trim();
+                    //    //if (modelOnly.FINALStatus.ToLower() == "finished")
+                    //    //{
+                    //    //    modelOnly.CompleteTime = DateTime.Now;
+                    //    //}
+                    //    modelOnly.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
+                    //    modelOnly.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
+                    //    Funs.DB.SubmitChanges();
+                    //}
                 }
                 if (list.Count > 0)
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index 9b734955..321a0b8e 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -21,18 +21,25 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-
-                                <f:TextBox runat="server" ID="txtNum_NO" Label="No." LabelWidth="80px" LabelAlign="Right" Width="150px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="150px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Sub Sys No" LabelWidth="100px" LabelAlign="Right" Width="170px"></f:TextBox>
-                                <f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="200px"
-                                    Width="320px">
-                                </f:DatePicker>
-                                <f:Label ID="Label1" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndDate_Raised" LabelAlign="Right" Width="150px">
-                                </f:DatePicker>
-
+                                <f:TextBox runat="server" ID="txtNum_NO" Label="No." LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Sub Sys No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtDisc" Label="Disc" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
+                                <f:DropDownList ID="ddlEng" runat="server" Label="Eng" AutoPostBack="true" Width="80px" LabelWidth="40px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlMatI" runat="server" Label="Mat'l" AutoPostBack="true" Width="80px" LabelWidth="40px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="180px" LabelWidth="100px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
+                                    <f:ListItem Value="FWD" Text="FWD"></f:ListItem>
+                                </f:DropDownList>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
 
@@ -48,19 +55,26 @@
                         </f:Toolbar>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DatePicker runat="server" Label="Required Date" ID="txtStartRequired_Date" LabelAlign="Right" LabelWidth="130px"
-                                    Width="320px">
+                                <f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="100px"
+                                    Width="220px">
+                                </f:DatePicker>
+                                <f:Label ID="Label1" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndDate_Raised" LabelAlign="Right" Width="110px">
+                                </f:DatePicker>
+                                <f:DatePicker runat="server" Label="Required Date" ID="txtStartRequired_Date" LabelAlign="Right" LabelWidth="110px"
+                                    Width="220px">
                                 </f:DatePicker>
                                 <f:Label ID="Label2" runat="server" Text="至">
                                 </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndRequired_Date" LabelAlign="Right" Width="150px">
+                                <f:DatePicker runat="server" ID="txtEndRequired_Date" LabelAlign="Right" Width="110px">
                                 </f:DatePicker>
-                                <f:DatePicker runat="server" Label="Actual_Date" ID="txtStartActual_Date" LabelAlign="Right" LabelWidth="130px"
-                                    Width="320px">
+                                <f:DatePicker runat="server" Label="Actual_Date" ID="txtStartActual_Date" LabelAlign="Right" LabelWidth="110px"
+                                    Width="220px">
                                 </f:DatePicker>
                                 <f:Label ID="Label3" runat="server" Text="至">
                                 </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndActual_Date" LabelAlign="Right" Width="150px">
+                                <f:DatePicker runat="server" ID="txtEndActual_Date" LabelAlign="Right" Width="110px">
                                 </f:DatePicker>
                             </Items>
                         </f:Toolbar>
@@ -215,13 +229,13 @@
             <Items>
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
-                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
-                    OnClick="btnMenuDel_Click" Hidden="true">
-                </f:MenuButton>
                 <f:MenuButton ID="btnMenuAttachA" runat="server" Icon="FolderUp" Text="Photoes附件" OnClick="btnMenuAttachA_Click" Hidden="true">
                 </f:MenuButton>
                 <f:MenuButton ID="btnMenuAttachB" runat="server" Icon="FolderUp" Text="Corrected_Photos附件" OnClick="btnMenuAttachB_Click" Hidden="true">
                 </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
+                    OnClick="btnMenuDel_Click" Hidden="true">
+                </f:MenuButton>
             </Items>
         </f:Menu>
     </form>
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index 493ce1b1..7eeabcf8 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -65,23 +65,43 @@ namespace FineUIPro.Web.Transfer
             }
             if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
             {
-                strSql += " AND Required_Date >= @Required_Date";
-                listStr.Add(new SqlParameter("@Required_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
+                strSql += " AND Required_Date >= @StartRequired_Date";
+                listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
             }
             if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
             {
-                strSql += " AND Required_Date <= @Required_Date";
-                listStr.Add(new SqlParameter("@Required_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
+                strSql += " AND Required_Date <= @EndRequired_Date";
+                listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
             }
             if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
             {
-                strSql += " AND Actual_Date >= @Actual_Date";
-                listStr.Add(new SqlParameter("@Actual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
+                strSql += " AND Actual_Date >= @StartActual_Date";
+                listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
             }
             if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
             {
-                strSql += " AND Actual_Date <= @Actual_Date";
-                listStr.Add(new SqlParameter("@Actual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
+                strSql += " AND Actual_Date <= @EndActual_Date";
+                listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtDisc.Text.Trim()))
+            {
+                strSql += " AND Disc = @Disc";
+                listStr.Add(new SqlParameter("@Disc", txtDisc.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(ddlEng.SelectedValue.Trim()))
+            {
+                strSql += " AND IsEng = @IsEng";
+                listStr.Add(new SqlParameter("@IsEng", ddlEng.SelectedValue.Trim() == "Y" ? 1 : 0));
+            }
+            if (!string.IsNullOrEmpty(ddlMatI.SelectedValue.Trim()))
+            {
+                strSql += " AND IsMatI = @IsMatI";
+                listStr.Add(new SqlParameter("@IsMatI", ddlMatI.SelectedValue.Trim() == "Y" ? 1 : 0));
+            }
+            if (!string.IsNullOrEmpty(ddlPunchType.SelectedValue.Trim()))
+            {
+                strSql += " AND Punch_Type = @Punch_Type";
+                listStr.Add(new SqlParameter("@Punch_Type", ddlPunchType.SelectedValue.Trim()));
             }
             strSql += " order by Num_No ";
             SqlParameter[] parameter = listStr.ToArray();
@@ -258,7 +278,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
                     //this.btnNew.Hidden = false;
-                    btnMenuAttachA.Hidden=false;
+                    btnMenuAttachA.Hidden = false;
                     btnMenuAttachB.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
@@ -295,7 +315,7 @@ namespace FineUIPro.Web.Transfer
             var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PunchlistFromMenuId);
             if (buttonList.Contains(BLL.Const.BtnAdd))
             {
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", this.CurrUser.LoginProjectId+ "PunchlistFrom", BLL.Const.PunchlistFromMenuId)));
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", this.CurrUser.LoginProjectId + "PunchlistFrom", BLL.Const.PunchlistFromMenuId)));
             }
             else
             {
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index ff67cd24..6eb8ee22 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -87,31 +87,40 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtSub_Sys_No;
 
         /// <summary>
-        /// txtStartDate_Raised 控件。
+        /// txtDisc 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtStartDate_Raised;
+        protected global::FineUIPro.TextBox txtDisc;
 
         /// <summary>
-        /// Label1 控件。
+        /// ddlEng 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Label Label1;
+        protected global::FineUIPro.DropDownList ddlEng;
 
         /// <summary>
-        /// txtEndDate_Raised 控件。
+        /// ddlMatI 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndDate_Raised;
+        protected global::FineUIPro.DropDownList ddlMatI;
+
+        /// <summary>
+        /// ddlPunchType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPunchType;
 
         /// <summary>
         /// btnSearch 控件。
@@ -140,6 +149,33 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
 
+        /// <summary>
+        /// txtStartDate_Raised 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartDate_Raised;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
+        /// <summary>
+        /// txtEndDate_Raised 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndDate_Raised;
+
         /// <summary>
         /// txtStartRequired_Date 控件。
         /// </summary>
@@ -257,15 +293,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
-        /// <summary>
-        /// btnMenuDel 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuDel;
-
         /// <summary>
         /// btnMenuAttachA 控件。
         /// </summary>
@@ -283,5 +310,14 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuAttachB;
+
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
     }
 }
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
index 661b0b79..4c737b46 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
@@ -22,17 +22,24 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:TextBox runat="server" ID="txtRotatingEquipment" Label="Rotating Equipment" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtRotatingEquipment" Label="Tag. No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
 
-                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
 
-                                <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
-                                     Width="280px">
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                    <f:ListItem Value="" Text="All" Selected="true"/>
+                                    <f:ListItem Value="Not Start" Text="Not Start"/>
+                                    <f:ListItem Value="In progress" Text="In progress"/>
+                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                </f:DropDownList>
+
+                              <%--  <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                    Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="至">
                                 </f:Label>
                                 <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
-                                </f:DatePicker>
+                                </f:DatePicker>--%>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -43,49 +50,44 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                        <%-- <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
                             <ItemTemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
-                        </f:TemplateField>
-                        <f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField ColumnID="RotatingEquipment" DataField="RotatingEquipment" FieldType="String" HeaderText="Rotating Equipment" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="170px">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
-                                </f:RenderField>
-                                <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
-                                </f:RenderField>
-                                <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="200px">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>START" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="130px">
-                                </f:RenderField>
-                                <f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="130px">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:GroupField ID="g5" HeaderText="" HeaderTextAlign="Center">
-                            <Columns>
-                                <f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="Mechanical FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="200px">
-                                </f:RenderField>
-                            </Columns>
-                        </f:GroupField>
+                        </f:TemplateField>--%>
+                        <f:RenderField ColumnID="RotatingEquipment" DataField="RotatingEquipment" FieldType="String" HeaderText="Tag. No" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
+
+                        <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
+
+                        <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
+
+                        <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
+
+                        <f:RenderField ColumnID="Alignment" DataField="Alignment" FieldType="String" HeaderText="Alignment" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
+
+                        <f:RenderField ColumnID="Motorsoloruntest" DataField="Motorsoloruntest" FieldType="String" HeaderText="Motor solorun test" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
+
+                        <f:RenderField ColumnID="Standalonetest" DataField="Standalonetest" FieldType="String" HeaderText="Standalone test" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
+
+
+                        <f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
index 62633b6e..2466cc85 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
@@ -39,16 +39,22 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND RotatingEquipment like @RotatingEquipment";
                 listStr.Add(new SqlParameter("@RotatingEquipment", "%" + this.txtRotatingEquipment.Text.Trim() + "%"));
             }
-            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+
+            if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
             {
-                strSql += " AND TestPackageSTART >= @InspectionDateA";
-                listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
-            {
-                strSql += " AND TestPackageSTART <= @InspectionDateZ";
-                listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+                strSql += " And MechanicalFINALStatus='" + ddStatus.SelectedValue + "' ";
             }
+
+            //if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            //{
+            //    strSql += " AND TestPackageSTART >= @InspectionDateA";
+            //    listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            //{
+            //    strSql += " AND TestPackageSTART <= @InspectionDateZ";
+            //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+            //}
             if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
             {
                 strSql += " AND SYSTEM like @SYSTEM";
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
index a623f720..45a31804 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
@@ -78,31 +78,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtSystem;
 
         /// <summary>
-        /// txtStarTime 控件。
+        /// ddStatus 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtStarTime;
-
-        /// <summary>
-        /// Label1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label1;
-
-        /// <summary>
-        /// txtEndTime 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndTime;
+        protected global::FineUIPro.DropDownList ddStatus;
 
         /// <summary>
         /// btnSearch 控件。
@@ -122,51 +104,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
-        /// <summary>
-        /// lblPageIndex 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblPageIndex;
-
-        /// <summary>
-        /// g1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.GroupField g1;
-
-        /// <summary>
-        /// g2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.GroupField g2;
-
-        /// <summary>
-        /// g3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.GroupField g3;
-
-        /// <summary>
-        /// g5 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.GroupField g5;
-
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
index 13892880..620b1044 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
@@ -153,9 +153,9 @@ namespace FineUIPro.Web.Transfer
             string result = string.Empty;
             int ic, ir;
             ic = pds.Columns.Count;
-            if (ic < Cols)
+            if (ic != Cols)
             {
-                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                ShowNotify("导入Excel格式错误！Excel必须是" + Cols.ToString().Trim() + "列", MessageBoxIcon.Warning);
                 return false;
             }
 
@@ -164,30 +164,12 @@ namespace FineUIPro.Web.Transfer
             {
                 for (int i = 1; i < ir; i++)
                 {
-                    string row4 = pds.Rows[i][4].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    string row4 = pds.Rows[i][0].ToString();
+                    if (string.IsNullOrEmpty(row4))
                     {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row4.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
-                        }
-                    }
-                    string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
-                    {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row5.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
-                        }
+                        result += (i + 3).ToString() + "," + "Tag. No" + "," + "不能为空！" + "|";
                     }
+
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -325,58 +307,92 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_RotatingEquipment> list = new List<Model.Transfer_RotatingEquipment>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(x => x.RotatingEquipment == pds.Rows[i][0].ToString().Trim()
-                    && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
-                    {
-                        Model.Transfer_RotatingEquipment model = new Model.Transfer_RotatingEquipment();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
-                        model.SYSTEM = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.TestPackage = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.TestPackageSTART = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.TestPackageFINISH = t2;
+                    ////查询第一列，没查到的情况下作导入处理
+                    //var modelOnly = Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(x => x.RotatingEquipment == pds.Rows[i][0].ToString().Trim()
+                    //&& x.ProjectId == CurrUser.LoginProjectId);
+                    //if (modelOnly == null)
+                    //{
+                    Model.Transfer_RotatingEquipment model = new Model.Transfer_RotatingEquipment();
+                    model.Id = Guid.NewGuid().ToString();
+                    model.ProjectId = CurrUser.LoginProjectId;
+                    model.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
+                    model.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                    model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    model.TestPackage = pds.Rows[i][3].ToString().Trim();
 
-                        model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
-                        if (model.MechanicalFINALStatus.ToLower() == "finished")
-                        {
-                            model.CompleteTime = DateTime.Now;
-                        }
+                    var obj1 = model.Alignment = pds.Rows[i][4].ToString().Trim();
+                    var obj2 = model.Motorsoloruntest = pds.Rows[i][5].ToString().Trim();
+                    var obj3 = model.Standalonetest = pds.Rows[i][6].ToString().Trim();
+                    #region 判断状态
+                    var listObj = new List<string>();
+                    listObj.Add(obj1);
+                    listObj.Add(obj2);
+                    listObj.Add(obj3);
+
+                    //全是NA或Completed 状态是Completed
+                    if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
+                    {
+                        model.MechanicalFINALStatus = "Completed";
                         list.Add(model);
+                        continue;
                     }
-                    else
+
+
+                    //如果全是Not Start 就是 Not Start
+                    if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
                     {
-                        //修改
-                        modelOnly.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.TestPackageSTART = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.TestPackageFINISH = t2;
-
-                        //更改前不是finished，更改后是finished的，才修改实际完成时间
-                        if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
-                        {
-                            modelOnly.CompleteTime = DateTime.Now;
-                        }
-                        modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
-
-                        //if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
-                        //{
-                        //    modelOnly.CompleteTime = DateTime.Now;
-                        //}
-
-                        Funs.DB.SubmitChanges();
+                        model.MechanicalFINALStatus = "Not Start";
+                        list.Add(model);
+                        continue;
                     }
+
+                    //如果其中有一项是In progress 或Not Start 是 In progress
+                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    {
+                        model.MechanicalFINALStatus = "In progress";
+                        list.Add(model);
+                        continue;
+                    }
+
+                    model.MechanicalFINALStatus = "Not Start";
+                    list.Add(model);
+
+                    #endregion
+
+                    model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                    if (model.MechanicalFINALStatus.ToLower() == "finished")
+                    {
+                        model.CompleteTime = DateTime.Now;
+                    }
+                    list.Add(model);
+                    //}
+                    //else
+                    //{
+                    //    //修改
+                    //    modelOnly.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
+                    //    modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                    //    modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    //    modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim();
+                    //    DateTime t1, t2;
+                    //    if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                    //        modelOnly.TestPackageSTART = t1;
+                    //    if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                    //        modelOnly.TestPackageFINISH = t2;
+
+                    //    //更改前不是finished，更改后是finished的，才修改实际完成时间
+                    //    if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
+                    //    {
+                    //        modelOnly.CompleteTime = DateTime.Now;
+                    //    }
+                    //    modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+
+                    //    //if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
+                    //    //{
+                    //    //    modelOnly.CompleteTime = DateTime.Now;
+                    //    //}
+
+                    //    Funs.DB.SubmitChanges();
+                    //}
                 }
                 if (list.Count > 0)
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
index df506ba3..14c8f360 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
@@ -22,17 +22,24 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:TextBox runat="server" ID="txtStaticEquipment" Label="Static Equipment" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtStaticEquipment" Label="Tag No" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                               <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="至">
                                 </f:Label>
                                 <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
-                                </f:DatePicker>
+                                </f:DatePicker>--%>
+
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                    <f:ListItem Value="" Text="All" Selected="true"/>
+                                    <f:ListItem Value="Not Start" Text="Not Start"/>
+                                    <f:ListItem Value="In progress" Text="In progress"/>
+                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                </f:DropDownList>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -43,39 +50,44 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                       <%-- <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
                             <ItemTemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
-                        </f:TemplateField>
+                        </f:TemplateField>--%>
                         <f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Static Equipment" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="170px">
+                                <f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Tag No" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
                             <Columns>
                                 <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                    HeaderTextAlign="Center" Width="160px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                    HeaderTextAlign="Center" Width="160px">
                                 </f:RenderField>
-                                <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
+                                <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>START" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="130px">
+                               <f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Internal inspection " TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
-                                <f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="130px">
+
+                                 <f:RenderField ColumnID="InternalsPacking" DataField="InternalsPacking" FieldType="String" HeaderText="Internals/Packing<br/> installation " TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+
+                                 <f:RenderField ColumnID="BOXupRecord" DataField="BOXupRecord" FieldType="String" HeaderText="BOX-up Record" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
index 107c96d2..4b741121 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
@@ -39,22 +39,26 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND StaticEquipment like @StaticEquipment";
                 listStr.Add(new SqlParameter("@StaticEquipment", "%" + this.txtStaticEquipment.Text.Trim() + "%"));
             }
-            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
-            {
-                strSql += " AND TestPackageSTART >= @InspectionDateA";
-                listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
-            {
-                strSql += " AND TestPackageSTART <= @InspectionDateZ";
-                listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
-            }
+            //if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            //{
+            //    strSql += " AND TestPackageSTART >= @InspectionDateA";
+            //    listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            //{
+            //    strSql += " AND TestPackageSTART <= @InspectionDateZ";
+            //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+            //}
             if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
             {
                 strSql += " AND SYSTEM like @SYSTEM";
                 listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
             }
 
+            if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
+            {
+                strSql += " And MechanicalFINALStatus='" + ddStatus.SelectedValue + "' ";
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
index 5c8b69a6..5430b04c 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
@@ -78,31 +78,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtSystem;
 
         /// <summary>
-        /// txtStarTime 控件。
+        /// ddStatus 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtStarTime;
-
-        /// <summary>
-        /// Label1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label Label1;
-
-        /// <summary>
-        /// txtEndTime 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndTime;
+        protected global::FineUIPro.DropDownList ddStatus;
 
         /// <summary>
         /// btnSearch 控件。
@@ -122,15 +104,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
-        /// <summary>
-        /// lblPageIndex 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblPageIndex;
-
         /// <summary>
         /// g1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
index e7b32c94..88aaf37f 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
@@ -164,30 +164,12 @@ namespace FineUIPro.Web.Transfer
             {
                 for (int i = 1; i < ir; i++)
                 {
-                    string row4 = pds.Rows[i][4].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    string row4 = pds.Rows[i][0].ToString();
+                    if (string.IsNullOrEmpty(row4))
                     {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row4.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
-                        }
-                    }
-                    string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
-                    {
-                        try
-                        {
-                            DateTime date = Convert.ToDateTime(row5.Trim());
-                        }
-                        catch (Exception)
-                        {
-                            result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
-                        }
+                        result += (i + 3).ToString() + "," + "Tag No" + "," + "不能为空！" + "|";
                     }
+
                 }
                 if (!string.IsNullOrEmpty(result))
                 {
@@ -325,57 +307,97 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_StaticEquipment> list = new List<Model.Transfer_StaticEquipment>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_StaticEquipment.FirstOrDefault(x => x.StaticEquipment == pds.Rows[i][0].ToString().Trim()
-                    && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
+                    ////查询第一列，没查到的情况下作导入处理
+                    //var modelOnly = Funs.DB.Transfer_StaticEquipment.FirstOrDefault(x => x.StaticEquipment == pds.Rows[i][0].ToString().Trim()
+                    //&& x.ProjectId == CurrUser.LoginProjectId);
+                    //if (modelOnly == null)
+                    //{
+                    Model.Transfer_StaticEquipment model = new Model.Transfer_StaticEquipment();
+                    model.Id = Guid.NewGuid().ToString();
+                    model.ProjectId = CurrUser.LoginProjectId;
+                    model.StaticEquipment = pds.Rows[i][0].ToString().Trim();
+                    model.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                    model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    model.TestPackage = pds.Rows[i][3].ToString().Trim();
+
+                    var obj1 = model.Internalinspection = pds.Rows[i][4].ToString().Trim();
+                    var obj2 = model.InternalsPacking = pds.Rows[i][5].ToString().Trim();
+                    var obj3 = model.BOXupRecord = pds.Rows[i][6].ToString().Trim();
+                    #region 判断状态
+                    var listObj = new List<string>();
+                    listObj.Add(obj1);
+                    listObj.Add(obj2);
+                    listObj.Add(obj3);
+
+                    //全是NA或Completed 状态是Completed
+                    if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
                     {
-                        Model.Transfer_StaticEquipment model = new Model.Transfer_StaticEquipment();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.StaticEquipment = pds.Rows[i][0].ToString().Trim();
-                        model.SYSTEM = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.TestPackage = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.TestPackageSTART = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.TestPackageFINISH = t2;
-
-                        model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
-                        if (model.MechanicalFINALStatus.ToLower() == "finished")
-                        {
-                            model.CompleteTime = DateTime.Now;
-                        }
-
+                        model.MechanicalFINALStatus = "Completed";
                         list.Add(model);
+                        continue;
                     }
-                    else
-                    {
-                        //修改
-                        modelOnly.StaticEquipment = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.TestPackageSTART = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.TestPackageFINISH = t2;
 
-                        //更改前不是finished，更改后是finished的，才修改实际完成时间
-                        if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
-                        {
-                            modelOnly.CompleteTime = DateTime.Now;
-                        }
-                        modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
-                        //if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
-                        //{
-                        //    modelOnly.CompleteTime = DateTime.Now;
-                        //}
-                        Funs.DB.SubmitChanges();
+
+                    //如果全是Not Start 就是 Not Start
+                    if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+                    {
+                        model.MechanicalFINALStatus = "Not Start";
+                        list.Add(model);
+                        continue;
                     }
+
+                    //如果其中有一项是In progress 或Not Start 是 In progress
+                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    {
+                        model.MechanicalFINALStatus = "In progress";
+                        list.Add(model);
+                        continue;
+                    }
+
+                    model.MechanicalFINALStatus = "Not Start";
+                    list.Add(model);
+
+                    #endregion
+
+                    //DateTime t1, t2;
+                    //if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                    //    model.TestPackageSTART = t1;
+                    //if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                    //    model.TestPackageFINISH = t2;
+
+                    //model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                    //if (model.MechanicalFINALStatus.ToLower() == "finished")
+                    //{
+                    //    model.CompleteTime = DateTime.Now;
+                    //}
+
+                    list.Add(model);
+                    //}
+                    //else
+                    //{
+                    //    //修改
+                    //    modelOnly.StaticEquipment = pds.Rows[i][0].ToString().Trim();
+                    //    modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                    //    modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                    //    modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim();
+                    //    DateTime t1, t2;
+                    //    if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                    //        modelOnly.TestPackageSTART = t1;
+                    //    if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                    //        modelOnly.TestPackageFINISH = t2;
+
+                    //    //更改前不是finished，更改后是finished的，才修改实际完成时间
+                    //    if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
+                    //    {
+                    //        modelOnly.CompleteTime = DateTime.Now;
+                    //    }
+                    //    modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                    //    //if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
+                    //    //{
+                    //    //    modelOnly.CompleteTime = DateTime.Now;
+                    //    //}
+                    //    Funs.DB.SubmitChanges();
+                    //}
                 }
                 if (list.Count > 0)
                 {
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index b8b19649..ae13b67f 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -72,6 +72,7 @@
 <TreeNode id="80F786CB-E8CA-44AD-A08C-8E4D12BFDCA1" Text="总部检查" NavigateUrl="HSSE/Check/OfficeCheck.aspx"></TreeNode>
 <TreeNode id="7B272C3F-39D2-496D-A87C-E2C89A20E4EF" Text="HSE巡检统计(图表)" NavigateUrl="HSSE/HiddenInspection/RiskAnalysisChart.aspx"></TreeNode>
 <TreeNode id="4E312813-1A2E-4AF7-8106-9210A6E83926" Text="隐患整改统计" NavigateUrl="HSSE/Check/RectifyNoticesStatistics.aspx"></TreeNode>
+<TreeNode id="5DC49905-6A1C-4353-A06C-D9D1A8D6B6F9" Text="隐患排查与治理统计" NavigateUrl="HSSE/Check/HiddenTroubleManager.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="5309E7E0-395E-4F11-8F5E-D52E11526A2A" Text="HSE会议" NavigateUrl=""><TreeNode id="DFB56743-17BA-40BA-82EA-FCB9B0DBFAFF" Text="安全领导小组会议" NavigateUrl="HSSE/Meeting/SafetyLeaderGroupMeeting.aspx"></TreeNode>
 <TreeNode id="5236B1D9-8B57-495E-8644-231DF5D066CE" Text="HSE周例会" NavigateUrl="HSSE/Meeting/WeekMeeting.aspx"></TreeNode>
@@ -99,14 +100,12 @@
 <TreeNode id="D58B9DEC-A09B-45B0-BD54-18592119BB49" Text="车辆交通安全管理" NavigateUrl=""><TreeNode id="CF82805A-84BE-400A-B939-83F7612D76F5" Text="现场车辆管理" NavigateUrl="HSSE/Administrative/CarManager.aspx"></TreeNode>
 <TreeNode id="754C23CA-F1BC-4F44-9D34-B185099EDCA0" Text="现场驾驶员管理" NavigateUrl="HSSE/Administrative/DriverManager.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="28C8EDB9-F1C2-4287-8013-28A976B093E2" Text="施工机具" NavigateUrl=""><TreeNode id="3E167389-4775-4AC3-9D31-2E570682EDA1" Text="特种设备机具入场报批" NavigateUrl="HSSE/InApproveManager/EquipmentIn.aspx"></TreeNode>
-<TreeNode id="A4832598-E3D4-4906-88E5-A3886A85FC5A" Text="特种设备机具出场报批" NavigateUrl="HSSE/InApproveManager/EquipmentOut.aspx"></TreeNode>
-<TreeNode id="06EA1483-7397-46DD-818D-56911EA7B679" Text="一般设备机具入场报批" NavigateUrl="HSSE/InApproveManager/GeneralEquipmentIn.aspx"></TreeNode>
-<TreeNode id="56F241A9-0AA3-4EDB-8C5C-999C487C06DA" Text="一般设备机具出场报批" NavigateUrl="HSSE/InApproveManager/GeneralEquipmentOut.aspx"></TreeNode>
-<TreeNode id="42E7E869-67EA-446E-A910-BE7BF95EDC00" Text="特种设备审批" NavigateUrl="HSSE/InApproveManager/EquipmentQualityIn.aspx"></TreeNode>
-<TreeNode id="2DEDD752-8BAF-43CD-933D-932AF9AF2F58" Text="特殊机具设备资质" NavigateUrl="HSSE/QualityAudit/EquipmentQuality.aspx"></TreeNode>
-<TreeNode id="BFD62699-47F0-49FA-AD39-FAEE8A6C3313" Text="一般机具设备资质" NavigateUrl="HSSE/QualityAudit/GeneralEquipmentQuality.aspx"></TreeNode>
-<TreeNode id="9703D711-85DA-4A0B-B08B-70F791418696" Text="施工机具、安全设施检查验收" NavigateUrl="HSSE/License/EquipmentSafetyList.aspx"></TreeNode>
+<TreeNode id="28C8EDB9-F1C2-4287-8013-28A976B093E2" Text="施工机具和设备" NavigateUrl=""><TreeNode id="2556CFA6-63F7-4FC1-9B2B-5E43A84640EC" Text="特种设备" NavigateUrl=""><TreeNode id="2DEDD752-8BAF-43CD-933D-932AF9AF2F58" Text="资质报审及检验报告" NavigateUrl="HSSE/QualityAudit/EquipmentQuality.aspx"></TreeNode>
+<TreeNode id="9703D711-85DA-4A0B-B08B-70F791418696" Text="入场验收记录" NavigateUrl="HSSE/License/EquipmentSafetyList.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="8E2FB782-66B3-46C4-8F71-8A5A37585785" Text="普通机具设备" NavigateUrl=""><TreeNode id="BFD62699-47F0-49FA-AD39-FAEE8A6C3313" Text="资质报审及检验记录" NavigateUrl="HSSE/QualityAudit/GeneralEquipmentQuality.aspx"></TreeNode>
+<TreeNode id="CE2687BF-7BBB-4FD5-8FFE-B3B26F712D34" Text="入场验收记录" NavigateUrl="HSSE/License/EquipmentSafetyList.aspx"></TreeNode>
+</TreeNode>
 </TreeNode>
 <TreeNode id="012DF857-AD6B-49AA-87A8-030CD5F66D4C" Text="HSE奖惩" NavigateUrl=""><TreeNode id="96F21A83-6871-4CC4-8901-1B99C376395C" Text="奖励通知单" NavigateUrl="HSSE/Check/IncentiveNotice.aspx"></TreeNode>
 <TreeNode id="C13F1CE7-DAEF-4604-A13F-192621D28DF5" Text="奖励统计" NavigateUrl="HSSE/Check/IncentiveNoticeStatistics.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml
index a9d07855..2854ffd9 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml
@@ -6,7 +6,4 @@
 <TreeNode id="C6EF06E5-9019-4583-8122-EA94FCC545C6" Text="员工总结" NavigateUrl=""></TreeNode>
 <TreeNode id="AAF841AA-2EE8-4FEC-B1FB-B978736C6E1F" Text="员工责任书" NavigateUrl="Personal/PersonDuty.aspx"></TreeNode>
 <TreeNode id="CB373458-30B0-4850-ABFF-B38D40A04D43" Text="员工绩效考核结果" NavigateUrl="Personal/PersonCheckInfo.aspx"></TreeNode>
-<TreeNode id="522EAECC-3D40-4804-A066-A43BA8F6BFC1" Text="员工出差记录" NavigateUrl="Personal/BusinessTrip.aspx"></TreeNode>
-<TreeNode id="16229932-671B-4E04-BB61-A5C7DE4CE47F" Text="员工开车绩效记录" NavigateUrl="Personal/TestRunPerformance.aspx"></TreeNode>
-<TreeNode id="F0792B77-AEE4-4834-82C2-E5B75D0B0AB7" Text="开车月技术总结" NavigateUrl="Personal/TestRunMonthSummary.aspx"></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index 4d3b9e97..31fd29bc 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="48545C6A-9D10-47F4-810F-DAB0CFCD5BF9" Text="Project Set up" NavigateUrl="Transfer/ProjectSetup.aspx">
+  <TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="LHC System List(Process)" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
   </TreeNode>
+<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="LHC System List(Non-Process)" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
 <TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
 <TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
 <TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
@@ -11,11 +12,9 @@
 <TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
 <TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
 <TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
-<TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
 <TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
-<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
-<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交统计递增表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
-<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
-<TreeNode id="BB5EC5E1-A23D-4A3F-8772-CD40757974EC" Text="Punchlist from统计递增表" NavigateUrl="Transfer/Chart/PunchlistFromChart.aspx"></TreeNode>
+<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="Punchlist from完成统计表" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
+<TreeNode id="CB76462E-9444-4946-B787-ECB33C21E6D0" Text="Punchlist from分类表" NavigateUrl="Transfer/Chart/PunchlistFromSort.aspx"></TreeNode>
+<TreeNode id="549DD0B6-05CB-4C75-B8F5-9AADDEDF399F" Text="Punchlist from进度跟踪表" NavigateUrl="Transfer/Chart/PunchlistFromProgress.aspx"></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 69859890..cc7e0f27 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -84,7 +84,5 @@
 <TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
 <TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
 <TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
-<TreeNode id="C1240FCB-4C72-445E-82B5-EBFAA87D0AC6" Text="开车人员月绩效报告" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx"></TreeNode>
-<TreeNode id="0C6BB051-6BD1-4E35-90CE-9376F3C2D454" Text="开车人员月技术总结" NavigateUrl="ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx"></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 7959feb9..bb2ccef7 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -390806,6 +390806,22 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _CompleteTime;
 		
+		private string _Foundation;
+		
+		private string _Mainstructure;
+		
+		private string _Buildingdecoration;
+		
+		private string _Equipment;
+		
+		private string _Instrument;
+		
+		private string _Electrical;
+		
+		private string _FireFighting;
+		
+		private string _HVAC;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -390830,6 +390846,22 @@ namespace Model
     partial void OnFINAL_StatusChanged();
     partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCompleteTimeChanged();
+    partial void OnFoundationChanging(string value);
+    partial void OnFoundationChanged();
+    partial void OnMainstructureChanging(string value);
+    partial void OnMainstructureChanged();
+    partial void OnBuildingdecorationChanging(string value);
+    partial void OnBuildingdecorationChanged();
+    partial void OnEquipmentChanging(string value);
+    partial void OnEquipmentChanged();
+    partial void OnInstrumentChanging(string value);
+    partial void OnInstrumentChanged();
+    partial void OnElectricalChanging(string value);
+    partial void OnElectricalChanged();
+    partial void OnFireFightingChanging(string value);
+    partial void OnFireFightingChanged();
+    partial void OnHVACChanging(string value);
+    partial void OnHVACChanged();
     #endregion
 		
 		public Transfer_Civil_Structure()
@@ -391037,6 +391069,166 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Foundation", DbType="NVarChar(50)")]
+		public string Foundation
+		{
+			get
+			{
+				return this._Foundation;
+			}
+			set
+			{
+				if ((this._Foundation != value))
+				{
+					this.OnFoundationChanging(value);
+					this.SendPropertyChanging();
+					this._Foundation = value;
+					this.SendPropertyChanged("Foundation");
+					this.OnFoundationChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Mainstructure", DbType="NVarChar(50)")]
+		public string Mainstructure
+		{
+			get
+			{
+				return this._Mainstructure;
+			}
+			set
+			{
+				if ((this._Mainstructure != value))
+				{
+					this.OnMainstructureChanging(value);
+					this.SendPropertyChanging();
+					this._Mainstructure = value;
+					this.SendPropertyChanged("Mainstructure");
+					this.OnMainstructureChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Buildingdecoration", DbType="NVarChar(50)")]
+		public string Buildingdecoration
+		{
+			get
+			{
+				return this._Buildingdecoration;
+			}
+			set
+			{
+				if ((this._Buildingdecoration != value))
+				{
+					this.OnBuildingdecorationChanging(value);
+					this.SendPropertyChanging();
+					this._Buildingdecoration = value;
+					this.SendPropertyChanged("Buildingdecoration");
+					this.OnBuildingdecorationChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Equipment", DbType="NVarChar(50)")]
+		public string Equipment
+		{
+			get
+			{
+				return this._Equipment;
+			}
+			set
+			{
+				if ((this._Equipment != value))
+				{
+					this.OnEquipmentChanging(value);
+					this.SendPropertyChanging();
+					this._Equipment = value;
+					this.SendPropertyChanged("Equipment");
+					this.OnEquipmentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Instrument", DbType="NVarChar(50)")]
+		public string Instrument
+		{
+			get
+			{
+				return this._Instrument;
+			}
+			set
+			{
+				if ((this._Instrument != value))
+				{
+					this.OnInstrumentChanging(value);
+					this.SendPropertyChanging();
+					this._Instrument = value;
+					this.SendPropertyChanged("Instrument");
+					this.OnInstrumentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Electrical", DbType="NVarChar(50)")]
+		public string Electrical
+		{
+			get
+			{
+				return this._Electrical;
+			}
+			set
+			{
+				if ((this._Electrical != value))
+				{
+					this.OnElectricalChanging(value);
+					this.SendPropertyChanging();
+					this._Electrical = value;
+					this.SendPropertyChanged("Electrical");
+					this.OnElectricalChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireFighting", DbType="NVarChar(50)")]
+		public string FireFighting
+		{
+			get
+			{
+				return this._FireFighting;
+			}
+			set
+			{
+				if ((this._FireFighting != value))
+				{
+					this.OnFireFightingChanging(value);
+					this.SendPropertyChanging();
+					this._FireFighting = value;
+					this.SendPropertyChanged("FireFighting");
+					this.OnFireFightingChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HVAC", DbType="NVarChar(50)")]
+		public string HVAC
+		{
+			get
+			{
+				return this._HVAC;
+			}
+			set
+			{
+				if ((this._HVAC != value))
+				{
+					this.OnHVACChanging(value);
+					this.SendPropertyChanging();
+					this._HVAC = value;
+					this.SendPropertyChanged("HVAC");
+					this.OnHVACChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -391084,6 +391276,14 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _CompleteTime;
 		
+		private string _Installation;
+		
+		private string _Communicationtest;
+		
+		private string _CableLaying;
+		
+		private string _LoopTest;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -391108,6 +391308,14 @@ namespace Model
     partial void OnFINAL_StatusChanged();
     partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCompleteTimeChanged();
+    partial void OnInstallationChanging(string value);
+    partial void OnInstallationChanged();
+    partial void OnCommunicationtestChanging(string value);
+    partial void OnCommunicationtestChanged();
+    partial void OnCableLayingChanging(string value);
+    partial void OnCableLayingChanged();
+    partial void OnLoopTestChanging(string value);
+    partial void OnLoopTestChanged();
     #endregion
 		
 		public Transfer_Electrical()
@@ -391315,6 +391523,86 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Installation", DbType="NVarChar(50)")]
+		public string Installation
+		{
+			get
+			{
+				return this._Installation;
+			}
+			set
+			{
+				if ((this._Installation != value))
+				{
+					this.OnInstallationChanging(value);
+					this.SendPropertyChanging();
+					this._Installation = value;
+					this.SendPropertyChanged("Installation");
+					this.OnInstallationChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Communicationtest", DbType="NVarChar(50)")]
+		public string Communicationtest
+		{
+			get
+			{
+				return this._Communicationtest;
+			}
+			set
+			{
+				if ((this._Communicationtest != value))
+				{
+					this.OnCommunicationtestChanging(value);
+					this.SendPropertyChanging();
+					this._Communicationtest = value;
+					this.SendPropertyChanged("Communicationtest");
+					this.OnCommunicationtestChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CableLaying", DbType="NVarChar(50)")]
+		public string CableLaying
+		{
+			get
+			{
+				return this._CableLaying;
+			}
+			set
+			{
+				if ((this._CableLaying != value))
+				{
+					this.OnCableLayingChanging(value);
+					this.SendPropertyChanging();
+					this._CableLaying = value;
+					this.SendPropertyChanged("CableLaying");
+					this.OnCableLayingChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LoopTest", DbType="NVarChar(50)")]
+		public string LoopTest
+		{
+			get
+			{
+				return this._LoopTest;
+			}
+			set
+			{
+				if ((this._LoopTest != value))
+				{
+					this.OnLoopTestChanging(value);
+					this.SendPropertyChanging();
+					this._LoopTest = value;
+					this.SendPropertyChanged("LoopTest");
+					this.OnLoopTestChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -391918,6 +392206,16 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _CompleteTime;
 		
+		private string _InstallationCalibration;
+		
+		private string _PipingPressuretest;
+		
+		private string _PipingLeak;
+		
+		private string _PipingBlowing;
+		
+		private string _Looptest;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -391942,6 +392240,16 @@ namespace Model
     partial void OnFINAL_StatusChanged();
     partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCompleteTimeChanged();
+    partial void OnInstallationCalibrationChanging(string value);
+    partial void OnInstallationCalibrationChanged();
+    partial void OnPipingPressuretestChanging(string value);
+    partial void OnPipingPressuretestChanged();
+    partial void OnPipingLeakChanging(string value);
+    partial void OnPipingLeakChanged();
+    partial void OnPipingBlowingChanging(string value);
+    partial void OnPipingBlowingChanged();
+    partial void OnLooptestChanging(string value);
+    partial void OnLooptestChanged();
     #endregion
 		
 		public Transfer_Instrumentation()
@@ -392149,6 +392457,106 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationCalibration", DbType="NVarChar(50)")]
+		public string InstallationCalibration
+		{
+			get
+			{
+				return this._InstallationCalibration;
+			}
+			set
+			{
+				if ((this._InstallationCalibration != value))
+				{
+					this.OnInstallationCalibrationChanging(value);
+					this.SendPropertyChanging();
+					this._InstallationCalibration = value;
+					this.SendPropertyChanged("InstallationCalibration");
+					this.OnInstallationCalibrationChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipingPressuretest", DbType="NVarChar(50)")]
+		public string PipingPressuretest
+		{
+			get
+			{
+				return this._PipingPressuretest;
+			}
+			set
+			{
+				if ((this._PipingPressuretest != value))
+				{
+					this.OnPipingPressuretestChanging(value);
+					this.SendPropertyChanging();
+					this._PipingPressuretest = value;
+					this.SendPropertyChanged("PipingPressuretest");
+					this.OnPipingPressuretestChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipingLeak", DbType="NVarChar(50)")]
+		public string PipingLeak
+		{
+			get
+			{
+				return this._PipingLeak;
+			}
+			set
+			{
+				if ((this._PipingLeak != value))
+				{
+					this.OnPipingLeakChanging(value);
+					this.SendPropertyChanging();
+					this._PipingLeak = value;
+					this.SendPropertyChanged("PipingLeak");
+					this.OnPipingLeakChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipingBlowing", DbType="NVarChar(50)")]
+		public string PipingBlowing
+		{
+			get
+			{
+				return this._PipingBlowing;
+			}
+			set
+			{
+				if ((this._PipingBlowing != value))
+				{
+					this.OnPipingBlowingChanging(value);
+					this.SendPropertyChanging();
+					this._PipingBlowing = value;
+					this.SendPropertyChanged("PipingBlowing");
+					this.OnPipingBlowingChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Looptest", DbType="NVarChar(50)")]
+		public string Looptest
+		{
+			get
+			{
+				return this._Looptest;
+			}
+			set
+			{
+				if ((this._Looptest != value))
+				{
+					this.OnLooptestChanging(value);
+					this.SendPropertyChanging();
+					this._Looptest = value;
+					this.SendPropertyChanged("Looptest");
+					this.OnLooptestChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -392550,6 +392958,26 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _CompleteTime;
 		
+		private string _PWD;
+		
+		private string _Apunchclosed;
+		
+		private string _NDTReport;
+		
+		private string _TemperaryMeasurement;
+		
+		private string _FWDfinished;
+		
+		private string _HydrostaticTest;
+		
+		private string _Report;
+		
+		private string _Blowingflushing;
+		
+		private string _Systemreinstalled;
+		
+		private string _BlowingReport;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -392578,6 +393006,26 @@ namespace Model
     partial void OnFinalTestFINISHEDChanged();
     partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCompleteTimeChanged();
+    partial void OnPWDChanging(string value);
+    partial void OnPWDChanged();
+    partial void OnApunchclosedChanging(string value);
+    partial void OnApunchclosedChanged();
+    partial void OnNDTReportChanging(string value);
+    partial void OnNDTReportChanged();
+    partial void OnTemperaryMeasurementChanging(string value);
+    partial void OnTemperaryMeasurementChanged();
+    partial void OnFWDfinishedChanging(string value);
+    partial void OnFWDfinishedChanged();
+    partial void OnHydrostaticTestChanging(string value);
+    partial void OnHydrostaticTestChanged();
+    partial void OnReportChanging(string value);
+    partial void OnReportChanged();
+    partial void OnBlowingflushingChanging(string value);
+    partial void OnBlowingflushingChanged();
+    partial void OnSystemreinstalledChanging(string value);
+    partial void OnSystemreinstalledChanged();
+    partial void OnBlowingReportChanging(string value);
+    partial void OnBlowingReportChanged();
     #endregion
 		
 		public Transfer_Piping()
@@ -392825,6 +393273,206 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PWD", DbType="NVarChar(50)")]
+		public string PWD
+		{
+			get
+			{
+				return this._PWD;
+			}
+			set
+			{
+				if ((this._PWD != value))
+				{
+					this.OnPWDChanging(value);
+					this.SendPropertyChanging();
+					this._PWD = value;
+					this.SendPropertyChanged("PWD");
+					this.OnPWDChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Apunchclosed", DbType="NVarChar(50)")]
+		public string Apunchclosed
+		{
+			get
+			{
+				return this._Apunchclosed;
+			}
+			set
+			{
+				if ((this._Apunchclosed != value))
+				{
+					this.OnApunchclosedChanging(value);
+					this.SendPropertyChanging();
+					this._Apunchclosed = value;
+					this.SendPropertyChanged("Apunchclosed");
+					this.OnApunchclosedChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NDTReport", DbType="NVarChar(50)")]
+		public string NDTReport
+		{
+			get
+			{
+				return this._NDTReport;
+			}
+			set
+			{
+				if ((this._NDTReport != value))
+				{
+					this.OnNDTReportChanging(value);
+					this.SendPropertyChanging();
+					this._NDTReport = value;
+					this.SendPropertyChanged("NDTReport");
+					this.OnNDTReportChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TemperaryMeasurement", DbType="NVarChar(50)")]
+		public string TemperaryMeasurement
+		{
+			get
+			{
+				return this._TemperaryMeasurement;
+			}
+			set
+			{
+				if ((this._TemperaryMeasurement != value))
+				{
+					this.OnTemperaryMeasurementChanging(value);
+					this.SendPropertyChanging();
+					this._TemperaryMeasurement = value;
+					this.SendPropertyChanged("TemperaryMeasurement");
+					this.OnTemperaryMeasurementChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FWDfinished", DbType="NVarChar(50)")]
+		public string FWDfinished
+		{
+			get
+			{
+				return this._FWDfinished;
+			}
+			set
+			{
+				if ((this._FWDfinished != value))
+				{
+					this.OnFWDfinishedChanging(value);
+					this.SendPropertyChanging();
+					this._FWDfinished = value;
+					this.SendPropertyChanged("FWDfinished");
+					this.OnFWDfinishedChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HydrostaticTest", DbType="NVarChar(50)")]
+		public string HydrostaticTest
+		{
+			get
+			{
+				return this._HydrostaticTest;
+			}
+			set
+			{
+				if ((this._HydrostaticTest != value))
+				{
+					this.OnHydrostaticTestChanging(value);
+					this.SendPropertyChanging();
+					this._HydrostaticTest = value;
+					this.SendPropertyChanged("HydrostaticTest");
+					this.OnHydrostaticTestChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Report", DbType="NVarChar(50)")]
+		public string Report
+		{
+			get
+			{
+				return this._Report;
+			}
+			set
+			{
+				if ((this._Report != value))
+				{
+					this.OnReportChanging(value);
+					this.SendPropertyChanging();
+					this._Report = value;
+					this.SendPropertyChanged("Report");
+					this.OnReportChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Blowingflushing", DbType="NVarChar(50)")]
+		public string Blowingflushing
+		{
+			get
+			{
+				return this._Blowingflushing;
+			}
+			set
+			{
+				if ((this._Blowingflushing != value))
+				{
+					this.OnBlowingflushingChanging(value);
+					this.SendPropertyChanging();
+					this._Blowingflushing = value;
+					this.SendPropertyChanged("Blowingflushing");
+					this.OnBlowingflushingChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Systemreinstalled", DbType="NVarChar(50)")]
+		public string Systemreinstalled
+		{
+			get
+			{
+				return this._Systemreinstalled;
+			}
+			set
+			{
+				if ((this._Systemreinstalled != value))
+				{
+					this.OnSystemreinstalledChanging(value);
+					this.SendPropertyChanging();
+					this._Systemreinstalled = value;
+					this.SendPropertyChanged("Systemreinstalled");
+					this.OnSystemreinstalledChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BlowingReport", DbType="NVarChar(50)")]
+		public string BlowingReport
+		{
+			get
+			{
+				return this._BlowingReport;
+			}
+			set
+			{
+				if ((this._BlowingReport != value))
+				{
+					this.OnBlowingReportChanging(value);
+					this.SendPropertyChanging();
+					this._BlowingReport = value;
+					this.SendPropertyChanged("BlowingReport");
+					this.OnBlowingReportChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -394522,6 +395170,12 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _CompleteTime;
 		
+		private string _Alignment;
+		
+		private string _Motorsoloruntest;
+		
+		private string _Standalonetest;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -394546,6 +395200,12 @@ namespace Model
     partial void OnMechanicalFINALStatusChanged();
     partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCompleteTimeChanged();
+    partial void OnAlignmentChanging(string value);
+    partial void OnAlignmentChanged();
+    partial void OnMotorsoloruntestChanging(string value);
+    partial void OnMotorsoloruntestChanged();
+    partial void OnStandalonetestChanging(string value);
+    partial void OnStandalonetestChanged();
     #endregion
 		
 		public Transfer_RotatingEquipment()
@@ -394753,6 +395413,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Alignment", DbType="NVarChar(50)")]
+		public string Alignment
+		{
+			get
+			{
+				return this._Alignment;
+			}
+			set
+			{
+				if ((this._Alignment != value))
+				{
+					this.OnAlignmentChanging(value);
+					this.SendPropertyChanging();
+					this._Alignment = value;
+					this.SendPropertyChanged("Alignment");
+					this.OnAlignmentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Motorsoloruntest", DbType="NVarChar(50)")]
+		public string Motorsoloruntest
+		{
+			get
+			{
+				return this._Motorsoloruntest;
+			}
+			set
+			{
+				if ((this._Motorsoloruntest != value))
+				{
+					this.OnMotorsoloruntestChanging(value);
+					this.SendPropertyChanging();
+					this._Motorsoloruntest = value;
+					this.SendPropertyChanged("Motorsoloruntest");
+					this.OnMotorsoloruntestChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Standalonetest", DbType="NVarChar(50)")]
+		public string Standalonetest
+		{
+			get
+			{
+				return this._Standalonetest;
+			}
+			set
+			{
+				if ((this._Standalonetest != value))
+				{
+					this.OnStandalonetestChanging(value);
+					this.SendPropertyChanging();
+					this._Standalonetest = value;
+					this.SendPropertyChanged("Standalonetest");
+					this.OnStandalonetestChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -394800,6 +395520,12 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _CompleteTime;
 		
+		private string _Internalinspection;
+		
+		private string _InternalsPacking;
+		
+		private string _BOXupRecord;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -394824,6 +395550,12 @@ namespace Model
     partial void OnMechanicalFINALStatusChanged();
     partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCompleteTimeChanged();
+    partial void OnInternalinspectionChanging(string value);
+    partial void OnInternalinspectionChanged();
+    partial void OnInternalsPackingChanging(string value);
+    partial void OnInternalsPackingChanged();
+    partial void OnBOXupRecordChanging(string value);
+    partial void OnBOXupRecordChanged();
     #endregion
 		
 		public Transfer_StaticEquipment()
@@ -395031,6 +395763,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Internalinspection", DbType="NVarChar(50)")]
+		public string Internalinspection
+		{
+			get
+			{
+				return this._Internalinspection;
+			}
+			set
+			{
+				if ((this._Internalinspection != value))
+				{
+					this.OnInternalinspectionChanging(value);
+					this.SendPropertyChanging();
+					this._Internalinspection = value;
+					this.SendPropertyChanged("Internalinspection");
+					this.OnInternalinspectionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InternalsPacking", DbType="NVarChar(50)")]
+		public string InternalsPacking
+		{
+			get
+			{
+				return this._InternalsPacking;
+			}
+			set
+			{
+				if ((this._InternalsPacking != value))
+				{
+					this.OnInternalsPackingChanging(value);
+					this.SendPropertyChanging();
+					this._InternalsPacking = value;
+					this.SendPropertyChanged("InternalsPacking");
+					this.OnInternalsPackingChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BOXupRecord", DbType="NVarChar(50)")]
+		public string BOXupRecord
+		{
+			get
+			{
+				return this._BOXupRecord;
+			}
+			set
+			{
+				if ((this._BOXupRecord != value))
+				{
+					this.OnBOXupRecordChanging(value);
+					this.SendPropertyChanging();
+					this._BOXupRecord = value;
+					this.SendPropertyChanged("BOXupRecord");
+					this.OnBOXupRecordChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;