diff --git a/CreateModel.bat b/CreateModel.bat index 27ceb4a..2f27853 100644 --- a/CreateModel.bat +++ b/CreateModel.bat @@ -25,9 +25,9 @@ REM -------------- @echo 设置.net控制台环境 @echo. -@call "%VS150%" +@call "%VS100COMNTOOLS%"vsvars32.bat -SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO 完成 pause diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index b0ba3e1..0cfe071 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index a0678ec..096d770 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -29,6 +29,10 @@ namespace Model #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnCreated(); + partial void OnCreated() + { + this.CommandTimeout = 600; + } partial void InsertAttachFile(AttachFile instance); partial void UpdateAttachFile(AttachFile instance); partial void DeleteAttachFile(AttachFile instance); @@ -22488,12 +22492,12 @@ namespace Model private string _DetectionStandard; + private string _Tabler; + private string _Remark; private System.Nullable _CreatedTime; - private string _Tabler; - #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -22512,12 +22516,12 @@ namespace Model partial void OnUnitIdChanged(); partial void OnDetectionStandardChanging(string value); partial void OnDetectionStandardChanged(); + partial void OnTablerChanging(string value); + partial void OnTablerChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); partial void OnCreatedTimeChanging(System.Nullable value); partial void OnCreatedTimeChanged(); - partial void OnTablerChanging(string value); - partial void OnTablerChanged(); #endregion public PMI_Delegation() @@ -22585,7 +22589,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] public string ProjectId { get @@ -22665,6 +22669,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")] + public string Tabler + { + get + { + return this._Tabler; + } + set + { + if ((this._Tabler != value)) + { + this.OnTablerChanging(value); + this.SendPropertyChanging(); + this._Tabler = value; + this.SendPropertyChanged("Tabler"); + this.OnTablerChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")] public string Remark { @@ -22705,26 +22729,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")] - public string Tabler - { - get - { - return this._Tabler; - } - set - { - if ((this._Tabler != value)) - { - this.OnTablerChanging(value); - this.SendPropertyChanging(); - this._Tabler = value; - this.SendPropertyChanged("Tabler"); - this.OnTablerChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -22764,10 +22768,10 @@ namespace Model private int _Status; - private string _ReportNo; - private System.Nullable _CheckTime; + private string _ReportNo; + private System.Nullable _ReportTime; #region 鍙墿灞曟ф柟娉曞畾涔 @@ -22786,10 +22790,10 @@ namespace Model partial void OnAcceptanceChanged(); partial void OnStatusChanging(int value); partial void OnStatusChanged(); - partial void OnReportNoChanging(string value); - partial void OnReportNoChanged(); partial void OnCheckTimeChanging(System.Nullable value); partial void OnCheckTimeChanged(); + partial void OnReportNoChanging(string value); + partial void OnReportNoChanged(); partial void OnReportTimeChanging(System.Nullable value); partial void OnReportTimeChanged(); #endregion @@ -22899,7 +22903,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")] public int Status { get @@ -22919,26 +22923,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")] - public string ReportNo - { - get - { - return this._ReportNo; - } - set - { - if ((this._ReportNo != value)) - { - this.OnReportNoChanging(value); - this.SendPropertyChanging(); - this._ReportNo = value; - this.SendPropertyChanged("ReportNo"); - this.OnReportNoChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")] public System.Nullable CheckTime { @@ -22959,6 +22943,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")] + public string ReportNo + { + get + { + return this._ReportNo; + } + set + { + if ((this._ReportNo != value)) + { + this.OnReportNoChanging(value); + this.SendPropertyChanging(); + this._ReportNo = value; + this.SendPropertyChanged("ReportNo"); + this.OnReportNoChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")] public System.Nullable ReportTime { @@ -38671,8 +38675,6 @@ namespace Model private string _ProjectId; - private System.Nullable _IsPMI; - private string _PipelineCode; private string _PipelineId; @@ -38803,22 +38805,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")] - public System.Nullable IsPMI - { - get - { - return this._IsPMI; - } - set - { - if ((this._IsPMI != value)) - { - this._IsPMI = value; - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] public string PipelineCode { @@ -40827,6 +40813,8 @@ namespace Model private string _PipingClassCode; + private string _PIPClassCode; + private string _WeldingDate; private System.Nullable _IsCancel; @@ -41935,6 +41923,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")] + public string PIPClassCode + { + get + { + return this._PIPClassCode; + } + set + { + if ((this._PIPClassCode != value)) + { + this._PIPClassCode = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")] public string WeldingDate { @@ -46610,7 +46614,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="VarChar(1000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string WelderIds { get