diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index e47cfd0..1963de0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 75e7396..1b5cc32 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 0baedd9..8d0cdf2 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ ProjectFiles - Release|Any CPU + Debug|Any CPU true diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index f550ed2..baa8804 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + @@ -51,7 +51,7 @@ - + diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index 8c4334e..85a5f76 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -29,10 +29,6 @@ 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); @@ -21304,7 +21300,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 @@ -21481,10 +21477,10 @@ namespace Model private string _Acceptance; - private System.Nullable _CreatedTime; - private int _Status; + private System.Nullable _CreatedTime; + private string _ReportNo; #region 可扩展性方法定义 @@ -21501,10 +21497,10 @@ namespace Model partial void OnQualityNoChanged(); partial void OnAcceptanceChanging(string value); partial void OnAcceptanceChanged(); - partial void OnCreatedTimeChanging(System.Nullable value); - partial void OnCreatedTimeChanged(); partial void OnStatusChanging(int value); partial void OnStatusChanged(); + partial void OnCreatedTimeChanging(System.Nullable value); + partial void OnCreatedTimeChanged(); partial void OnReportNoChanging(string value); partial void OnReportNoChanged(); #endregion @@ -21614,6 +21610,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")] + public int Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this.OnStatusChanging(value); + this.SendPropertyChanging(); + this._Status = value; + this.SendPropertyChanged("Status"); + this.OnStatusChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] public System.Nullable CreatedTime { @@ -21634,26 +21650,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")] - public int Status - { - get - { - return this._Status; - } - set - { - if ((this._Status != value)) - { - this.OnStatusChanging(value); - this.SendPropertyChanging(); - this._Status = value; - this.SendPropertyChanged("Status"); - this.OnStatusChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")] public string ReportNo { @@ -37294,8 +37290,6 @@ namespace Model private string _ProjectId; - private System.Nullable _IsPMI; - private string _PipelineCode; private string _PipelineId; @@ -37426,22 +37420,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 { @@ -39450,6 +39428,8 @@ namespace Model private string _PipingClassCode; + private string _PIPClassCode; + private string _WeldingDate; private System.Nullable _IsCancel; @@ -40558,6 +40538,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 { @@ -40711,6 +40707,8 @@ namespace Model private System.Nullable _DelegationDate; + private string _ReportNo; + private string _WeldJointCode; private string _PipelineCode; @@ -40885,6 +40883,22 @@ 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._ReportNo = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(50)")] public string WeldJointCode { diff --git a/HJGL/WebApi/WebApi.csproj.user b/HJGL/WebApi/WebApi.csproj.user index 33091aa..6db81e9 100644 --- a/HJGL/WebApi/WebApi.csproj.user +++ b/HJGL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU FolderProfile