shecs
/
Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20241225 Performance Report修改

This commit is contained in:
毕文静 2024-12-25 16:52:36 +08:00
parent 1955a07538
commit c64319cbe7
9 changed files with 1122 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FCL/BLL/BaseInfo/ContractorService.cs
View File

@ -38,6 +38,7 @@ namespace BLL
newContractor.VendorNumber = contractor.VendorNumber;
newContractor.Contractor = contractor.Contractor;
newContractor.ContractorCN = contractor.ContractorCN;
newContractor.ContractorShortName = contractor.ContractorShortName;
Funs.DB.Base_Contractor.InsertOnSubmit(newContractor);
Funs.DB.SubmitChanges();
}
@ -54,6 +55,7 @@ namespace BLL
newContractor.VendorNumber = contractor.VendorNumber;
newContractor.Contractor = contractor.Contractor;
newContractor.ContractorCN = contractor.ContractorCN;
newContractor.ContractorShortName = contractor.ContractorShortName;
Funs.DB.SubmitChanges();
}
}

7
FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx
View File

@ -36,9 +36,12 @@
<f:RenderField Width="120px" ColumnID="VendorNumber" DataField="VendorNumber"
FieldType="String" HeaderText="Vendor Number" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="720px" ColumnID="Contractor" DataField="Contractor"
<f:RenderField Width="580px" ColumnID="Contractor" DataField="Contractor"
FieldType="String" HeaderText="Contractor" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="ContractorShortName" DataField="ContractorShortName"
FieldType="String" HeaderText="承包商简称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -76,6 +79,8 @@
</f:TextBox>
<f:TextBox ID="txtContractorCN" Label="承包商" runat="server" LabelAlign="right" MaxLength="200" LabelWidth="130px">
</f:TextBox>
<f:TextBox ID="txtContractorShortName" Label="承包商简称" runat="server" LabelAlign="right" MaxLength="50" LabelWidth="130px">
</f:TextBox>
</Items>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">

8
FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.cs
View File

@ -42,7 +42,8 @@ namespace FineUIPro.Web.BaseInfo
contractor.VendorNumber,
(CASE WHEN contractor.Contractor IS NULL THEN ISNULL(contractor.ContractorCN,'')
ELSE (CASE WHEN contractor.ContractorCN IS NULL THEN ISNULL(contractor.Contractor,'')
ELSE (ISNULL(contractor.Contractor,'') + ISNULL(contractor.ContractorCN,'')) END) END)AS Contractor
ELSE (ISNULL(contractor.Contractor,'') + ISNULL(contractor.ContractorCN,'')) END) END)AS Contractor,
contractor.ContractorShortName
FROM Base_Contractor AS contractor WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
@ -168,6 +169,7 @@ namespace FineUIPro.Web.BaseInfo
this.txtVendorNumber.Text = contractor.VendorNumber;
this.txtContractor.Text = contractor.Contractor;
this.txtContractorCN.Text = contractor.ContractorCN;
this.txtContractorShortName.Text = contractor.ContractorShortName;
hfFormID.Text = Id;
this.btnDelete.Enabled = true;
}
@ -187,6 +189,7 @@ namespace FineUIPro.Web.BaseInfo
contractor.VendorNumber = this.txtVendorNumber.Text.Trim();
contractor.Contractor = this.txtContractor.Text.Trim();
contractor.ContractorCN = this.txtContractorCN.Text.Trim();
contractor.ContractorShortName = this.txtContractorShortName.Text.Trim();
if (BLL.ContractorService.IsExitContractor(this.txtContractor.Text.Trim(), strRowID))
{
@ -259,6 +262,7 @@ namespace FineUIPro.Web.BaseInfo
this.txtVendorNumber.Text = string.Empty;
this.txtContractor.Text = string.Empty;
this.txtContractorCN.Text = string.Empty;
this.txtContractorShortName.Text = string.Empty;
this.btnDelete.Enabled = false;
}
@ -333,6 +337,8 @@ namespace FineUIPro.Web.BaseInfo
ws.GetRow(rowIndex).GetCell(1).CellStyle = fontStyle;
if (ws.GetRow(rowIndex).GetCell(2) == null) ws.GetRow(rowIndex).CreateCell(2);
ws.GetRow(rowIndex).GetCell(2).SetCellValue(Grid1.Rows[i].Values[2].ToString());
if (ws.GetRow(rowIndex).GetCell(3) == null) ws.GetRow(rowIndex).CreateCell(3);
ws.GetRow(rowIndex).GetCell(3).SetCellValue(Grid1.Rows[i].Values[3].ToString());
rowIndex++;
}
#endregion

15
FCL/FineUIPro.Web/BaseInfo/ContractorList.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo {
namespace FineUIPro.Web.BaseInfo
{
public partial class ContractorList {
public partial class ContractorList
{
/// <summary>
/// form1 控件。
@ -201,6 +203,15 @@ namespace FineUIPro.Web.BaseInfo {
/// </remarks>
protected global::FineUIPro.TextBox txtContractorCN;
/// <summary>
/// txtContractorShortName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtContractorShortName;
/// <summary>
/// Toolbar1 控件。
/// </summary>

897
FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
View File

File diff suppressed because it is too large Load Diff

BIN
FCL/FineUIPro.Web/File/Excel/Contractor.xlsx
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx
View File

Binary file not shown.

403
FCL/Model/Model.cs
View File

@ -119,6 +119,9 @@ namespace Model
partial void InsertEMC_ViolationClause(EMC_ViolationClause instance);
partial void UpdateEMC_ViolationClause(EMC_ViolationClause instance);
partial void DeleteEMC_ViolationClause(EMC_ViolationClause instance);
partial void InsertFC_BigDepartEvaRate(FC_BigDepartEvaRate instance);
partial void UpdateFC_BigDepartEvaRate(FC_BigDepartEvaRate instance);
partial void DeleteFC_BigDepartEvaRate(FC_BigDepartEvaRate instance);
partial void InsertFC_ContractManagement(FC_ContractManagement instance);
partial void UpdateFC_ContractManagement(FC_ContractManagement instance);
partial void DeleteFC_ContractManagement(FC_ContractManagement instance);
@ -509,6 +512,14 @@ namespace Model
}
}
public System.Data.Linq.Table<FC_BigDepartEvaRate> FC_BigDepartEvaRate
{
get
{
return this.GetTable<FC_BigDepartEvaRate>();
}
}
public System.Data.Linq.Table<FC_ContractManagement> FC_ContractManagement
{
get
@ -1336,6 +1347,8 @@ namespace Model
private string _ContractorCN;
private string _ContractorShortName;
private EntitySet<EMC_OneTimeContracts> _EMC_OneTimeContracts;
private EntitySet<FC_SESRelatedData> _FC_SESRelatedData;
@ -1352,6 +1365,8 @@ namespace Model
partial void OnContractorChanged();
partial void OnContractorCNChanging(string value);
partial void OnContractorCNChanged();
partial void OnContractorShortNameChanging(string value);
partial void OnContractorShortNameChanged();
#endregion
public Base_Contractor()
@ -1441,6 +1456,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
public string ContractorShortName
{
get
{
return this._ContractorShortName;
}
set
{
if ((this._ContractorShortName != value))
{
this.OnContractorShortNameChanging(value);
this.SendPropertyChanging();
this._ContractorShortName = value;
this.SendPropertyChanged("ContractorShortName");
this.OnContractorShortNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EMC_OneTimeContracts_Base_Contractor", Storage="_EMC_OneTimeContracts", ThisKey="ContractorId", OtherKey="ContractorId", DeleteRule="NO ACTION")]
public EntitySet<EMC_OneTimeContracts> EMC_OneTimeContracts
{
@ -12019,6 +12054,212 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.FC_BigDepartEvaRate")]
public partial class FC_BigDepartEvaRate : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private int _Id;
private string _ReportMonth;
private string _Depart;
private string _Team;
private System.Nullable<decimal> _Participation_Rate;
private string _Participation_Rate_Type;
private System.Nullable<bool> _IsSafe;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(int value);
partial void OnIdChanged();
partial void OnReportMonthChanging(string value);
partial void OnReportMonthChanged();
partial void OnDepartChanging(string value);
partial void OnDepartChanged();
partial void OnTeamChanging(string value);
partial void OnTeamChanged();
partial void OnParticipation_RateChanging(System.Nullable<decimal> value);
partial void OnParticipation_RateChanged();
partial void OnParticipation_Rate_TypeChanging(string value);
partial void OnParticipation_Rate_TypeChanged();
partial void OnIsSafeChanging(System.Nullable<bool> value);
partial void OnIsSafeChanged();
#endregion
public FC_BigDepartEvaRate()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", AutoSync=AutoSync.OnInsert, DbType="Int NOT NULL IDENTITY", IsPrimaryKey=true, IsDbGenerated=true)]
public int 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="_ReportMonth", DbType="NVarChar(50)")]
public string ReportMonth
{
get
{
return this._ReportMonth;
}
set
{
if ((this._ReportMonth != value))
{
this.OnReportMonthChanging(value);
this.SendPropertyChanging();
this._ReportMonth = value;
this.SendPropertyChanged("ReportMonth");
this.OnReportMonthChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Depart", DbType="NVarChar(50)")]
public string Depart
{
get
{
return this._Depart;
}
set
{
if ((this._Depart != value))
{
this.OnDepartChanging(value);
this.SendPropertyChanging();
this._Depart = value;
this.SendPropertyChanged("Depart");
this.OnDepartChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Team", DbType="NVarChar(50)")]
public string Team
{
get
{
return this._Team;
}
set
{
if ((this._Team != value))
{
this.OnTeamChanging(value);
this.SendPropertyChanging();
this._Team = value;
this.SendPropertyChanged("Team");
this.OnTeamChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Participation_Rate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> Participation_Rate
{
get
{
return this._Participation_Rate;
}
set
{
if ((this._Participation_Rate != value))
{
this.OnParticipation_RateChanging(value);
this.SendPropertyChanging();
this._Participation_Rate = value;
this.SendPropertyChanged("Participation_Rate");
this.OnParticipation_RateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Participation_Rate_Type", DbType="NVarChar(50)")]
public string Participation_Rate_Type
{
get
{
return this._Participation_Rate_Type;
}
set
{
if ((this._Participation_Rate_Type != value))
{
this.OnParticipation_Rate_TypeChanging(value);
this.SendPropertyChanging();
this._Participation_Rate_Type = value;
this.SendPropertyChanged("Participation_Rate_Type");
this.OnParticipation_Rate_TypeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSafe", DbType="Bit")]
public System.Nullable<bool> IsSafe
{
get
{
return this._IsSafe;
}
set
{
if ((this._IsSafe != value))
{
this.OnIsSafeChanging(value);
this.SendPropertyChanging();
this._IsSafe = value;
this.SendPropertyChanged("IsSafe");
this.OnIsSafeChanged();
}
}
}
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.FC_ContractManagement")]
public partial class FC_ContractManagement : INotifyPropertyChanging, INotifyPropertyChanged
{
@ -13699,6 +13940,12 @@ namespace Model
private System.Nullable<bool> _IsSafe;
private string _ContractorCN;
private string _ContractorEN;
private string _ContractorShortName;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -13765,6 +14012,12 @@ namespace Model
partial void OnCTEDAvgScoreChanged();
partial void OnIsSafeChanging(System.Nullable<bool> value);
partial void OnIsSafeChanged();
partial void OnContractorCNChanging(string value);
partial void OnContractorCNChanged();
partial void OnContractorENChanging(string value);
partial void OnContractorENChanged();
partial void OnContractorShortNameChanging(string value);
partial void OnContractorShortNameChanged();
#endregion
public FC_OverviewReport()
@ -14392,6 +14645,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorCN", DbType="NVarChar(100)")]
public string ContractorCN
{
get
{
return this._ContractorCN;
}
set
{
if ((this._ContractorCN != value))
{
this.OnContractorCNChanging(value);
this.SendPropertyChanging();
this._ContractorCN = value;
this.SendPropertyChanged("ContractorCN");
this.OnContractorCNChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorEN", DbType="NVarChar(100)")]
public string ContractorEN
{
get
{
return this._ContractorEN;
}
set
{
if ((this._ContractorEN != value))
{
this.OnContractorENChanging(value);
this.SendPropertyChanging();
this._ContractorEN = value;
this.SendPropertyChanged("ContractorEN");
this.OnContractorENChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
public string ContractorShortName
{
get
{
return this._ContractorShortName;
}
set
{
if ((this._ContractorShortName != value))
{
this.OnContractorShortNameChanging(value);
this.SendPropertyChanging();
this._ContractorShortName = value;
this.SendPropertyChanged("ContractorShortName");
this.OnContractorShortNameChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -29562,6 +29875,8 @@ namespace Model
private System.Nullable<System.DateTime> _CreateDate;
private string _ContractorShortName;
public View_EMC_Punishment()
{
}
@ -30157,6 +30472,22 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
public string ContractorShortName
{
get
{
return this._ContractorShortName;
}
set
{
if ((this._ContractorShortName != value))
{
this._ContractorShortName = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_EMC_Que_Punishment")]
@ -31311,6 +31642,8 @@ namespace Model
private System.Nullable<bool> _IsExport;
private string _ContractorShortName;
public View_FC_ContractManagement()
{
}
@ -31570,6 +31903,22 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
public string ContractorShortName
{
get
{
return this._ContractorShortName;
}
set
{
if ((this._ContractorShortName != value))
{
this._ContractorShortName = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_FC_ContractManagementLists")]
@ -32025,6 +32374,12 @@ namespace Model
private System.Nullable<System.DateTime> _Expire_Date;
private System.Nullable<System.DateTime> _Validate_Date;
private string _ContractorShortName;
private string _Discipline;
public View_FC_Contractor()
{
}
@ -32092,6 +32447,54 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Validate_Date", DbType="DateTime")]
public System.Nullable<System.DateTime> Validate_Date
{
get
{
return this._Validate_Date;
}
set
{
if ((this._Validate_Date != value))
{
this._Validate_Date = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorShortName", DbType="NVarChar(50)")]
public string ContractorShortName
{
get
{
return this._ContractorShortName;
}
set
{
if ((this._ContractorShortName != value))
{
this._ContractorShortName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Discipline", DbType="NVarChar(1000)")]
public string Discipline
{
get
{
return this._Discipline;
}
set
{
if ((this._Discipline != value))
{
this._Discipline = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_FC_Report")]