lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报表备注可以修改

This commit is contained in:
李云虎 2024-07-30 15:15:46 +08:00
parent 1307746137
commit c02a6fe294
4 changed files with 278 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx
View File

@ -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">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="80px" HeaderText="No.序号" HeaderTextAlign="Center"
TextAlign="Center" EnableLock="true" Locked="False">
@ -49,19 +49,24 @@
</ItemTemplate>
</f:TemplateField>
<f:BoundField DataField="Category" ColumnID="Category" HeaderText="Category<br/>分类" ExpandUnusedSpace="true" MinWidth="150px" TextAlign="Center" />
<f:RenderField Width="200px" ColumnID="System_Qty" DataField="System_Qty" HeaderText="System Qty<br/>系统数量" TextAlign="Center" FieldType="Double" />
<f:GroupField HeaderText="Cumulative Completion<br/>累计完成" TextAlign="Center" MinWidth="600px">
<f:RenderField Width="120px" ColumnID="System_Qty" DataField="System_Qty" HeaderText="System Qty<br/>系统数量" TextAlign="Center" FieldType="Double" />
<f:GroupField HeaderText="Cumulative Completion<br/>累计完成" TextAlign="Center" MinWidth="240px">
<Columns>
<f:RenderField Width="150px" ColumnID="Cumulative_Plan" DataField="Cumulative_Plan" HeaderText="Plan计划" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cumulative_Actual" DataField="Cumulative_Plan" HeaderText="Actual实际" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="120px" ColumnID="Cumulative_Plan" DataField="Cumulative_Plan" HeaderText="Plan计划" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="120px" ColumnID="Cumulative_Actual" DataField="Cumulative_Plan" HeaderText="Actual实际" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="This Week<br/>本周" TextAlign="Center" MinWidth="600px">
<f:GroupField HeaderText="This Week<br/>本周" TextAlign="Center" MinWidth="240px">
<Columns>
<f:RenderField Width="150px" ColumnID="Week_Plan" DataField="Week_Plan" HeaderText="Plan计划" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Week_Actual" DataField="Week_Plan" HeaderText="Actual实际" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="120px" ColumnID="Week_Plan" DataField="Week_Plan" HeaderText="Plan计划" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="120px" ColumnID="Week_Actual" DataField="Week_Plan" HeaderText="Actual实际" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
<f:RenderField Width="300px" ColumnID="Remarks" DataField="Remarks" FieldType="String" HeaderText="备注" HeaderTextAlign="Center">
<Editor>
<f:TextBox runat="server" ID="txtRemarks"></f:TextBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
</Items>

36
SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs
View File

@ -51,12 +51,13 @@ namespace FineUIPro.Web.Transfer.Chart
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));
@ -187,5 +188,38 @@ namespace FineUIPro.Web.Transfer.Chart
{
this.AnalyseData();
}
/// <summary>
/// 修改后事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_AfterEdit(object sender, GridAfterEditEventArgs e)
{
Dictionary<int, Dictionary<string, object>> 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();
}
}
}
}
}

9
SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs generated
View File

@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer.Chart
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// txtRemarks 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemarks;
/// <summary>
/// Tab2 控件。
/// </summary>

358
SGGL/Model/Model.cs
View File

@ -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> Transfer_SystemStatusRemarks
{
get
{
return this.GetTable<Transfer_SystemStatusRemarks>();
}
}
public System.Data.Linq.Table<Transfer_Telecom> Transfer_Telecom
{
get
@ -62038,8 +62049,6 @@ namespace Model
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Technique_CheckItemSet> _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<Base_Project>);
this._Technique_CheckItemSet = default(EntityRef<Technique_CheckItemSet>);
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<bool> _IsBuiltIn;
private EntitySet<Check_CheckSpecial> _Check_CheckSpecial;
private EntitySet<Technique_CheckItemDetail> _Technique_CheckItemDetail;
#region 可扩展性方法定义
@ -370579,7 +370547,6 @@ namespace Model
public Technique_CheckItemSet()
{
this._Check_CheckSpecial = new EntitySet<Check_CheckSpecial>(new Action<Check_CheckSpecial>(this.attach_Check_CheckSpecial), new Action<Check_CheckSpecial>(this.detach_Check_CheckSpecial));
this._Technique_CheckItemDetail = new EntitySet<Technique_CheckItemDetail>(new Action<Technique_CheckItemDetail>(this.attach_Technique_CheckItemDetail), new Action<Technique_CheckItemDetail>(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> 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> 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<System.DateTime> _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<System.DateTime> 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<System.DateTime> 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
{