diff --git a/DataBase/版本日志/SGGLDB_V2025-07-18-001-gaofei.sql b/DataBase/版本日志/SGGLDB_V2025-07-18-001-gaofei.sql
new file mode 100644
index 00000000..290e0ce2
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-07-18-001-gaofei.sql
@@ -0,0 +1,44 @@
+alter table Information_MillionsMonthlyReport add KeyWorkNum int null
+alter table Information_MillionsMonthlyReport add KeyWorkOKNum int null
+alter table Information_MillionsMonthlyReport add KeyWorkOKRate nvarchar(20) null
+GO
+
+
+/*************ҵʱȫͳ±**************/
+ALTER VIEW [dbo].[View_Information_MillionsMonthlyReport]
+AS
+SELECT
+Report.MillionsMonthlyReportId,
+Report.UnitId,
+Report.FillingDate,
+Report.UpState,
+(ISNULL(Group_0008.ConstText,'-') + ISNULL(Group_0009.ConstText,'-')) AS ReportDate,
+Group_0008.ConstText as YearStr,
+Group_0009.ConstText as MonthStr,
+U.UnitName,
+Report.Year,
+Report.Month,
+Report.DutyPerson,
+Report.RecordableIncidentRate,
+Report.LostTimeRate,
+Report.LostTimeInjuryRate,
+Report.DeathAccidentFrequency,
+Report.AccidentMortality,
+Report.HandleState,
+Report.KeyWorkNum,
+Report.KeyWorkOKNum,
+Report.KeyWorkOKRate,
+Report.HandleMan,
+US.PersonName AS UserName
+FROM dbo.Information_MillionsMonthlyReport AS Report
+LEFT JOIN Base_Unit AS U ON U.UnitId=Report.UnitId
+LEFT JOIN Sys_Const AS Group_0008 ON Group_0008.GroupId='0008' AND Group_0008.ConstValue =Report.[Year]
+LEFT JOIN Sys_Const AS Group_0009 ON Group_0009.GroupId='0009' AND Group_0009.ConstValue =Report.[Month]
+LEFT JOIN Person_Persons AS US ON US.PersonId=Report.HandleMan
+
+
+
+GO
+
+
+
diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
index dc79d0a5..2f314f9b 100644
--- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
@@ -100,7 +100,7 @@
UnitId = x.UnitId,
Year = x.Year,
Month = x.Month,
- FillingMan = x.FillingMan,
+ FillingMan = x.FillingMan + "|" + (x.KeyWorkNum ?? 0).ToString() + "|" + (x.KeyWorkOKNum ?? 0).ToString() + "|" + (x.KeyWorkOKRate ?? ""),
FillingDate = x.FillingDate,
DutyPerson = x.DutyPerson,
RecordableIncidentRate = x.RecordableIncidentRate,
diff --git a/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportService.cs b/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportService.cs
index a807d8fa..b19cb2fa 100644
--- a/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportService.cs
+++ b/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportService.cs
@@ -73,6 +73,9 @@ namespace BLL
BreakGroundLicenseNum = MillionsMonthlyReport.BreakGroundLicenseNum,
ElectricityLicenseNum = MillionsMonthlyReport.ElectricityLicenseNum,
RTLicenseNum = MillionsMonthlyReport.RTLicenseNum,
+ KeyWorkNum = MillionsMonthlyReport.KeyWorkNum,
+ KeyWorkOKNum = MillionsMonthlyReport.KeyWorkOKNum,
+ KeyWorkOKRate = MillionsMonthlyReport.KeyWorkOKRate,
NightLicenseNum = MillionsMonthlyReport.NightLicenseNum,
CommissionerNum = MillionsMonthlyReport.CommissionerNum,
SoleDutyNum = MillionsMonthlyReport.SoleDutyNum,
@@ -120,6 +123,9 @@ namespace BLL
newMillionsMonthlyReport.NightLicenseNum = MillionsMonthlyReport.NightLicenseNum;
newMillionsMonthlyReport.CommissionerNum = MillionsMonthlyReport.CommissionerNum;
newMillionsMonthlyReport.SoleDutyNum = MillionsMonthlyReport.SoleDutyNum;
+ newMillionsMonthlyReport.KeyWorkNum = MillionsMonthlyReport.KeyWorkNum;
+ newMillionsMonthlyReport.KeyWorkOKNum = MillionsMonthlyReport.KeyWorkOKNum;
+ newMillionsMonthlyReport.KeyWorkOKRate = MillionsMonthlyReport.KeyWorkOKRate;
Funs.DB.SubmitChanges();
}
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
index 76edd217..8b4822c9 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
@@ -110,6 +110,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
x.SeriousInjuriesPersonNum ?? 0);
yearTotalItem.SeriousInjuriesLossHour = yearSumItems.Sum(x => x.SeriousInjuriesLossHour ?? 0);
yearTotalItem.MinorAccidentNum = yearSumItems.Sum(x => x.MinorAccidentNum ?? 0);
- yearTotalItem.MinorAccidentPersonNum = yearSumItems.Sum(x => x.MinorAccidentPersonNum ?? 0);
+ yearTotalItem.MinorAccidentPersonNum = yearSumItems.Sum(x => x.MinorAccidentPersonNum ?? 0);
yearTotalItem.MinorAccidentLossHour = yearSumItems.Sum(x => x.MinorAccidentLossHour ?? 0);
yearTotalItem.DeathAccidentNum = yearSumItems.Sum(x => x.DeathAccidentNum ?? 0);
yearTotalItem.DeathAccidentPersonNum = yearSumItems.Sum(x => x.DeathAccidentPersonNum ?? 0);
@@ -140,7 +158,7 @@ namespace FineUIPro.Web.ZHGL.Information
Grid1.Rows[Grid1.Rows.Count - 1].Values[0] = "";
Grid1.Rows[Grid1.Rows.Count - 1].Values[1] = "";
}
- var report2 = from x in Funs.DB.Information_MillionsMonthlyReport where x.MillionsMonthlyReportId== report.MillionsMonthlyReportId select x;
+ var report2 = from x in Funs.DB.Information_MillionsMonthlyReport where x.MillionsMonthlyReportId == report.MillionsMonthlyReportId select x;
Grid2.DataSource = report2;
Grid2.DataBind();
}
@@ -220,10 +238,10 @@ namespace FineUIPro.Web.ZHGL.Information
{
this.btnDelete.Hidden = false;
}
- if (buttonList.Contains(BLL.Const.BtnIn))
- {
- this.btnImport.Hidden = false;
- }
+ //if (buttonList.Contains(BLL.Const.BtnIn))
+ //{
+ // this.btnImport.Hidden = false;
+ //}
if (buttonList.Contains(BLL.Const.BtnPrint))
{
this.btnPrint.Hidden = false;
@@ -733,13 +751,13 @@ namespace FineUIPro.Web.ZHGL.Information
var millionsMonthlyReport = Funs.DB.InformationProject_MillionsMonthlyReport.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.Year == date.Year && x.Month == date.Month);
if (millionsMonthlyReport == null)
{
- info += item.ProjectCode + ":" + item.ProjectName + "，未填写报表；";
+ info += /*item.ProjectCode + ":" +*/ item.ProjectName + "，未填写报表；";
}
else
{
if (millionsMonthlyReport.States != BLL.Const.State_2)
{
- info += item.ProjectCode + ":" + item.ProjectName + "报表未报；";
+ info += /*item.ProjectCode + ":" +*/ item.ProjectName + "报表未报；";
var flows = (from x in Funs.DB.Sys_FlowOperate
join y in Funs.DB.Person_Persons on x.OperaterId equals y.PersonId
where x.DataId == millionsMonthlyReport.MillionsMonthlyReportId && x.IsClosed != false
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.designer.cs
index 5fed1df2..78bf5a62 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.designer.cs
@@ -300,6 +300,51 @@ namespace FineUIPro.Web.ZHGL.Information {
///
protected global::FineUIPro.Label lbAccidentMortality;
+ ///
+ /// txtKeyWorkNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtKeyWorkNum;
+
+ ///
+ /// txtKeyWorkOKNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtKeyWorkOKNum;
+
+ ///
+ /// txtKeyWorkOKRate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtKeyWorkOKRate;
+
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label1;
+
+ ///
+ /// Label2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label2;
+
///
/// Grid1 控件。
///
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
index ba151b90..bbcc04b7 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
@@ -23,11 +23,11 @@
-
+
-
+
@@ -172,6 +172,7 @@
+
@@ -184,6 +185,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
index 3aaebf90..94e78862 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
@@ -176,6 +176,18 @@ namespace FineUIPro.Web.ZHGL.Information
{
this.txtSoleDutyNum.Text = Convert.ToString(report.SoleDutyNum);
}
+ if (report.KeyWorkNum != null)
+ {
+ this.txtKeyWorkNum.Text = report.KeyWorkNum.ToString();
+ }
+ if (report.KeyWorkOKNum != null)
+ {
+ this.txtKeyWorkOKNum.Text = report.KeyWorkOKNum.ToString();
+ }
+ if (!string.IsNullOrEmpty(report.KeyWorkOKRate))
+ {
+ this.txtKeyWorkOKRate.Text = report.KeyWorkOKRate;
+ }
}
}
else
@@ -276,6 +288,9 @@ namespace FineUIPro.Web.ZHGL.Information
report.NightLicenseNum = Funs.GetNewInt(this.txtNightLicenseNum.Text.Trim());
report.CommissionerNum = Funs.GetNewInt(this.txtCommissionerNum.Text.Trim());
report.SoleDutyNum = Funs.GetNewInt(this.txtSoleDutyNum.Text.Trim());
+ report.KeyWorkNum = Funs.GetNewIntOrZero(this.txtKeyWorkNum.Text.Trim());
+ report.KeyWorkOKNum = Funs.GetNewIntOrZero(this.txtKeyWorkOKNum.Text.Trim());
+ report.KeyWorkOKRate = this.txtKeyWorkOKRate.Text.Trim();
if (String.IsNullOrEmpty(MillionsMonthlyReportId))
{
Information_MillionsMonthlyReport old = MillionsMonthlyReportService.GetMillionsMonthlyReportByUnitIdDate(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue));
@@ -329,6 +344,7 @@ namespace FineUIPro.Web.ZHGL.Information
string code = CNCECHSSEWebService.UpMillionsMonthlyReport(report.MillionsMonthlyReportId, this.CurrUser);
if (code == "1")
{
+ //WorkflowTodoitemsService.DoneWorkflow_TodoItems(report.MillionsMonthlyReportId, this.CurrUser.UserId);//完成当前人待办
ShowNotify("同步成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
@@ -892,7 +908,7 @@ namespace FineUIPro.Web.ZHGL.Information
};
items.Add(item2);
var projects = (from x in Funs.DB.Base_Project
- where projectIds.Contains(x.ProjectId)
+ where projectIds.Contains(x.ProjectId)
select x).ToList();
if (this.CurrUser.UnitId == BLL.Const.UnitId_SEDIN)
@@ -1253,5 +1269,17 @@ namespace FineUIPro.Web.ZHGL.Information
}
}
#endregion
+
+ protected void txtKeyWorkNum_TextChanged(object sender, EventArgs e)
+ {
+ decimal keyWorkNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkNum.Text.Trim());
+ decimal keyWorkOKNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkOKNum.Text.Trim());
+ string rate = string.Empty;
+ if (keyWorkNum > 0)
+ {
+ rate = (decimal.Round(keyWorkOKNum / keyWorkNum, 4) * 100).ToString("0.##") + "%";
+ }
+ this.txtKeyWorkOKRate.Text = rate;
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs
index 08fc7c78..7fea4761 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs
@@ -381,6 +381,51 @@ namespace FineUIPro.Web.ZHGL.Information {
///
protected global::FineUIPro.NumberBox txtSoleDutyNum;
+ ///
+ /// GroupPanel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.GroupPanel GroupPanel1;
+
+ ///
+ /// Form2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form Form2;
+
+ ///
+ /// txtKeyWorkNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtKeyWorkNum;
+
+ ///
+ /// txtKeyWorkOKNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtKeyWorkOKNum;
+
+ ///
+ /// txtKeyWorkOKRate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtKeyWorkOKRate;
+
///
/// Grid1 控件。
///
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 909e0cc9..a13f2baa 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -12229,7 +12229,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
public string ApproveIdea
{
get
@@ -97580,10 +97580,10 @@ namespace Model
private string _TrainNumber;
- private string _TrainNumberId;
-
private System.Nullable _TypeInt;
+ private string _TrainNumberId;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -97612,10 +97612,10 @@ namespace Model
partial void OnReceiveDateChanged();
partial void OnTrainNumberChanging(string value);
partial void OnTrainNumberChanged();
- partial void OnTrainNumberIdChanging(string value);
- partial void OnTrainNumberIdChanged();
partial void OnTypeIntChanging(System.Nullable value);
partial void OnTypeIntChanged();
+ partial void OnTrainNumberIdChanging(string value);
+ partial void OnTrainNumberIdChanged();
#endregion
public HJGL_PackagingManage()
@@ -97863,26 +97863,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")]
- public string TrainNumberId
- {
- get
- {
- return this._TrainNumberId;
- }
- set
- {
- if ((this._TrainNumberId != value))
- {
- this.OnTrainNumberIdChanging(value);
- this.SendPropertyChanging();
- this._TrainNumberId = value;
- this.SendPropertyChanged("TrainNumberId");
- this.OnTrainNumberIdChanged();
- }
- }
- }
-
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
public System.Nullable TypeInt
{
@@ -97903,6 +97883,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")]
+ public string TrainNumberId
+ {
+ get
+ {
+ return this._TrainNumberId;
+ }
+ set
+ {
+ if ((this._TrainNumberId != value))
+ {
+ this.OnTrainNumberIdChanging(value);
+ this.SendPropertyChanging();
+ this._TrainNumberId = value;
+ this.SendPropertyChanged("TrainNumberId");
+ this.OnTrainNumberIdChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -108994,7 +108994,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")]
public string Rectification
{
get
@@ -109120,7 +109120,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(500)")]
public string Measures
{
get
@@ -122926,6 +122926,12 @@ namespace Model
private System.Nullable _SoleDutyNum;
+ private System.Nullable _KeyWorkNum;
+
+ private System.Nullable _KeyWorkOKNum;
+
+ private string _KeyWorkOKRate;
+
private EntityRef _Base_Unit;
private EntitySet _Information_MillionsMonthlyReportItem;
@@ -122996,6 +123002,12 @@ namespace Model
partial void OnCommissionerNumChanged();
partial void OnSoleDutyNumChanging(System.Nullable value);
partial void OnSoleDutyNumChanged();
+ partial void OnKeyWorkNumChanging(System.Nullable value);
+ partial void OnKeyWorkNumChanged();
+ partial void OnKeyWorkOKNumChanging(System.Nullable value);
+ partial void OnKeyWorkOKNumChanged();
+ partial void OnKeyWorkOKRateChanging(string value);
+ partial void OnKeyWorkOKRateChanged();
#endregion
public Information_MillionsMonthlyReport()
@@ -123629,6 +123641,66 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")]
+ public System.Nullable KeyWorkNum
+ {
+ get
+ {
+ return this._KeyWorkNum;
+ }
+ set
+ {
+ if ((this._KeyWorkNum != value))
+ {
+ this.OnKeyWorkNumChanging(value);
+ this.SendPropertyChanging();
+ this._KeyWorkNum = value;
+ this.SendPropertyChanged("KeyWorkNum");
+ this.OnKeyWorkNumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")]
+ public System.Nullable KeyWorkOKNum
+ {
+ get
+ {
+ return this._KeyWorkOKNum;
+ }
+ set
+ {
+ if ((this._KeyWorkOKNum != value))
+ {
+ this.OnKeyWorkOKNumChanging(value);
+ this.SendPropertyChanging();
+ this._KeyWorkOKNum = value;
+ this.SendPropertyChanged("KeyWorkOKNum");
+ this.OnKeyWorkOKNumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")]
+ public string KeyWorkOKRate
+ {
+ get
+ {
+ return this._KeyWorkOKRate;
+ }
+ set
+ {
+ if ((this._KeyWorkOKRate != value))
+ {
+ this.OnKeyWorkOKRateChanging(value);
+ this.SendPropertyChanging();
+ this._KeyWorkOKRate = value;
+ this.SendPropertyChanged("KeyWorkOKRate");
+ this.OnKeyWorkOKRateChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_MillionsMonthlyReport_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
public Base_Unit Base_Unit
{
@@ -161763,7 +161835,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
public string AttentPerson
{
get
@@ -192746,7 +192818,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string ProjectDescription
{
get
@@ -192866,7 +192938,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string CalculationRule
{
get
@@ -192926,7 +192998,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
public string ConstructionSubcontractor
{
get
@@ -193310,7 +193382,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
public System.Nullable WorkPackageEstimate
{
get
@@ -193615,6 +193687,16 @@ namespace Model
private string _ProjectId;
+ private string _ContractId;
+
+ private string _OrderCode;
+
+ private System.Nullable _OrderInDate;
+
+ private System.Nullable _OrderOutDate;
+
+ private string _MaterialRequisitionUnit;
+
private System.Nullable _State;
private string _InvoiceCode;
@@ -193643,16 +193725,6 @@ namespace Model
private string _CreateUser;
- private string _ContractId;
-
- private System.Nullable _OrderInDate;
-
- private string _OrderCode;
-
- private System.Nullable _OrderOutDate;
-
- private string _MaterialRequisitionUnit;
-
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -193661,6 +193733,16 @@ namespace Model
partial void OnInvoiceIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
+ partial void OnContractIdChanging(string value);
+ partial void OnContractIdChanged();
+ partial void OnOrderCodeChanging(string value);
+ partial void OnOrderCodeChanged();
+ partial void OnOrderInDateChanging(System.Nullable value);
+ partial void OnOrderInDateChanged();
+ partial void OnOrderOutDateChanging(System.Nullable value);
+ partial void OnOrderOutDateChanged();
+ partial void OnMaterialRequisitionUnitChanging(string value);
+ partial void OnMaterialRequisitionUnitChanged();
partial void OnStateChanging(System.Nullable value);
partial void OnStateChanged();
partial void OnInvoiceCodeChanging(string value);
@@ -193689,16 +193771,6 @@ namespace Model
partial void OnCreateDateChanged();
partial void OnCreateUserChanging(string value);
partial void OnCreateUserChanged();
- partial void OnContractIdChanging(string value);
- partial void OnContractIdChanged();
- partial void OnOrderInDateChanging(System.Nullable value);
- partial void OnOrderInDateChanged();
- partial void OnOrderCodeChanging(string value);
- partial void OnOrderCodeChanged();
- partial void OnOrderOutDateChanging(System.Nullable value);
- partial void OnOrderOutDateChanged();
- partial void OnMaterialRequisitionUnitChanging(string value);
- partial void OnMaterialRequisitionUnitChanged();
#endregion
public PHTGL_Invoice()
@@ -193746,6 +193818,106 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
+ public string ContractId
+ {
+ get
+ {
+ return this._ContractId;
+ }
+ set
+ {
+ if ((this._ContractId != value))
+ {
+ this.OnContractIdChanging(value);
+ this.SendPropertyChanging();
+ this._ContractId = value;
+ this.SendPropertyChanged("ContractId");
+ this.OnContractIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
+ public string OrderCode
+ {
+ get
+ {
+ return this._OrderCode;
+ }
+ set
+ {
+ if ((this._OrderCode != value))
+ {
+ this.OnOrderCodeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderCode = value;
+ this.SendPropertyChanged("OrderCode");
+ this.OnOrderCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
+ public System.Nullable OrderInDate
+ {
+ get
+ {
+ return this._OrderInDate;
+ }
+ set
+ {
+ if ((this._OrderInDate != value))
+ {
+ this.OnOrderInDateChanging(value);
+ this.SendPropertyChanging();
+ this._OrderInDate = value;
+ this.SendPropertyChanged("OrderInDate");
+ this.OnOrderInDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
+ public System.Nullable OrderOutDate
+ {
+ get
+ {
+ return this._OrderOutDate;
+ }
+ set
+ {
+ if ((this._OrderOutDate != value))
+ {
+ this.OnOrderOutDateChanging(value);
+ this.SendPropertyChanging();
+ this._OrderOutDate = value;
+ this.SendPropertyChanged("OrderOutDate");
+ this.OnOrderOutDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
+ public string MaterialRequisitionUnit
+ {
+ get
+ {
+ return this._MaterialRequisitionUnit;
+ }
+ set
+ {
+ if ((this._MaterialRequisitionUnit != value))
+ {
+ this.OnMaterialRequisitionUnitChanging(value);
+ this.SendPropertyChanging();
+ this._MaterialRequisitionUnit = value;
+ this.SendPropertyChanged("MaterialRequisitionUnit");
+ this.OnMaterialRequisitionUnitChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
public System.Nullable State
{
@@ -194026,106 +194198,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
- public string ContractId
- {
- get
- {
- return this._ContractId;
- }
- set
- {
- if ((this._ContractId != value))
- {
- this.OnContractIdChanging(value);
- this.SendPropertyChanging();
- this._ContractId = value;
- this.SendPropertyChanged("ContractId");
- this.OnContractIdChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
- public System.Nullable OrderInDate
- {
- get
- {
- return this._OrderInDate;
- }
- set
- {
- if ((this._OrderInDate != value))
- {
- this.OnOrderInDateChanging(value);
- this.SendPropertyChanging();
- this._OrderInDate = value;
- this.SendPropertyChanged("OrderInDate");
- this.OnOrderInDateChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
- public string OrderCode
- {
- get
- {
- return this._OrderCode;
- }
- set
- {
- if ((this._OrderCode != value))
- {
- this.OnOrderCodeChanging(value);
- this.SendPropertyChanging();
- this._OrderCode = value;
- this.SendPropertyChanged("OrderCode");
- this.OnOrderCodeChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
- public System.Nullable OrderOutDate
- {
- get
- {
- return this._OrderOutDate;
- }
- set
- {
- if ((this._OrderOutDate != value))
- {
- this.OnOrderOutDateChanging(value);
- this.SendPropertyChanging();
- this._OrderOutDate = value;
- this.SendPropertyChanged("OrderOutDate");
- this.OnOrderOutDateChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
- public string MaterialRequisitionUnit
- {
- get
- {
- return this._MaterialRequisitionUnit;
- }
- set
- {
- if ((this._MaterialRequisitionUnit != value))
- {
- this.OnMaterialRequisitionUnitChanging(value);
- this.SendPropertyChanging();
- this._MaterialRequisitionUnit = value;
- this.SendPropertyChanged("MaterialRequisitionUnit");
- this.OnMaterialRequisitionUnitChanged();
- }
- }
- }
-
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -298705,6 +298777,12 @@ namespace Model
private string _HandleState;
+ private System.Nullable _KeyWorkNum;
+
+ private System.Nullable _KeyWorkOKNum;
+
+ private string _KeyWorkOKRate;
+
private string _HandleMan;
private string _UserName;
@@ -298985,6 +299063,54 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")]
+ public System.Nullable KeyWorkNum
+ {
+ get
+ {
+ return this._KeyWorkNum;
+ }
+ set
+ {
+ if ((this._KeyWorkNum != value))
+ {
+ this._KeyWorkNum = value;
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")]
+ public System.Nullable KeyWorkOKNum
+ {
+ get
+ {
+ return this._KeyWorkOKNum;
+ }
+ set
+ {
+ if ((this._KeyWorkOKNum != value))
+ {
+ this._KeyWorkOKNum = value;
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")]
+ public string KeyWorkOKRate
+ {
+ get
+ {
+ return this._KeyWorkOKRate;
+ }
+ set
+ {
+ if ((this._KeyWorkOKRate != value))
+ {
+ this._KeyWorkOKRate = value;
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleMan", DbType="NVarChar(50)")]
public string HandleMan
{
@@ -313127,7 +313253,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
public string Name
{
get
@@ -313704,7 +313830,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@@ -313895,7 +314021,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@@ -319234,7 +319360,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@@ -320706,7 +320832,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@@ -330257,7 +330383,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
public string ContractNo
{
get
@@ -330277,7 +330403,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
public string UnitWorks
{
get