diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx index 5246a5a2..b1e0dcb3 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx @@ -40,7 +40,7 @@ runat="server" DataKeyNames="Category" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="Category" AllowSorting="true" AllowPaging="false" IsDatabasePaging="false" - EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow"> + EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow" EnableAfterEditEvent="true" OnAfterEdit="Grid1_AfterEdit"> @@ -49,19 +49,24 @@ - - + + - - + + - + - - + + + + + + + diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs index 0273aac0..7b86ddfc 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs @@ -43,20 +43,21 @@ namespace FineUIPro.Web.Transfer.Chart //计算本周日期段 DateTime today = DateTime.Today; int dayOfWeek = (int)today.DayOfWeek; - DateTime startWeebTime=Convert.ToDateTime(today.AddDays(-dayOfWeek + 1).ToString("yyyy-MM-dd")+" 00:00:00"); - DateTime endWeebTime= Convert.ToDateTime(today.AddDays(-dayOfWeek + 7).ToString("yyyy-MM-dd") + " 23:59:59"); + DateTime startWeebTime = Convert.ToDateTime(today.AddDays(-dayOfWeek + 1).ToString("yyyy-MM-dd") + " 00:00:00"); + DateTime endWeebTime = Convert.ToDateTime(today.AddDays(-dayOfWeek + 7).ToString("yyyy-MM-dd") + " 23:59:59"); StringBuilder strSql = new StringBuilder(""); strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllLHCSystemListTemp') IS NOT NULL drop table #AllLHCSystemListTemp; "); strSql.AppendLine(" IF OBJECT_ID('tempdb..#LHCSystemListTemp') IS NOT NULL drop table #LHCSystemListTemp; "); strSql.AppendLine(" select * INTO #AllLHCSystemListTemp from Transfer_LHCSystemList(NOLOCK) where ProjectId =@ProjectId; "); strSql.AppendLine(" select isnull([Type],'0') [Type],(CASE isnull([Type],'0') WHEN '1' THEN 'Non Process system' ELSE 'Process System' END) Category,count(1) System_Qty "); - strSql.AppendLine(",cast(0 as decimal(18,2)) Cumulative_Plan,cast(0 as decimal(18,2)) Cumulative_Actual ,cast(0 as decimal(18,2)) Week_Plan,cast(0 as decimal(18,2)) Week_Actual "); + strSql.AppendLine(",cast(0 as decimal(18,2)) Cumulative_Plan,cast(0 as decimal(18,2)) Cumulative_Actual ,cast(0 as decimal(18,2)) Week_Plan,cast(0 as decimal(18,2)) Week_Actual,cast('' as nvarchar(600)) Remarks "); strSql.AppendLine(" INTO #LHCSystemListTemp from #AllLHCSystemListTemp group by isnull([Type],'0'); "); strSql.AppendLine(" update a set a.Cumulative_Plan=(select count(1) from #AllLHCSystemListTemp b where isnull(b.[Type],'0')=a.[Type] AND isnull(b.PlanFinishofTestingDate,'')<>'') "); strSql.AppendLine(" ,a.Cumulative_Actual=(select count(1) from #AllLHCSystemListTemp b where isnull(b.[Type],'0')=a.[Type] AND isnull(b.ActualFinishedDate,'')<>'') "); strSql.AppendLine(" ,a.Week_Plan=(select count(1) from #AllLHCSystemListTemp b where isnull(b.[Type],'0')=a.[Type] AND b.PlanFinishofTestingDate>=@StartWeebTime AND b.PlanFinishofTestingDate<=@EndWeebTime) "); strSql.AppendLine(" ,a.Week_Actual=(select count(1) from #AllLHCSystemListTemp b where isnull(b.[Type],'0')=a.[Type] AND b.ActualFinishedDate>=@StartWeebTime AND b.ActualFinishedDate<=@EndWeebTime) "); + strSql.AppendLine(" ,a.Remarks=(select top 1 Remarks from Transfer_SystemStatusRemarks b(NOLOCK) where a.Category=b.TypeName and b.ProjectId=@ProjectId) "); strSql.AppendLine(" from #LHCSystemListTemp a; "); strSql.AppendLine(" select * from #LHCSystemListTemp; "); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); @@ -73,7 +74,7 @@ namespace FineUIPro.Web.Transfer.Chart int Cumulative_Actual = 0; int Week_Plan = 0; int Week_Actual = 0; - int System_Qty=0; + int System_Qty = 0; foreach (DataRow row in tb.Rows) { System_Qty += Convert.ToInt32(row["System_Qty"]); @@ -124,7 +125,7 @@ namespace FineUIPro.Web.Transfer.Chart DateTime endTime = Convert.ToDateTime(QueryTime.ToString("yyyy-MM-dd") + " 23:59:59"); rowTime["计划完成数量"] = forms.Where(x => x.PlanFinishofTestingDate <= endTime).Count(); rowTime["实际完成数量"] = forms.Where(x => x.ActualFinishedDate <= endTime).Count(); - rowTime["进行中移交包数量"] = forms.Where(x => x.UpdateTime <= endTime && x.Status== "In progress").Count(); + rowTime["进行中移交包数量"] = forms.Where(x => x.UpdateTime <= endTime && x.Status == "In progress").Count(); dtTime.Rows.Add(rowTime); } this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false)); @@ -187,5 +188,38 @@ namespace FineUIPro.Web.Transfer.Chart { this.AnalyseData(); } + /// + /// 修改后事件 + /// + /// + /// + protected void Grid1_AfterEdit(object sender, GridAfterEditEventArgs e) + { + Dictionary> modifiedDict = Grid1.GetModifiedDict(); + + foreach (int rowIndex in modifiedDict.Keys) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + string remarks = modifiedDict[rowIndex]["Remarks"].ToString(); + var updateRemarks = Funs.DB.Transfer_SystemStatusRemarks.FirstOrDefault(p => p.TypeName == rowID && p.ProjectId == this.CurrUser.LoginProjectId); + if (updateRemarks != null) + { + updateRemarks.Remarks = remarks; + Funs.DB.SubmitChanges(); + } + else + { + Model.Transfer_SystemStatusRemarks AddRemarks = new Model.Transfer_SystemStatusRemarks(); + AddRemarks.Id = Guid.NewGuid().ToString(); + AddRemarks.ProjectId = this.CurrUser.LoginProjectId; + AddRemarks.TypeName= rowID; + AddRemarks.Remarks= remarks; + Funs.DB.Transfer_SystemStatusRemarks.InsertOnSubmit(AddRemarks); + Funs.DB.SubmitChanges(); + } + } + + } + } } \ 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 index bf715824..87365792 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs @@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer.Chart /// protected global::System.Web.UI.WebControls.Label lblPageIndex; + /// + /// txtRemarks 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemarks; + /// /// Tab2 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 98f584cb..3d461a97 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -2540,6 +2540,9 @@ namespace Model partial void InsertTransfer_SystemControl(Transfer_SystemControl instance); partial void UpdateTransfer_SystemControl(Transfer_SystemControl instance); partial void DeleteTransfer_SystemControl(Transfer_SystemControl instance); + partial void InsertTransfer_SystemStatusRemarks(Transfer_SystemStatusRemarks instance); + partial void UpdateTransfer_SystemStatusRemarks(Transfer_SystemStatusRemarks instance); + partial void DeleteTransfer_SystemStatusRemarks(Transfer_SystemStatusRemarks instance); partial void InsertTransfer_Telecom(Transfer_Telecom instance); partial void UpdateTransfer_Telecom(Transfer_Telecom instance); partial void DeleteTransfer_Telecom(Transfer_Telecom instance); @@ -9440,6 +9443,14 @@ namespace Model } } + public System.Data.Linq.Table Transfer_SystemStatusRemarks + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Transfer_Telecom { get @@ -62038,8 +62049,6 @@ namespace Model private EntityRef _Base_Project; - private EntityRef _Technique_CheckItemSet; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -62091,7 +62100,6 @@ namespace Model public Check_CheckSpecial() { this._Base_Project = default(EntityRef); - this._Technique_CheckItemSet = default(EntityRef); OnCreated(); } @@ -62410,10 +62418,6 @@ namespace Model { if ((this._CheckItemSetId != value)) { - if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnCheckItemSetIdChanging(value); this.SendPropertyChanging(); this._CheckItemSetId = value; @@ -62557,40 +62561,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)] - public Technique_CheckItemSet Technique_CheckItemSet - { - get - { - return this._Technique_CheckItemSet.Entity; - } - set - { - Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity; - if (((previousValue != value) - || (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Technique_CheckItemSet.Entity = null; - previousValue.Check_CheckSpecial.Remove(this); - } - this._Technique_CheckItemSet.Entity = value; - if ((value != null)) - { - value.Check_CheckSpecial.Add(this); - this._CheckItemSetId = value.CheckItemSetId; - } - else - { - this._CheckItemSetId = default(string); - } - this.SendPropertyChanged("Technique_CheckItemSet"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -370551,8 +370521,6 @@ namespace Model private System.Nullable _IsBuiltIn; - private EntitySet _Check_CheckSpecial; - private EntitySet _Technique_CheckItemDetail; #region 可扩展性方法定义 @@ -370579,7 +370547,6 @@ namespace Model public Technique_CheckItemSet() { - this._Check_CheckSpecial = new EntitySet(new Action(this.attach_Check_CheckSpecial), new Action(this.detach_Check_CheckSpecial)); this._Technique_CheckItemDetail = new EntitySet(new Action(this.attach_Technique_CheckItemDetail), new Action(this.detach_Technique_CheckItemDetail)); OnCreated(); } @@ -370744,19 +370711,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] - public EntitySet Check_CheckSpecial - { - get - { - return this._Check_CheckSpecial; - } - set - { - this._Check_CheckSpecial.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")] public EntitySet Technique_CheckItemDetail { @@ -370790,18 +370744,6 @@ namespace Model } } - private void attach_Check_CheckSpecial(Check_CheckSpecial entity) - { - this.SendPropertyChanging(); - entity.Technique_CheckItemSet = this; - } - - private void detach_Check_CheckSpecial(Check_CheckSpecial entity) - { - this.SendPropertyChanging(); - entity.Technique_CheckItemSet = null; - } - private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity) { this.SendPropertyChanging(); @@ -394411,12 +394353,8 @@ namespace Model private string _Comments; - private string _Num_NO; - private string _System_No; - private string _Sub_Sys_No; - private string _Cat; private string _Raised_By; @@ -394437,8 +394375,6 @@ namespace Model private string _PIC_WUH; - private string _Correction_Action; - private System.Nullable _Actual_Date; private string _Cleared_By; @@ -394457,6 +394393,12 @@ namespace Model private string _Remark; + private string _Sub_Sys_No; + + private string _Num_NO; + + private string _Correction_Action; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -394493,12 +394435,8 @@ namespace Model partial void OnPUNCH_ITEM_STATUSChanged(); partial void OnCommentsChanging(string value); partial void OnCommentsChanged(); - partial void OnNum_NOChanging(string value); - partial void OnNum_NOChanged(); partial void OnSystem_NoChanging(string value); partial void OnSystem_NoChanged(); - partial void OnSub_Sys_NoChanging(string value); - partial void OnSub_Sys_NoChanged(); partial void OnCatChanging(string value); partial void OnCatChanged(); partial void OnRaised_ByChanging(string value); @@ -394519,8 +394457,6 @@ namespace Model partial void OnPICChanged(); partial void OnPIC_WUHChanging(string value); partial void OnPIC_WUHChanged(); - partial void OnCorrection_ActionChanging(string value); - partial void OnCorrection_ActionChanged(); partial void OnActual_DateChanging(System.Nullable value); partial void OnActual_DateChanged(); partial void OnCleared_ByChanging(string value); @@ -394539,6 +394475,12 @@ namespace Model partial void OnStatusChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnSub_Sys_NoChanging(string value); + partial void OnSub_Sys_NoChanged(); + partial void OnNum_NOChanging(string value); + partial void OnNum_NOChanged(); + partial void OnCorrection_ActionChanging(string value); + partial void OnCorrection_ActionChanged(); #endregion public Transfer_PunchlistFrom() @@ -394866,26 +394808,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")] - public string Num_NO - { - get - { - return this._Num_NO; - } - set - { - if ((this._Num_NO != value)) - { - this.OnNum_NOChanging(value); - this.SendPropertyChanging(); - this._Num_NO = value; - this.SendPropertyChanged("Num_NO"); - this.OnNum_NOChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_System_No", DbType="NVarChar(50)")] public string System_No { @@ -394906,26 +394828,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")] - public string Sub_Sys_No - { - get - { - return this._Sub_Sys_No; - } - set - { - if ((this._Sub_Sys_No != value)) - { - this.OnSub_Sys_NoChanging(value); - this.SendPropertyChanging(); - this._Sub_Sys_No = value; - this.SendPropertyChanged("Sub_Sys_No"); - this.OnSub_Sys_NoChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cat", DbType="NVarChar(50)")] public string Cat { @@ -395126,26 +395028,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")] - public string Correction_Action - { - get - { - return this._Correction_Action; - } - set - { - if ((this._Correction_Action != value)) - { - this.OnCorrection_ActionChanging(value); - this.SendPropertyChanging(); - this._Correction_Action = value; - this.SendPropertyChanged("Correction_Action"); - this.OnCorrection_ActionChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Actual_Date", DbType="DateTime")] public System.Nullable Actual_Date { @@ -395326,6 +395208,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")] + public string Sub_Sys_No + { + get + { + return this._Sub_Sys_No; + } + set + { + if ((this._Sub_Sys_No != value)) + { + this.OnSub_Sys_NoChanging(value); + this.SendPropertyChanging(); + this._Sub_Sys_No = value; + this.SendPropertyChanged("Sub_Sys_No"); + this.OnSub_Sys_NoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")] + public string Num_NO + { + get + { + return this._Num_NO; + } + set + { + if ((this._Num_NO != value)) + { + this.OnNum_NOChanging(value); + this.SendPropertyChanging(); + this._Num_NO = value; + this.SendPropertyChanged("Num_NO"); + this.OnNum_NOChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")] + public string Correction_Action + { + get + { + return this._Correction_Action; + } + set + { + if ((this._Correction_Action != value)) + { + this.OnCorrection_ActionChanging(value); + this.SendPropertyChanging(); + this._Correction_Action = value; + this.SendPropertyChanged("Correction_Action"); + this.OnCorrection_ActionChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -396469,6 +396411,140 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Transfer_SystemStatusRemarks")] + public partial class Transfer_SystemStatusRemarks : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ProjectId; + + private string _TypeName; + + private string _Remarks; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTypeNameChanging(string value); + partial void OnTypeNameChanged(); + partial void OnRemarksChanging(string value); + partial void OnRemarksChanged(); + #endregion + + public Transfer_SystemStatusRemarks() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeName", DbType="NVarChar(50)")] + public string TypeName + { + get + { + return this._TypeName; + } + set + { + if ((this._TypeName != value)) + { + this.OnTypeNameChanging(value); + this.SendPropertyChanging(); + this._TypeName = value; + this.SendPropertyChanged("TypeName"); + this.OnTypeNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(600)")] + public string Remarks + { + get + { + return this._Remarks; + } + set + { + if ((this._Remarks != value)) + { + this.OnRemarksChanging(value); + this.SendPropertyChanging(); + this._Remarks = value; + this.SendPropertyChanged("Remarks"); + this.OnRemarksChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Transfer_Telecom")] public partial class Transfer_Telecom : INotifyPropertyChanging, INotifyPropertyChanged {