diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-07-29-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-07-29-phf.sql index 3ce4c526..98757ca9 100644 --- a/DataBase/版本日志/SGGLDB_WH_V2024-07-29-phf.sql +++ b/DataBase/版本日志/SGGLDB_WH_V2024-07-29-phf.sql @@ -1,3 +1,6 @@ +alter table Transfer_LHCSystemList +add SystemNo nvarchar(50) NULL; + insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) values('E305689E-5D84-4C1A-BF67-85FA2D828115','ƽͳƱ','Transfer/Chart/Systemstatus.aspx',50,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B' diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 83bd7d69..85710119 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -750,3 +750,82 @@ IP地址:::1 出错时间:07/25/2024 13:36:33 出错时间:07/25/2024 13:36:33 + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000),@Type nvarchar(1))select * from Trans' 需要参数 '@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.LHCSystemList.BindGrid() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\LHCSystemList.aspx.cs:行号 78 + 在 FineUIPro.Web.Transfer.LHCSystemList.Page_Load(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\LHCSystemList.aspx.cs:行号 42 + 在 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/29/2024 16:03:19 +出错文件:http://localhost:8579/Transfer/LHCSystemList.aspx?Type=0 +IP地址:::1 +操作人员:JT + +出错时间:07/29/2024 16:03:19 + + +错误信息开始=====> +错误类型:HttpParseException +错误信息:FineUIPro.ControlBaseCollection 必须具有类型为“FineUIPro.ControlBase”的项。“div”的类型为“System.Web.UI.HtmlControls.HtmlGenericControl”。 +错误堆栈: + 在 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 +----错误信息: +----FineUIPro.ControlBaseCollection 必须具有类型为“FineUIPro.ControlBase”的项。“div”的类型为“System.Web.UI.HtmlControls.HtmlGenericControl”。 +----错误堆栈: + 在 System.Web.UI.CollectionBuilder.GetChildControlType(String tagName, IDictionary attribs) + 在 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) +出错时间:07/29/2024 16:40:04 +出错文件:http://localhost:8579/Transfer/Chart/SystemstatusChart.aspx +IP地址:::1 + +出错时间:07/29/2024 16:40:04 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:g:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\SystemstatusChart.aspx(166): error CS0103: 当前上下文中不存在名称“Two” +错误堆栈: + 在 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/29/2024 16:47:59 +出错文件:http://localhost:8579/Transfer/Chart/SystemstatusChart.aspx +IP地址:::1 + +出错时间:07/29/2024 16:47:59 + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls index 1656dd2a..122ef869 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls index 7f6807dd..24e57678 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 828a011c..cdfa3475 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -2024,6 +2024,9 @@ + + + @@ -17611,6 +17614,27 @@ PunchlistFromSort.aspx + + Systemstatus.aspx + ASPXCodeBehind + + + Systemstatus.aspx + + + SystemstatusChart.aspx + ASPXCodeBehind + + + SystemstatusChart.aspx + + + SystemStatusSummary.aspx + ASPXCodeBehind + + + SystemStatusSummary.aspx + TransferChart.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx new file mode 100644 index 00000000..c1948b4e --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SystemStatusSummary.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.SystemStatusSummary" %> + + + + + + + 移交状态汇总表 + + +
+
+
+
+ + diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs new file mode 100644 index 00000000..5a18bba7 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.Transfer.Chart +{ + public partial class SystemStatusSummary : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs new file mode 100644 index 00000000..a45770e1 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.Transfer.Chart +{ + + + public partial class SystemStatusSummary + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx new file mode 100644 index 00000000..32b12de0 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Systemstatus.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Systemstatus" %> + + + + + + + 移交统计表 + + +
+
+
+
+ + diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs new file mode 100644 index 00000000..23fe1cfe --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.Transfer.Chart +{ + public partial class Systemstatus : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs new file mode 100644 index 00000000..2d01287e --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.Transfer.Chart +{ + + + public partial class Systemstatus + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx new file mode 100644 index 00000000..5a8cd0b7 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx @@ -0,0 +1,246 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SystemstatusChart.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.SystemstatusChart" %> + +<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %> + + + + + + 移交统计图表 + + +
+ + +
+ <%-- --%> + + + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs new file mode 100644 index 00000000..efe5a15f --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs @@ -0,0 +1,124 @@ +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 SystemstatusChart : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) { + var systemCode = Funs.DB.Transfer_LHCSystemList + .Where(x => x.ProjectId == CurrUser.LoginProjectId) + .GroupBy(p => new { p.SystemNo }) + .Select(p => new { SystemNo = p.Key.SystemNo }).ToList(); + int indexRow = 1; + ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", "")); + foreach (var t in systemCode) + { + ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SystemNo, t.SystemNo)); + indexRow++; + } + + AnalyseData(); + } + } + public string AllSystemNo; + + public string completed; + public string Inprogress; + public string NotStart; + + public void AnalyseData() { + var pid = CurrUser.LoginProjectId; + #region 统计所有 + var systemCode = Funs.DB.Transfer_LHCSystemList + .Where(x => x.ProjectId == CurrUser.LoginProjectId) + .GroupBy(p => new { p.SystemNo }) + .Select(p => new { SystemNo = p.Key.SystemNo }).ToList(); + + if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue)) + { + systemCode= Funs.DB.Transfer_LHCSystemList + .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.SystemNo == ddlSystemNo.SelectedValue) + .GroupBy(p => new { p.SystemNo }) + .Select(p => new { SystemNo = p.Key.SystemNo }).ToList(); + } + #region 九个表的数据 + var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid).ToList(); + var list2= Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == pid).ToList(); + var list3= Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == pid).ToList(); + var list4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == pid).ToList(); + var list5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == pid).ToList(); + var list6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == pid).ToList(); + var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid).ToList(); + var list8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == pid).ToList(); + var list9 = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == pid).ToList(); + #endregion + DataTable dt = new DataTable(); + dt.Columns.Add("系统编号", typeof(string)); + dt.Columns.Add("完成数量", typeof(string)); + dt.Columns.Add("进行中数量", typeof(string)); + dt.Columns.Add("未完成数量", typeof(string)); + foreach (var t in systemCode) { + var scode = t.SystemNo; + AllSystemNo += "'" + scode + "',"; + DataRow dr = dt.NewRow(); + dr["系统编号"] = scode; + #region 根据系统编号获取完成的数量 + var completedCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "Completed").ToList().Count() + + list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Completed").ToList().Count() + + list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Completed").ToList().Count() + + list4.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() + + list5.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() + + list6.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() + + list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() + + list8.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count() + + list9.Where(x => x.SystemName == scode && x.Status == "Completed").ToList().Count(); + #endregion + dr["完成数量"] = completedCount; + completed+= "'" + completedCount.ToString() + "',"; + #region 根据系统编号获取进行中数量 + var InprogressCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "In progress").ToList().Count() + + list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "In progress").ToList().Count() + + list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "In progress").ToList().Count() + + list4.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() + + list5.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() + + list6.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() + + list7.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() + + list8.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count() + + list9.Where(x => x.SystemName == scode && x.Status == "In progress").ToList().Count(); + #endregion + dr["进行中数量"] = InprogressCount; + Inprogress += "'" + InprogressCount.ToString() + "',"; + #region 根据系统编号获取未完成数量 + var NotStartCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "Not Start").ToList().Count() + + list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count() + + list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count() + + list4.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() + + list5.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() + + list6.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() + + list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() + + list8.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count() + + list9.Where(x => x.SystemName == scode && x.Status == "Not Start").ToList().Count(); + #endregion + dr["未完成数量"] = NotStartCount; + NotStart += "'" + NotStartCount.ToString() + "',"; + dt.Rows.Add(dr); + } + //this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dt, "移交状态统计", "Column", 1300, 550, false)); + #endregion + } + + protected void ddlSystemNo_SelectedIndexChanged(object sender, EventArgs e) + { + this.AnalyseData(); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.designer.cs new file mode 100644 index 00000000..efce66c4 --- /dev/null +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.Transfer.Chart +{ + + + public partial class SystemstatusChart + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel3; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// ddlSystemNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlSystemNo; + } +} diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx index 7fa70d67..23c52378 100644 --- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx +++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx @@ -62,7 +62,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx index 9d1ce25b..6339062c 100644 --- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx @@ -63,7 +63,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx index d51dc8ba..3c6bc6e1 100644 --- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx @@ -63,7 +63,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx index 3364d560..6d42864e 100644 --- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx @@ -63,7 +63,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx index bb2347b8..9c8295af 100644 --- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx @@ -49,11 +49,17 @@ HeaderTextAlign="Center" MinWidth="50px"> + + + + @@ -65,15 +71,10 @@ - - - @@ -97,6 +98,7 @@ + @@ -140,6 +142,10 @@ F(menuID).show(); //showAt(event.pageX, event.pageY); return false; } + function onGridDataLoad(event) { + this.mergeColumns(['SystemNo', 'Commissioningsystemcode', 'CommissioningCodeDescription']); + } + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs index 60078284..07df687d 100644 --- a/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs @@ -420,11 +420,11 @@ namespace FineUIPro.Web.Transfer oleDBConn.Dispose(); if (Type == "0") { - AddDatasetToSQL2(ds.Tables[0], 8); + AddDatasetToSQL2(ds.Tables[0], 9); } else { - AddDatasetToSQL2(ds.Tables[0], 9); + AddDatasetToSQL2(ds.Tables[0], 10); } } @@ -472,7 +472,7 @@ namespace FineUIPro.Web.Transfer //根据项目id查询sn var snModel = Funs.DB.Transfer_LHCSystemList.Where(x => x.ProjectId == CurrUser.LoginProjectId && x.Type == Type).OrderByDescending(x => x.SN).FirstOrDefault(); - if (snModel == null && Sn!=1001) + if (snModel == null && Sn==0) { Sn = 1001; model.SN = Sn; @@ -490,13 +490,15 @@ namespace FineUIPro.Web.Transfer } } + model.SystemNo = pds.Rows[i][0].ToString().Trim(); - model.Commissioningsystemcode= pds.Rows[i][0].ToString().Trim(); - model.CommissioningCodeDescription = pds.Rows[i][1].ToString().Trim(); + model.Commissioningsystemcode= pds.Rows[i][1].ToString().Trim(); + + model.CommissioningCodeDescription = pds.Rows[i][2].ToString().Trim(); if (Type == "0") { - model.SubCommissioningsystem = pds.Rows[i][2].ToString().Trim(); - model.Turnover_Code= pds.Rows[i][3].ToString().Trim(); + model.SubCommissioningsystem = pds.Rows[i][3].ToString().Trim(); + //model.Turnover_Code= pds.Rows[i][4].ToString().Trim(); DateTime t1, t2,t3; if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString())) model.PlanStartofTestingDate = t1; @@ -508,9 +510,9 @@ namespace FineUIPro.Web.Transfer } else { - model.Describe = pds.Rows[i][2].ToString().Trim(); - model.SubCommissioningsystem = pds.Rows[i][3].ToString().Trim(); - model.Turnover_Code = pds.Rows[i][4].ToString().Trim(); + model.Describe = pds.Rows[i][3].ToString().Trim(); + model.SubCommissioningsystem = pds.Rows[i][4].ToString().Trim(); + //model.Turnover_Code = pds.Rows[i][5].ToString().Trim(); DateTime t1, t2, t3; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString())) model.PlanStartofTestingDate = t1; diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx index 75d86f91..c205a6da 100644 --- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx @@ -52,7 +52,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx index 696b4ccc..c7482359 100644 --- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx @@ -24,7 +24,7 @@ - + @@ -60,7 +60,7 @@ HeaderTextAlign="Center" minWidth="140px"> - diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx index bce04724..51419a3f 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx @@ -24,7 +24,7 @@ - + <%-- @@ -65,7 +65,7 @@ - - + @@ -62,7 +62,7 @@ - + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 60fa8541..6215dfa3 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -392613,6 +392613,8 @@ namespace Model private string _Describe; + private string _SystemNo; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -392643,6 +392645,8 @@ namespace Model partial void OnActualFinishedDateChanged(); partial void OnDescribeChanging(string value); partial void OnDescribeChanged(); + partial void OnSystemNoChanging(string value); + partial void OnSystemNoChanged(); #endregion public Transfer_LHCSystemList() @@ -392910,6 +392914,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemNo", DbType="NVarChar(50)")] + public string SystemNo + { + get + { + return this._SystemNo; + } + set + { + if ((this._SystemNo != value)) + { + this.OnSystemNoChanging(value); + this.SendPropertyChanging(); + this._SystemNo = value; + this.SendPropertyChanged("SystemNo"); + this.OnSystemNoChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;