From 3b9f18dd1715a12d9adc2733f75651c8ca563faf Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 25 Sep 2024 15:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HSSE/Hazard/ConstructionRiskEdit.aspx.cs | 2 +- SGGL/Model/Model.cs | 457 ++++++++++++++++++ 2 files changed, 458 insertions(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs index 8c0014a2..33d32e9a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs @@ -405,7 +405,7 @@ namespace FineUIPro.Web.HSSE.Hazard Model.HSSE_ConstructionRiskApprove approve1 = new Model.HSSE_ConstructionRiskApprove(); approve1.ConstructionRiskId = newConstructionRisk.ConstructionRiskId; approve1.ApproveMan = this.CurrUser.PersonId; - approve1.ApproveType = BLL.Const.MainPlan_Compile; + approve1.ApproveType = BLL.Const.ConstructionRisk_Compile; approve1.ApproveDate = DateTime.Now; BLL.ConstructionRiskApproveService.AddConstructionRiskApprove(approve1); Model.HSSE_ConstructionRiskApprove approve = new Model.HSSE_ConstructionRiskApprove(); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 6f9a5540..3c2ec958 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1679,6 +1679,9 @@ namespace Model partial void InsertTw_InOutPlanDetail(Tw_InOutPlanDetail instance); partial void UpdateTw_InOutPlanDetail(Tw_InOutPlanDetail instance); partial void DeleteTw_InOutPlanDetail(Tw_InOutPlanDetail instance); + partial void InsertTw_InOutPlanDetail_Relation(Tw_InOutPlanDetail_Relation instance); + partial void UpdateTw_InOutPlanDetail_Relation(Tw_InOutPlanDetail_Relation instance); + partial void DeleteTw_InOutPlanDetail_Relation(Tw_InOutPlanDetail_Relation instance); partial void InsertTw_InOutPlanMaster(Tw_InOutPlanMaster instance); partial void UpdateTw_InOutPlanMaster(Tw_InOutPlanMaster instance); partial void DeleteTw_InOutPlanMaster(Tw_InOutPlanMaster instance); @@ -6265,6 +6268,14 @@ namespace Model } } + public System.Data.Linq.Table Tw_InOutPlanDetail_Relation + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Tw_InOutPlanMaster { get @@ -95665,6 +95676,8 @@ namespace Model private string _PrefabricatedComponents; + private System.Nullable _IsLooseParts; + private EntityRef _HJGL_MaterialCodeLib; private EntityRef _HJGL_Pipeline; @@ -95683,6 +95696,8 @@ namespace Model partial void OnNumberChanged(); partial void OnPrefabricatedComponentsChanging(string value); partial void OnPrefabricatedComponentsChanged(); + partial void OnIsLoosePartsChanging(System.Nullable value); + partial void OnIsLoosePartsChanged(); #endregion public HJGL_PipeLineMat() @@ -95800,6 +95815,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLooseParts", DbType="Bit")] + public System.Nullable IsLooseParts + { + get + { + return this._IsLooseParts; + } + set + { + if ((this._IsLooseParts != value)) + { + this.OnIsLoosePartsChanging(value); + this.SendPropertyChanging(); + this._IsLooseParts = value; + this.SendPropertyChanged("IsLooseParts"); + this.OnIsLoosePartsChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PipeLineMat_HJGL_MaterialCodeLib", Storage="_HJGL_MaterialCodeLib", ThisKey="MaterialCode", OtherKey="MaterialCode", IsForeignKey=true)] public HJGL_MaterialCodeLib HJGL_MaterialCodeLib { @@ -257541,6 +257576,188 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Tw_InOutPlanDetail_Relation")] + public partial class Tw_InOutPlanDetail_Relation : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _PipelineId; + + private string _InOutPlanMasterId; + + private string _MaterialCode; + + private string _PrefabricatedComponents; + + private System.Nullable _Number; + + #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 OnPipelineIdChanging(string value); + partial void OnPipelineIdChanged(); + partial void OnInOutPlanMasterIdChanging(string value); + partial void OnInOutPlanMasterIdChanged(); + partial void OnMaterialCodeChanging(string value); + partial void OnMaterialCodeChanged(); + partial void OnPrefabricatedComponentsChanging(string value); + partial void OnPrefabricatedComponentsChanged(); + partial void OnNumberChanging(System.Nullable value); + partial void OnNumberChanged(); + #endregion + + public Tw_InOutPlanDetail_Relation() + { + 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="_PipelineId", DbType="NVarChar(50)")] + public string PipelineId + { + get + { + return this._PipelineId; + } + set + { + if ((this._PipelineId != value)) + { + this.OnPipelineIdChanging(value); + this.SendPropertyChanging(); + this._PipelineId = value; + this.SendPropertyChanged("PipelineId"); + this.OnPipelineIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InOutPlanMasterId", DbType="NVarChar(50)")] + public string InOutPlanMasterId + { + get + { + return this._InOutPlanMasterId; + } + set + { + if ((this._InOutPlanMasterId != value)) + { + this.OnInOutPlanMasterIdChanging(value); + this.SendPropertyChanging(); + this._InOutPlanMasterId = value; + this.SendPropertyChanged("InOutPlanMasterId"); + this.OnInOutPlanMasterIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] + public string MaterialCode + { + get + { + return this._MaterialCode; + } + set + { + if ((this._MaterialCode != value)) + { + this.OnMaterialCodeChanging(value); + this.SendPropertyChanging(); + this._MaterialCode = value; + this.SendPropertyChanged("MaterialCode"); + this.OnMaterialCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PrefabricatedComponents", DbType="NVarChar(100)")] + public string PrefabricatedComponents + { + get + { + return this._PrefabricatedComponents; + } + set + { + if ((this._PrefabricatedComponents != value)) + { + this.OnPrefabricatedComponentsChanging(value); + this.SendPropertyChanging(); + this._PrefabricatedComponents = value; + this.SendPropertyChanged("PrefabricatedComponents"); + this.OnPrefabricatedComponentsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Decimal(9,2)")] + public System.Nullable Number + { + get + { + return this._Number; + } + set + { + if ((this._Number != value)) + { + this.OnNumberChanging(value); + this.SendPropertyChanging(); + this._Number = value; + this.SendPropertyChanged("Number"); + this.OnNumberChanged(); + } + } + } + + 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.Tw_InOutPlanMaster")] public partial class Tw_InOutPlanMaster : INotifyPropertyChanging, INotifyPropertyChanged { @@ -257575,6 +257792,16 @@ namespace Model private System.Nullable _Category; + private string _AuditMan; + + private System.Nullable _AuditDate; + + private string _Remark; + + private string _AuditMan2; + + private System.Nullable _AuditDate2; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -257607,6 +257834,16 @@ namespace Model partial void OnReqUnitIdChanged(); partial void OnCategoryChanging(System.Nullable value); partial void OnCategoryChanged(); + partial void OnAuditManChanging(string value); + partial void OnAuditManChanged(); + partial void OnAuditDateChanging(System.Nullable value); + partial void OnAuditDateChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnAuditMan2Changing(string value); + partial void OnAuditMan2Changed(); + partial void OnAuditDate2Changing(System.Nullable value); + partial void OnAuditDate2Changed(); #endregion public Tw_InOutPlanMaster() @@ -257894,6 +258131,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")] + public string AuditMan + { + get + { + return this._AuditMan; + } + set + { + if ((this._AuditMan != value)) + { + this.OnAuditManChanging(value); + this.SendPropertyChanging(); + this._AuditMan = value; + this.SendPropertyChanged("AuditMan"); + this.OnAuditManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate", DbType="DateTime")] + public System.Nullable AuditDate + { + get + { + return this._AuditDate; + } + set + { + if ((this._AuditDate != value)) + { + this.OnAuditDateChanging(value); + this.SendPropertyChanging(); + this._AuditDate = value; + this.SendPropertyChanged("AuditDate"); + this.OnAuditDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan2", DbType="NVarChar(50)")] + public string AuditMan2 + { + get + { + return this._AuditMan2; + } + set + { + if ((this._AuditMan2 != value)) + { + this.OnAuditMan2Changing(value); + this.SendPropertyChanging(); + this._AuditMan2 = value; + this.SendPropertyChanged("AuditMan2"); + this.OnAuditMan2Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate2", DbType="DateTime")] + public System.Nullable AuditDate2 + { + get + { + return this._AuditDate2; + } + set + { + if ((this._AuditDate2 != value)) + { + this.OnAuditDate2Changing(value); + this.SendPropertyChanging(); + this._AuditDate2 = value; + this.SendPropertyChanged("AuditDate2"); + this.OnAuditDate2Changed(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -258127,6 +258464,12 @@ namespace Model private System.Nullable _Category; + private string _AuditMan; + + private System.Nullable _AuditDate; + + private string _Remark; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -258155,6 +258498,12 @@ namespace Model partial void OnReqUnitIdChanged(); partial void OnCategoryChanging(System.Nullable value); partial void OnCategoryChanged(); + partial void OnAuditManChanging(string value); + partial void OnAuditManChanged(); + partial void OnAuditDateChanging(System.Nullable value); + partial void OnAuditDateChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); #endregion public Tw_InputMaster() @@ -258402,6 +258751,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")] + public string AuditMan + { + get + { + return this._AuditMan; + } + set + { + if ((this._AuditMan != value)) + { + this.OnAuditManChanging(value); + this.SendPropertyChanging(); + this._AuditMan = value; + this.SendPropertyChanged("AuditMan"); + this.OnAuditManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate", DbType="DateTime")] + public System.Nullable AuditDate + { + get + { + return this._AuditDate; + } + set + { + if ((this._AuditDate != value)) + { + this.OnAuditDateChanging(value); + this.SendPropertyChanging(); + this._AuditDate = value; + this.SendPropertyChanged("AuditDate"); + this.OnAuditDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -258793,6 +259202,10 @@ namespace Model private System.Nullable _Category; + private string _AuditMan; + + private System.Nullable _AuditDate; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -258821,6 +259234,10 @@ namespace Model partial void OnReqUnitIdChanged(); partial void OnCategoryChanging(System.Nullable value); partial void OnCategoryChanged(); + partial void OnAuditManChanging(string value); + partial void OnAuditManChanged(); + partial void OnAuditDateChanging(System.Nullable value); + partial void OnAuditDateChanged(); #endregion public Tw_OutputMaster() @@ -259068,6 +259485,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")] + public string AuditMan + { + get + { + return this._AuditMan; + } + set + { + if ((this._AuditMan != value)) + { + this.OnAuditManChanging(value); + this.SendPropertyChanging(); + this._AuditMan = value; + this.SendPropertyChanged("AuditMan"); + this.OnAuditManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate", DbType="DateTime")] + public System.Nullable AuditDate + { + get + { + return this._AuditDate; + } + set + { + if ((this._AuditDate != value)) + { + this.OnAuditDateChanging(value); + this.SendPropertyChanging(); + this._AuditDate = value; + this.SendPropertyChanged("AuditDate"); + this.OnAuditDateChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;