diff --git a/SQL/WSDP_template.7.13.sql b/SQL/WSDP_template.7.13.sql index ff8387dd..3807d510 100644 --- a/SQL/WSDP_template.7.13.sql +++ b/SQL/WSDP_template.7.13.sql @@ -3,7 +3,8 @@ PRINT N'Creating [dbo].[WasteDisposalServiceProvider_template]...'; GO CREATE TABLE [dbo].[WasteDisposalServiceProvider_template] ( [Id] UNIQUEIDENTIFIER NOT NULL, - [WasteDisposalServiceProviderName] NVARCHAR (50) NULL, + [WasteDisposalServiceProviderName] NVARCHAR (100) NULL, + [Remark] NVARCHAR (256) NULL, [Created] DATETIME NULL DEFAULT CURRENT_TIMESTAMP, [Changed] DATETIME NULL, PRIMARY KEY CLUSTERED ([Id] ASC) diff --git a/bsmd.database/WasteDisposalServiceProvider_Template.cs b/bsmd.database/WasteDisposalServiceProvider_Template.cs index dd508c3c..ec05ef00 100644 --- a/bsmd.database/WasteDisposalServiceProvider_Template.cs +++ b/bsmd.database/WasteDisposalServiceProvider_Template.cs @@ -5,9 +5,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace bsmd.database { @@ -28,6 +25,9 @@ namespace bsmd.database [MaxLength(99)] public string WasteDisposalServiceProviderName { get; set; } + [MaxLength(255)] + public string Remark { get; set; } + #endregion #region DatabaseEntity implementation @@ -40,7 +40,8 @@ namespace bsmd.database { WasteDisposalServiceProvider_Template wdsp_t = new WasteDisposalServiceProvider_Template(); wdsp_t.id = reader.GetGuid(0); - if (!reader.IsDBNull(1)) wdsp_t.WasteDisposalServiceProviderName = reader.GetString(1); + if (!reader.IsDBNull(1)) wdsp_t.WasteDisposalServiceProviderName = reader.GetString(1); + if (!reader.IsDBNull(2)) wdsp_t.Remark = reader.GetString(2); result.Add(wdsp_t); } @@ -50,7 +51,7 @@ namespace bsmd.database public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria) { - cmd.CommandText = string.Format("SELECT Id, WasteDisposalServiceProviderName FROM {0} ", this.Tablename); + cmd.CommandText = string.Format("SELECT Id, WasteDisposalServiceProviderName, Remark FROM {0} ", this.Tablename); } public override void PrepareSave(IDbCommand cmd) @@ -59,20 +60,37 @@ namespace bsmd.database if (!this.WasteDisposalServiceProviderName.IsNullOrEmpty()) scmd.Parameters.AddWithValue("@P1", this.WasteDisposalServiceProviderName); else scmd.Parameters.AddWithValue("@P1", DBNull.Value); + if (!this.Remark.IsNullOrEmpty()) scmd.Parameters.AddWithValue("@P2", this.Remark); + else scmd.Parameters.AddWithValue("@P2", DBNull.Value); if (this.IsNew) { this.CreateId(); scmd.Parameters.AddWithValue("@ID", this.Id); - cmd.CommandText = string.Format("INSERT INTO {0} (Id, WasteDisposalServiceProviderName) VALUES (@ID, @P1)", this.Tablename); + cmd.CommandText = string.Format("INSERT INTO {0} (Id, WasteDisposalServiceProviderName, Remark) VALUES (@ID, @P1, @P2)", this.Tablename); } else { - cmd.CommandText = string.Format("UPDATE {0} SET WasteDisposalServiceProviderName = @P1 WHERE Id = @ID", this.Tablename); + cmd.CommandText = string.Format("UPDATE {0} SET WasteDisposalServiceProviderName = @P1, Remark = @P2 WHERE Id = @ID", this.Tablename); scmd.Parameters.AddWithValue("@ID", this.Id); } } + protected override DatabaseEntityAsync ReadRowFromReader(IDataReader reader) + { + WasteDisposalServiceProvider_Template wdsp_t = null; + + if (reader != null) + { + wdsp_t = new WasteDisposalServiceProvider_Template(); + wdsp_t.id = reader.GetGuid(0); + if (!reader.IsDBNull(1)) wdsp_t.WasteDisposalServiceProviderName = reader.GetString(1); + if (!reader.IsDBNull(2)) wdsp_t.Remark = reader.GetString(2); + } + + return wdsp_t; + } + #endregion #region IComparable implementation @@ -84,20 +102,6 @@ namespace bsmd.database return 0; } - protected override DatabaseEntityAsync ReadRowFromReader(IDataReader reader) - { - WasteDisposalServiceProvider_Template wdsp_t = null; - - if(reader != null) - { - wdsp_t = new WasteDisposalServiceProvider_Template(); - wdsp_t.id = reader.GetGuid(0); - if (!reader.IsDBNull(1)) wdsp_t.WasteDisposalServiceProviderName = reader.GetString(1); - } - - return wdsp_t; - } - #endregion }