diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 99cbab9..9912fe6 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/File/Excel/试压包导入模版.xlsx b/HJGL/FineUIPro.Web/File/Excel/试压包导入模版.xlsx index e7d4a46..1ab7ef0 100644 Binary files a/HJGL/FineUIPro.Web/File/Excel/试压包导入模版.xlsx and b/HJGL/FineUIPro.Web/File/Excel/试压包导入模版.xlsx differ diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index bfa1a42..bd40617 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -22499,12 +22499,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); @@ -22523,12 +22523,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() @@ -22596,7 +22596,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 @@ -22676,6 +22676,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 { @@ -22716,26 +22736,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; @@ -22775,10 +22775,10 @@ namespace Model private int _Status; - private string _ReportNo; - private System.Nullable _CheckTime; + private string _ReportNo; + private System.Nullable _ReportTime; #region 可扩展性方法定义 @@ -22797,10 +22797,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 @@ -22910,7 +22910,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 @@ -22930,26 +22930,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 { @@ -22970,6 +22950,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 { @@ -39146,8 +39146,6 @@ namespace Model private string _ProjectId; - private System.Nullable _IsPMI; - private string _PipelineCode; private string _PipelineId; @@ -39278,22 +39276,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 { @@ -41302,6 +41284,8 @@ namespace Model private string _PipingClassCode; + private string _PIPClassCode; + private string _WeldingDate; private System.Nullable _IsCancel; @@ -41316,8 +41300,6 @@ namespace Model private string _DetectionType; - private string _PIPClassCode; - private string _PageNum; public View_Pipeline_WeldJoint() @@ -42412,6 +42394,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 { @@ -42524,22 +42522,6 @@ 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="_PageNum", DbType="NVarChar(10)")] public string PageNum { @@ -47103,7 +47085,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