diff --git a/web/App_Code/Model/Model.Context.cs b/web/App_Code/Model/Model.Context.cs index d4d20be..0e8b938 100644 --- a/web/App_Code/Model/Model.Context.cs +++ b/web/App_Code/Model/Model.Context.cs @@ -1,9 +1,9 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // -// 這個程式碼是由範本產生。 +// oӵ{XOѽd͡C // -// 對這個檔案進行手動變更可能導致您的應用程式產生未預期的行為。 -// 如果重新產生程式碼，將會覆寫對這個檔案的手動變更。 +// oɮ׶iܧiɭPzε{ͥw欰C +// pGs͵{XAN|мgoɮתܧC // //------------------------------------------------------------------------------ @@ -14,19 +14,19 @@ namespace Model using System.Data.Entity.Infrastructure; using System.Data.Entity.Core.Objects; using System.Linq; - + public partial class ezEntities : DbContext { public ezEntities() : base("name=ezEntities") { } - + protected override void OnModelCreating(DbModelBuilder modelBuilder) { throw new UnintentionalCodeFirstException(); } - + public virtual DbSet accountings { get; set; } public virtual DbSet accounting_files { get; set; } public virtual DbSet accounting_kind { get; set; } @@ -94,134 +94,134 @@ namespace Model public virtual DbSet AncestralTabletRegistrant { get; set; } public virtual DbSet AncestralTabletStatus { get; set; } public virtual DbSet GuaDanOrderGuest { get; set; } - + public virtual int pager_eztrust(Nullable startRowIndex, Nullable pageSize, string tableName, string columnName, string sqlWhere, string orderBy, ObjectParameter rowCount) { var startRowIndexParameter = startRowIndex.HasValue ? new ObjectParameter("StartRowIndex", startRowIndex) : new ObjectParameter("StartRowIndex", typeof(int)); - + var pageSizeParameter = pageSize.HasValue ? new ObjectParameter("PageSize", pageSize) : new ObjectParameter("PageSize", typeof(int)); - + var tableNameParameter = tableName != null ? new ObjectParameter("tableName", tableName) : new ObjectParameter("tableName", typeof(string)); - + var columnNameParameter = columnName != null ? new ObjectParameter("columnName", columnName) : new ObjectParameter("columnName", typeof(string)); - + var sqlWhereParameter = sqlWhere != null ? new ObjectParameter("sqlWhere", sqlWhere) : new ObjectParameter("sqlWhere", typeof(string)); - + var orderByParameter = orderBy != null ? new ObjectParameter("orderBy", orderBy) : new ObjectParameter("orderBy", typeof(string)); - + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("pager_eztrust", startRowIndexParameter, pageSizeParameter, tableNameParameter, columnNameParameter, sqlWhereParameter, orderByParameter, rowCount); } - + public virtual int sp_alterdiagram(string diagramname, Nullable owner_id, Nullable version, byte[] definition) { var diagramnameParameter = diagramname != null ? new ObjectParameter("diagramname", diagramname) : new ObjectParameter("diagramname", typeof(string)); - + var owner_idParameter = owner_id.HasValue ? new ObjectParameter("owner_id", owner_id) : new ObjectParameter("owner_id", typeof(int)); - + var versionParameter = version.HasValue ? new ObjectParameter("version", version) : new ObjectParameter("version", typeof(int)); - + var definitionParameter = definition != null ? new ObjectParameter("definition", definition) : new ObjectParameter("definition", typeof(byte[])); - + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("sp_alterdiagram", diagramnameParameter, owner_idParameter, versionParameter, definitionParameter); } - + public virtual int sp_creatediagram(string diagramname, Nullable owner_id, Nullable version, byte[] definition) { var diagramnameParameter = diagramname != null ? new ObjectParameter("diagramname", diagramname) : new ObjectParameter("diagramname", typeof(string)); - + var owner_idParameter = owner_id.HasValue ? new ObjectParameter("owner_id", owner_id) : new ObjectParameter("owner_id", typeof(int)); - + var versionParameter = version.HasValue ? new ObjectParameter("version", version) : new ObjectParameter("version", typeof(int)); - + var definitionParameter = definition != null ? new ObjectParameter("definition", definition) : new ObjectParameter("definition", typeof(byte[])); - + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("sp_creatediagram", diagramnameParameter, owner_idParameter, versionParameter, definitionParameter); } - + public virtual int sp_dropdiagram(string diagramname, Nullable owner_id) { var diagramnameParameter = diagramname != null ? new ObjectParameter("diagramname", diagramname) : new ObjectParameter("diagramname", typeof(string)); - + var owner_idParameter = owner_id.HasValue ? new ObjectParameter("owner_id", owner_id) : new ObjectParameter("owner_id", typeof(int)); - + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("sp_dropdiagram", diagramnameParameter, owner_idParameter); } - + public virtual ObjectResult sp_helpdiagramdefinition(string diagramname, Nullable owner_id) { var diagramnameParameter = diagramname != null ? new ObjectParameter("diagramname", diagramname) : new ObjectParameter("diagramname", typeof(string)); - + var owner_idParameter = owner_id.HasValue ? new ObjectParameter("owner_id", owner_id) : new ObjectParameter("owner_id", typeof(int)); - + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("sp_helpdiagramdefinition", diagramnameParameter, owner_idParameter); } - + public virtual ObjectResult sp_helpdiagrams(string diagramname, Nullable owner_id) { var diagramnameParameter = diagramname != null ? new ObjectParameter("diagramname", diagramname) : new ObjectParameter("diagramname", typeof(string)); - + var owner_idParameter = owner_id.HasValue ? new ObjectParameter("owner_id", owner_id) : new ObjectParameter("owner_id", typeof(int)); - + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("sp_helpdiagrams", diagramnameParameter, owner_idParameter); } - + public virtual int sp_renamediagram(string diagramname, Nullable owner_id, string new_diagramname) { var diagramnameParameter = diagramname != null ? new ObjectParameter("diagramname", diagramname) : new ObjectParameter("diagramname", typeof(string)); - + var owner_idParameter = owner_id.HasValue ? new ObjectParameter("owner_id", owner_id) : new ObjectParameter("owner_id", typeof(int)); - + var new_diagramnameParameter = new_diagramname != null ? new ObjectParameter("new_diagramname", new_diagramname) : new ObjectParameter("new_diagramname", typeof(string)); - + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("sp_renamediagram", diagramnameParameter, owner_idParameter, new_diagramnameParameter); } - + public virtual int sp_upgraddiagrams() { return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("sp_upgraddiagrams"); diff --git a/web/App_Code/Model/Model.Designer.cs b/web/App_Code/Model/Model.Designer.cs index dc691dc..b78332d 100644 --- a/web/App_Code/Model/Model.Designer.cs +++ b/web/App_Code/Model/Model.Designer.cs @@ -1,4 +1,4 @@ -// 已啟用模型 'D:\17168ERP\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。 +// 已啟用模型 'E:\17168ERP\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。 // 若要啟用舊版程式碼產生，請將 [程式碼產生策略] 設計工具屬性的值 //變更為 [舊版 ObjectContext]。當模型在設計工具中開啟時，這個屬性便可 //以在 [屬性] 視窗中使用。 diff --git a/web/App_Code/Model/Model.cs b/web/App_Code/Model/Model.cs index 1ca239e..05578ba 100644 --- a/web/App_Code/Model/Model.cs +++ b/web/App_Code/Model/Model.cs @@ -1,9 +1,9 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // -// 這個程式碼是由範本產生。 +// oӵ{XOѽd͡C // -// 對這個檔案進行手動變更可能導致您的應用程式產生未預期的行為。 -// 如果重新產生程式碼，將會覆寫對這個檔案的手動變更。 +// oɮ׶iܧiɭPzε{ͥw欰C +// pGs͵{XAN|мgoɮתܧC // //------------------------------------------------------------------------------ @@ -11,7 +11,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class accounting { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -20,7 +20,7 @@ namespace Model this.accounting_files = new HashSet(); this.transfer_register = new HashSet(); } - + public int num { get; set; } public Nullable uptime { get; set; } public Nullable category { get; set; } @@ -35,7 +35,7 @@ namespace Model public string excerpt { get; set; } public Nullable reg_time { get; set; } public Nullable pro_order_detail_num { get; set; } - + public virtual accounting_kind accounting_kind { get; set; } public virtual accounting_kind2 accounting_kind2 { get; set; } public virtual activity activity { get; set; } @@ -51,7 +51,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class accounting_files { public int num { get; set; } @@ -59,7 +59,7 @@ namespace Model public Nullable reg_time { get; set; } public string pic1 { get; set; } public string pic1_name { get; set; } - + public virtual accounting accounting { get; set; } } } @@ -67,7 +67,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class accounting_kind { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -75,14 +75,14 @@ namespace Model { this.accountings = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } public string demo { get; set; } public string title { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection accountings { get; set; } } @@ -91,7 +91,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class accounting_kind2 { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -101,7 +101,7 @@ namespace Model this.pro_order_record = new HashSet(); this.transfer_register = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } @@ -112,7 +112,7 @@ namespace Model public string bank_code { get; set; } public string bank_id { get; set; } public string record_payment { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection accountings { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -125,7 +125,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class act_bom { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -133,7 +133,7 @@ namespace Model { this.act_bom1 = new HashSet(); } - + public int num { get; set; } public Nullable package_num { get; set; } public Nullable item_num { get; set; } @@ -142,7 +142,7 @@ namespace Model public Nullable optional { get; set; } public Nullable qty { get; set; } public string memo { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection act_bom1 { get; set; } public virtual act_bom act_bom2 { get; set; } @@ -153,7 +153,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class actItem { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -169,7 +169,7 @@ namespace Model this.act_bom = new HashSet(); this.transfer_register = new HashSet(); } - + public int num { get; set; } public string subject { get; set; } public Nullable kind { get; set; } @@ -184,7 +184,7 @@ namespace Model public string partno { get; set; } public string print_init { get; set; } public string is_reconcile { get; set; } - + public virtual actItem_kind actItem_kind { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection actItem_files { get; set; } @@ -210,14 +210,14 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class actItem_files { public int num { get; set; } public int actItem_num { get; set; } public int files_num { get; set; } public Nullable reg_time { get; set; } - + public virtual actItem actItem { get; set; } public virtual file file { get; set; } } @@ -226,7 +226,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class actItem_kind { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -234,14 +234,14 @@ namespace Model { this.actItems = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } public string demo { get; set; } public string status { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection actItems { get; set; } } @@ -250,7 +250,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class activity { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -265,7 +265,7 @@ namespace Model this.stocks = new HashSet(); this.transfer_register = new HashSet(); } - + public int num { get; set; } public Nullable kind { get; set; } public string subject { get; set; } @@ -284,7 +284,7 @@ namespace Model public string customize_data { get; set; } public Nullable category_kind { get; set; } public string print_init { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection accountings { get; set; } public virtual activity_category_kind activity_category_kind { get; set; } @@ -309,7 +309,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class activity_category_kind { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -317,12 +317,12 @@ namespace Model { this.activities = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection activities { get; set; } } @@ -331,7 +331,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class activity_check { public int num { get; set; } @@ -340,7 +340,7 @@ namespace Model public Nullable reg_time { get; set; } public Nullable status { get; set; } public Nullable qty { get; set; } - + public virtual activity activity { get; set; } public virtual follower follower { get; set; } } @@ -349,7 +349,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class activity_kind { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -358,7 +358,7 @@ namespace Model this.activities = new HashSet(); this.activity_kind_detail = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } @@ -367,7 +367,7 @@ namespace Model public string calendar { get; set; } public Nullable month { get; set; } public Nullable day { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection activities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -378,7 +378,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class activity_kind_detail { public int num { get; set; } @@ -387,7 +387,7 @@ namespace Model public Nullable price { get; set; } public Nullable qty { get; set; } public Nullable reg_time { get; set; } - + public virtual actItem actItem { get; set; } public virtual activity_kind activity_kind { get; set; } } @@ -396,7 +396,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class activity_relating { public int num { get; set; } @@ -405,7 +405,7 @@ namespace Model public Nullable price { get; set; } public Nullable qty { get; set; } public Nullable reg_time { get; set; } - + public virtual actItem actItem { get; set; } public virtual activity activity { get; set; } } @@ -414,7 +414,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class activity_spares { public int num { get; set; } @@ -424,7 +424,7 @@ namespace Model public Nullable qty2 { get; set; } public string demo { get; set; } public Nullable reg_time { get; set; } - + public virtual actItem actItem { get; set; } public virtual activity activity { get; set; } } @@ -433,7 +433,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class admin { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -443,7 +443,7 @@ namespace Model this.news = new HashSet(); this.GuaDanOrder = new HashSet(); } - + public int num { get; set; } public string u_id { get; set; } public string u_password { get; set; } @@ -470,7 +470,7 @@ namespace Model public string wrp_bar { get; set; } public string gauth_key { get; set; } public Nullable gauth_enabled { get; set; } - + public virtual admin_group admin_group { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection members { get; set; } @@ -484,7 +484,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class admin_group { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -492,11 +492,11 @@ namespace Model { this.admins = new HashSet(); } - + public string g_name { get; set; } public string items { get; set; } public string demo { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection admins { get; set; } } @@ -505,7 +505,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class admin_log { public int num { get; set; } @@ -522,7 +522,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class AncestralTabletArea { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -531,7 +531,7 @@ namespace Model this.AncestralTabletArea1 = new HashSet(); this.AncestralTabletPosition = new HashSet(); } - + public int AreaId { get; set; } public string AreaName { get; set; } public string AreaCode { get; set; } @@ -541,7 +541,7 @@ namespace Model public Nullable SortOrder { get; set; } public bool IsDisabled { get; set; } public string Description { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection AncestralTabletArea1 { get; set; } public virtual AncestralTabletArea AncestralTabletArea2 { get; set; } @@ -553,7 +553,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class AncestralTabletPosition { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -561,7 +561,7 @@ namespace Model { this.AncestralTabletRegistrant = new HashSet(); } - + public int PositionId { get; set; } public int AreaId { get; set; } public string PositionCode { get; set; } @@ -571,7 +571,7 @@ namespace Model public string Description { get; set; } public Nullable RowNo { get; set; } public Nullable ColumnNo { get; set; } - + public virtual AncestralTabletArea AncestralTabletArea { get; set; } public virtual AncestralTabletStatus AncestralTabletStatus { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -582,7 +582,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class AncestralTabletPositionRecord { public int RecordId { get; set; } @@ -593,7 +593,7 @@ namespace Model public string WPContent { get; set; } public System.DateTime CreatedAt { get; set; } public Nullable UpdatedAt { get; set; } - + public virtual AncestralTabletRegistrant AncestralTabletRegistrant { get; set; } } } @@ -601,7 +601,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class AncestralTabletRegistrant { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -609,7 +609,7 @@ namespace Model { this.AncestralTabletPositionRecord = new HashSet(); } - + public string RegistrantCode { get; set; } public string Name { get; set; } public string Phone { get; set; } @@ -624,7 +624,7 @@ namespace Model public System.DateTime CreatedAt { get; set; } public Nullable UpdatedAt { get; set; } public bool IsEnd { get; set; } - + public virtual AncestralTabletPosition AncestralTabletPosition { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection AncestralTabletPositionRecord { get; set; } @@ -634,7 +634,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class AncestralTabletStatus { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -642,11 +642,11 @@ namespace Model { this.AncestralTabletPosition = new HashSet(); } - + public string StatusCode { get; set; } public string StatusName { get; set; } public string StatusType { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection AncestralTabletPosition { get; set; } } @@ -655,7 +655,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class appellation { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -663,10 +663,10 @@ namespace Model { this.followers = new HashSet(); } - + public int num { get; set; } public string title { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection followers { get; set; } } @@ -675,7 +675,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class bed_kind { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -685,14 +685,14 @@ namespace Model this.bed_order_detail = new HashSet(); this.bed_order_detail1 = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } public string demo { get; set; } public string sex { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection bed_kind_detail { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -705,7 +705,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class bed_kind_detail { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -713,13 +713,13 @@ namespace Model { this.bed_order_detail = new HashSet(); } - + public int num { get; set; } public Nullable bed_kind_id { get; set; } public string bed_name { get; set; } public Nullable bed_type { get; set; } public string demo { get; set; } - + public virtual bed_kind bed_kind { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection bed_order_detail { get; set; } @@ -729,7 +729,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class bed_order { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -737,7 +737,7 @@ namespace Model { this.bed_order_detail = new HashSet(); } - + public string bed_order_no { get; set; } public string order_no { get; set; } public Nullable o_detail_id { get; set; } @@ -747,7 +747,7 @@ namespace Model public string keyin1 { get; set; } public string demo { get; set; } public Nullable reg_time { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection bed_order_detail { get; set; } public virtual pro_order pro_order { get; set; } @@ -758,7 +758,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class bed_order_detail { public int num { get; set; } @@ -768,7 +768,7 @@ namespace Model public Nullable bed_kind2 { get; set; } public Nullable bed_kind_detail_id { get; set; } public string license { get; set; } - + public virtual bed_kind bed_kind { get; set; } public virtual bed_kind bed_kind3 { get; set; } public virtual bed_kind_detail bed_kind_detail { get; set; } @@ -779,7 +779,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class company { public int num { get; set; } @@ -808,7 +808,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class country { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -816,14 +816,14 @@ namespace Model { this.followers = new HashSet(); } - + public string ID { get; set; } public string ID2 { get; set; } public string ID3 { get; set; } public Nullable range { get; set; } public string name_en { get; set; } public string name_zh { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection followers { get; set; } } @@ -832,7 +832,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class family_members { public int num { get; set; } @@ -851,7 +851,7 @@ namespace Model public string mobile { get; set; } public string city { get; set; } public string area { get; set; } - + public virtual follower follower { get; set; } } } @@ -859,7 +859,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class file { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -867,7 +867,7 @@ namespace Model { this.actItem_files = new HashSet(); } - + public int num { get; set; } public string subject { get; set; } public string word { get; set; } @@ -875,7 +875,7 @@ namespace Model public Nullable modify_time { get; set; } public string customize_data { get; set; } public string paperset { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection actItem_files { get; set; } } @@ -884,7 +884,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class follower { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -904,7 +904,7 @@ namespace Model this.GuaDanOrder = new HashSet(); this.GuaDanOrderGuest = new HashSet(); } - + public int num { get; set; } public string f_number { get; set; } public string u_name { get; set; } @@ -937,7 +937,7 @@ namespace Model public Nullable appellation_id { get; set; } public string follower_hash { get; set; } public string search_keywords { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection activity_check { get; set; } public virtual appellation appellation { get; set; } @@ -973,14 +973,14 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class followers_tablet { public int num { get; set; } public Nullable f_num { get; set; } public string title { get; set; } public string type { get; set; } - + public virtual follower follower { get; set; } } } @@ -988,7 +988,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class GuaDanOrder { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -996,7 +996,7 @@ namespace Model { this.GuaDanOrderGuest = new HashSet(); } - + public Nullable StartDate { get; set; } public Nullable EndDate { get; set; } public Nullable CreateUser { get; set; } @@ -1011,7 +1011,7 @@ namespace Model public System.Guid Uuid { get; set; } public Nullable ActivityNum { get; set; } public bool IsCancel { get; set; } - + public virtual admin admin { get; set; } public virtual follower followers { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -1022,7 +1022,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class GuaDanOrderGuest { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1030,7 +1030,7 @@ namespace Model { this.RegionAndRoomAndBedSchedule = new HashSet(); } - + public string GuaDanOrderNo { get; set; } public Nullable FollowerNum { get; set; } public bool IsDeleted { get; set; } @@ -1041,7 +1041,7 @@ namespace Model public Nullable CheckOutAt { get; set; } public string StatusCode { get; set; } public Nullable OrderUuid { get; set; } - + public virtual follower followers { get; set; } public virtual GuaDanOrder GuaDanOrder { get; set; } public virtual RegionRoomBed RegionRoomBed { get; set; } @@ -1055,7 +1055,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class GuadanTimeSetting { public System.Guid Id { get; set; } @@ -1070,7 +1070,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class item { public int num { get; set; } @@ -1090,7 +1090,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class member { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1101,7 +1101,7 @@ namespace Model this.stocks = new HashSet(); this.transfer_register = new HashSet(); } - + public int num { get; set; } public Nullable f_num { get; set; } public string m_number { get; set; } @@ -1129,7 +1129,7 @@ namespace Model public string address2 { get; set; } public Nullable reg_time { get; set; } public string pic1 { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection accountings { get; set; } public virtual admin admin { get; set; } @@ -1148,7 +1148,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class member_check { public int num { get; set; } @@ -1160,7 +1160,7 @@ namespace Model public Nullable login_type { get; set; } public string login_ip { get; set; } public Nullable hour { get; set; } - + public virtual member member { get; set; } } } @@ -1168,7 +1168,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class member_group { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1176,7 +1176,7 @@ namespace Model { this.members = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable starttime { get; set; } @@ -1185,7 +1185,7 @@ namespace Model public Nullable root { get; set; } public Nullable range { get; set; } public string demo { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection members { get; set; } } @@ -1194,7 +1194,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class member_title { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1202,14 +1202,14 @@ namespace Model { this.members = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } public string demo { get; set; } public string status { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection members { get; set; } } @@ -1218,7 +1218,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class news { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1226,7 +1226,7 @@ namespace Model { this.news_files = new HashSet(); } - + public int num { get; set; } public string subject { get; set; } public Nullable kind { get; set; } @@ -1241,7 +1241,7 @@ namespace Model public Nullable range { get; set; } public Nullable author { get; set; } public Nullable activity_num { get; set; } - + public virtual activity activity { get; set; } public virtual admin admin { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -1253,7 +1253,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class news_files { public string num { get; set; } @@ -1262,7 +1262,7 @@ namespace Model public Nullable reg_time { get; set; } public string pic_name { get; set; } public string pic_type { get; set; } - + public virtual news news { get; set; } } } @@ -1270,7 +1270,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class news_kind { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1278,14 +1278,14 @@ namespace Model { this.news = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } public string demo { get; set; } public string status { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection news { get; set; } } @@ -1294,7 +1294,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class PostCity { public string city { get; set; } @@ -1304,7 +1304,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class PostNumber { public int ID { get; set; } @@ -1317,7 +1317,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class pro_order { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1326,7 +1326,7 @@ namespace Model this.bed_order = new HashSet(); this.pro_order_detail = new HashSet(); } - + public string order_no { get; set; } public Nullable up_time { get; set; } public Nullable reg_time { get; set; } @@ -1340,7 +1340,7 @@ namespace Model public Nullable introducer { get; set; } public Nullable send_receipt { get; set; } public string receipt_title { get; set; } - + public virtual activity activity { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection bed_order { get; set; } @@ -1354,7 +1354,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class pro_order_detail { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1365,7 +1365,7 @@ namespace Model this.accountings = new HashSet(); this.transfer_register = new HashSet(); } - + public int num { get; set; } public string order_no { get; set; } public Nullable actItem_num { get; set; } @@ -1389,7 +1389,7 @@ namespace Model public Nullable parent_num { get; set; } public string print_id { get; set; } public Nullable UpdateTime { get; set; } - + public virtual actItem actItem { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection bed_order { get; set; } @@ -1408,7 +1408,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class pro_order_record { public int num { get; set; } @@ -1421,7 +1421,7 @@ namespace Model public string bank_code { get; set; } public Nullable transfer_id { get; set; } public string reconcile_memo { get; set; } - + public virtual accounting_kind2 accounting_kind2 { get; set; } public virtual pro_order_detail pro_order_detail { get; set; } public virtual transfer_register transfer_register { get; set; } @@ -1431,7 +1431,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class project { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1439,14 +1439,14 @@ namespace Model { this.project_sub = new HashSet(); } - + public int num { get; set; } public string subject { get; set; } public Nullable kind { get; set; } public Nullable actItem_num { get; set; } public string demo { get; set; } public Nullable reg_time { get; set; } - + public virtual actItem actItem { get; set; } public virtual project_kind project_kind { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -1457,7 +1457,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class project_kind { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1465,13 +1465,13 @@ namespace Model { this.projects = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } public string demo { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection projects { get; set; } } @@ -1480,7 +1480,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class project_sub { public int num { get; set; } @@ -1490,7 +1490,7 @@ namespace Model public string word { get; set; } public string pic1 { get; set; } public Nullable pro_id { get; set; } - + public virtual project project { get; set; } } } @@ -1498,7 +1498,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class Region { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1507,7 +1507,7 @@ namespace Model this.Region1 = new HashSet(); this.Room = new HashSet(); } - + public string Name { get; set; } public string Description { get; set; } public Nullable SortOrder { get; set; } @@ -1521,7 +1521,7 @@ namespace Model public Nullable ParentUuid { get; set; } public Nullable RegionTypeUuid { get; set; } public Nullable Gender { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection Region1 { get; set; } public virtual Region Region2 { get; set; } @@ -1534,7 +1534,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class RegionAndRoomAndBedSchedule { public int UseType { get; set; } @@ -1549,7 +1549,7 @@ namespace Model public Nullable ScheduleDate { get; set; } public bool IsCancel { get; set; } public Nullable GuaDanOrderGuestUuid { get; set; } - + public virtual GuaDanOrderGuest GuaDanOrderGuest { get; set; } } } @@ -1557,7 +1557,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class RegionRoomBed { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1565,7 +1565,7 @@ namespace Model { this.GuaDanOrderGuest = new HashSet(); } - + public string Name { get; set; } public bool IsActive { get; set; } public bool Gender { get; set; } @@ -1573,7 +1573,7 @@ namespace Model public System.Guid Uuid { get; set; } public System.Guid RoomUuid { get; set; } public string StatusCode { get; set; } - + public virtual Room Room { get; set; } public virtual RegionRoomBedStatus RegionRoomBedStatus { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -1584,7 +1584,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class RegionRoomBedStatus { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1593,13 +1593,13 @@ namespace Model this.RegionRoomBed = new HashSet(); this.GuaDanOrderGuest = new HashSet(); } - + public string Code { get; set; } public string Name { get; set; } public string Description { get; set; } public Nullable Category { get; set; } public bool IsDeleted { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RegionRoomBed { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -1610,7 +1610,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class RegionType { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1618,14 +1618,14 @@ namespace Model { this.Region = new HashSet(); } - + public string Code { get; set; } public string Name { get; set; } public bool IsActive { get; set; } public Nullable CreateAt { get; set; } public bool IsDeleted { get; set; } public System.Guid Uuid { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection Region { get; set; } } @@ -1634,7 +1634,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class Room { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1643,7 +1643,7 @@ namespace Model this.RegionRoomBed = new HashSet(); this.GuaDanOrderGuest = new HashSet(); } - + public string Name { get; set; } public bool Gender { get; set; } public Nullable BedCount { get; set; } @@ -1653,7 +1653,7 @@ namespace Model public bool IsDeleted { get; set; } public System.Guid Uuid { get; set; } public System.Guid RegionUuid { get; set; } - + public virtual Region Region { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RegionRoomBed { get; set; } @@ -1665,7 +1665,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class ShuWen { public int ID { get; set; } @@ -1680,7 +1680,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class stock { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1688,7 +1688,7 @@ namespace Model { this.stock_files = new HashSet(); } - + public int num { get; set; } public Nullable uptime { get; set; } public Nullable category { get; set; } @@ -1706,7 +1706,7 @@ namespace Model public Nullable supplier { get; set; } public Nullable final_stock { get; set; } public Nullable rent_stock { get; set; } - + public virtual actItem actItem { get; set; } public virtual activity activity { get; set; } public virtual member member { get; set; } @@ -1721,7 +1721,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class stock_files { public int num { get; set; } @@ -1729,7 +1729,7 @@ namespace Model public Nullable reg_time { get; set; } public string pic1 { get; set; } public string pic1_name { get; set; } - + public virtual stock stock { get; set; } } } @@ -1737,7 +1737,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class stock_kind { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1745,13 +1745,13 @@ namespace Model { this.stocks = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } public string demo { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection stocks { get; set; } } @@ -1760,7 +1760,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class stock_reason { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1768,13 +1768,13 @@ namespace Model { this.stocks = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } public Nullable category { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection stocks { get; set; } } @@ -1783,7 +1783,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class supplier { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1791,7 +1791,7 @@ namespace Model { this.stocks = new HashSet(); } - + public int num { get; set; } public string s_number { get; set; } public string u_name { get; set; } @@ -1807,7 +1807,7 @@ namespace Model public Nullable reg_time { get; set; } public string admin_log { get; set; } public string c_num { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection stocks { get; set; } public virtual supplier_kind supplier_kind { get; set; } @@ -1817,7 +1817,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class supplier_kind { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1825,13 +1825,13 @@ namespace Model { this.suppliers = new HashSet(); } - + public int num { get; set; } public string kind { get; set; } public Nullable root { get; set; } public Nullable range { get; set; } public string demo { get; set; } - + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection suppliers { get; set; } } @@ -1840,7 +1840,7 @@ namespace Model { using System; using System.Collections.Generic; - + public partial class transfer_register { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] @@ -1848,7 +1848,7 @@ namespace Model { this.pro_order_record = new HashSet(); } - + public int id { get; set; } public Nullable activity_num { get; set; } public string name { get; set; } @@ -1876,7 +1876,7 @@ namespace Model public Nullable remain_amount { get; set; } public Nullable balance_act_item { get; set; } public Nullable balance_pro_order_detail { get; set; } - + public virtual accounting accounting { get; set; } public virtual accounting_kind2 accounting_kind2 { get; set; } public virtual activity activity { get; set; } @@ -1892,7 +1892,7 @@ namespace Model namespace Model { using System; - + public partial class sp_helpdiagramdefinition_Result { public Nullable version { get; set; } @@ -1902,7 +1902,7 @@ namespace Model namespace Model { using System; - + public partial class sp_helpdiagrams_Result { public string Database { get; set; } diff --git a/web/App_Code/Model/Model.edmx.diagram b/web/App_Code/Model/Model.edmx.diagram index 4147bfb..db8eefc 100644 --- a/web/App_Code/Model/Model.edmx.diagram +++ b/web/App_Code/Model/Model.edmx.diagram @@ -9,7 +9,7 @@ - + diff --git a/web/App_Code/admin.cs b/web/App_Code/admin.cs index b970cc4..4de3c17 100644 --- a/web/App_Code/admin.cs +++ b/web/App_Code/admin.cs @@ -28,7 +28,7 @@ namespace MyWeb public AdmItem info { get; set; } //定義欄位cookie==================start - public class AdmItem + public class AdmItem { public int num { get; set; } public string u_id { get; set; } diff --git a/web/App_Code/api/FollowerController.cs b/web/App_Code/api/FollowerController.cs index eb581d9..cbcfbea 100644 --- a/web/App_Code/api/FollowerController.cs +++ b/web/App_Code/api/FollowerController.cs @@ -103,17 +103,18 @@ public class FollowerController : ApiController { foreach (var item in prod) { - foreach (var item2 in item.pro_order_detail1) - item2.from_id = null; //清空訂單明細的陽上報恩者from_id //f_num設定串聯刪除 + //foreach (var item2 in item.pro_order_detail1) + // item2.from_id = null; //清空訂單明細的陽上報恩者from_id //f_num設定串聯刪除 - foreach (var item2 in item.pro_order) - item2.introducer = null; + //foreach (var item2 in item.pro_order) + // item2.introducer = null; - item.leader = null;//清空leader + //item.leader = null;//清空leader + _db.followers.RemoveRange(prod); } - _db.followers.RemoveRange(prod); + //_db.followers.RemoveRange(prod); _db.SaveChanges(); Model.admin_log admin_log = new Model.admin_log(); @@ -173,7 +174,7 @@ public class FollowerController : ApiController } } - + // 電話/證號搜尋 (使用 search_keywords HEX 編碼) if (!string.IsNullOrEmpty(q.phone_idcode) && GlobalVariables.UseSearchKeywords) { @@ -655,8 +656,10 @@ public class FollowerController : ApiController list = orderrecord.Select(x => new { orderno = x.order_no, - startdate = x.reg_time, - endtime = x.up_time, + //startdate = x.reg_time, + //endtime = x.up_time, + startdate = x.activity.startDate_solar, + enddate = x.activity.endDate_solar, pwcount = x.pro_order_detail.Where(a => a.actItem.act_bom.Where(b => b.item_num == a.actItem_num && b.package_num == null).Count() == 0).Count(), amount = x.pro_order_detail.Select(o => (float?)o.price).Sum(), activityname = x.activity.subject, diff --git a/web/App_Code/api/activityController.cs b/web/App_Code/api/activityController.cs index 2b40226..74171ab 100644 --- a/web/App_Code/api/activityController.cs +++ b/web/App_Code/api/activityController.cs @@ -1,14 +1,16 @@ -using System; +using DocumentFormat.OpenXml.Drawing.Spreadsheet; +using Newtonsoft.Json; +using Org.BouncyCastle.Crypto; +using PagedList; +using System; +using System.Collections; using System.Collections.Generic; +using System.Data.Entity; using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; -using PagedList; -using Newtonsoft.Json; -using System.Collections; using static TreeView; -using System.Data.Entity; // api/activity //[ezAuthorize(Roles = "admin")]//群組:* @@ -126,6 +128,12 @@ public class activityController : ApiController if (prod != null) { ////prod.IsDel = true; ////不確定是否新增欄位? 先註解 + + // 先刪除子項目 + var prod2 = _db.act_bom.Where(q => q.package_num == prod.num).ToList(); + _db.act_bom.RemoveRange(prod2); + + _db.actItems.Remove(prod); _db.SaveChanges(); Model.admin_log admin_log = new Model.admin_log(); MyWeb.admin admin = new MyWeb.admin();//api裡不可以用MyWeb @@ -190,12 +198,18 @@ public class activityController : ApiController if (prod.Count() > 0) { //var prod2 = _db.actItem_files.AsEnumerable().Where(q => ids.Contains(Convert.ToInt32(q.actItem_num))).ToList(); - var prod2 = _db.actItem_files.Where(q => ids.Contains(q.actItem_num)).ToList(); - if (prod2.Count > 0) - { - _db.actItem_files.RemoveRange(prod2); - //_db.SaveChanges(); - } + //var prod2 = _db.actItem_files.Where(q => ids.Contains(q.actItem_num)).ToList(); + //if (prod2.Count > 0) + //{ + // _db.actItem_files.RemoveRange(prod2); + // //_db.SaveChanges(); + //} + + // 先刪除子項目 + var parentBoms = _db.act_bom.Where(q => q.item_num.HasValue && ids.Contains(q.item_num.Value)).ToList(); + var parentIds = parentBoms.Select(x => x.num).ToList(); // 取得母件 id + var childBoms = _db.act_bom.Where(q => q.package_num.HasValue && parentIds.Contains(q.package_num.Value)).ToList(); + _db.act_bom.RemoveRange(childBoms); _db.actItems.RemoveRange(prod); _db.SaveChanges(); diff --git a/web/App_Code/api/orderController.cs b/web/App_Code/api/orderController.cs index 6260df2..6bed7ee 100644 --- a/web/App_Code/api/orderController.cs +++ b/web/App_Code/api/orderController.cs @@ -1,17 +1,18 @@ -using System; +using DocumentFormat.OpenXml.Drawing.Charts; +using Model; +using MyWeb; +using Newtonsoft.Json; +using PagedList; +using System; +using System.Collections; using System.Collections.Generic; +using System.Diagnostics; +using System.IdentityModel.Metadata; using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; -using PagedList; -using Newtonsoft.Json; -using System.Collections; using static TreeView; -using Model; -using System.IdentityModel.Metadata; -using MyWeb; -using DocumentFormat.OpenXml.Drawing.Charts; // api/order @@ -683,7 +684,7 @@ public class orderController : ApiController .Where(q => q.num == item.num) .FirstOrDefault();//修改 if (order != null) - { + { order.actItem_num = (item.actItem_num.HasValue && item.actItem_num.Value > 0) ? item.actItem_num : null; order.f_num = (item.f_num.HasValue && item.f_num.Value > 0) diff --git a/web/admin/Templates/TBS5ADM001/uc/menu.ascx b/web/admin/Templates/TBS5ADM001/uc/menu.ascx index cd408e4..3314d38 100644 --- a/web/admin/Templates/TBS5ADM001/uc/menu.ascx +++ b/web/admin/Templates/TBS5ADM001/uc/menu.ascx @@ -16,6 +16,7 @@ " + onclick="sessionStorage.removeItem('member_list_cache');sessionStorage.removeItem('member_query_params');" target="<%#(ValString(Eval("target"))=="B"?"_blank":"_self") %>"> <%#Eval("title") %> diff --git a/web/admin/follower/import.aspx.cs b/web/admin/follower/import.aspx.cs index d5aa0b9..cac89c0 100644 --- a/web/admin/follower/import.aspx.cs +++ b/web/admin/follower/import.aspx.cs @@ -260,7 +260,7 @@ public partial class admin_follower_import : MyWeb.config follower.introducer = ValString(sheet.Cells[currentRow, 17].Text.Trim()); //檢查國籍代碼是否存在 - var country = _country.Where(x => x.name_zh == ValString(sheet.Cells[currentRow, 18].Text.Trim())).FirstOrDefault(); + var country = _country.Where(x => x.name_zh == ValString(sheet.Cells[currentRow, 18].Text.Trim())).FirstOrDefault(); if(country != null) { //follower.country = ValString(sheet.Cells[currentRow, 18].Text.Trim()); diff --git a/web/admin/follower/index.aspx b/web/admin/follower/index.aspx index 6b2ea3f..5a03f4b 100644 --- a/web/admin/follower/index.aspx +++ b/web/admin/follower/index.aspx @@ -13,10 +13,12 @@ 列印管理報表 - + 列印查詢資料 - 匯出Excel +
+ 匯出查詢資料（Excel） +
@@ -24,11 +26,13 @@ Vue.filter('timeString', function (value, myFormat) { return value == null || value == "" ? "" : moment(value).format(myFormat || 'YYYY-MM-DD, HH:mm:ss'); }); - let VueApp=new Vue({ + let VueApp = new Vue({ el: '#app', vuetify: new Vuetify(vuetify_options), data() { return { + isSearched: false, + print_error_msg: '', options: { multiSort: false }, search_options: { multiSort: false }, data_table: { @@ -38,10 +42,10 @@ singleSelect: false, count: 0, page: 1, - pageSize: 10, + pageSize: 10, header: [ { text: '信眾編號', value: 'f_number', align: 'start' }, - { text: '信眾姓名', value: 'u_name'}, + { text: '信眾姓名', value: 'u_name' }, { text: '身分別', value: 'identity_type_desc' }, { text: '性別', value: 'sex' }, { text: '生日', value: 'birthday' }, @@ -49,9 +53,9 @@ { text: '', value: 'slot', sortable: false }, { text: '', value: 'slot_btn', sortable: false, align: 'end' }, ], - footer:{ + footer: { showFirstLastPage: true, - pageSizeOptions:[5,10,20,30], + pageSizeOptions: [5, 10, 20, 30], }, }, search: { @@ -60,7 +64,7 @@ sex: '', //birthday: new Date().toISOString().split('T')[0], //birthday2: new Date().toISOString().split('T')[0] - birthday:'', + birthday: '', birthday2: '', address: '', country: '', @@ -69,14 +73,14 @@ /*注意這邊的參數不能跟下方print_search重複*/ }, //列印管理報表 - print_conditions:'yy', + print_conditions: 'yy', print_search: { year: '', month: '', - season: '', + season: '', }, select_items: { - month: [{ + month: [{ text: "請選擇", val: 0 },], @@ -126,13 +130,18 @@ itemsPerPageText: '', }, }, - + } }, watch: { options: { handler() { - this.getList() + if (this.isSearched) { + this.getList() + } + else { + this.data_table.loading = false; + } }, deep: true, }, @@ -141,23 +150,118 @@ this.search_get() }, deep: true, - }, - }, mounted() { + } + }, mounted() { + const printResult = document.getElementById('<%= hid_err_msg.ClientID %>').value; + document.getElementById('<%= hid_err_msg.ClientID %>').value = ''; + window._printResult = printResult + this.search_dialog.current = this.search_dialog.controls.search1 ///default this.initPrintSearch(); + const navEntries = performance.getEntriesByType("navigation"); const isReload = navEntries.length > 0 && navEntries[0].type === "reload"; + + const url = new URL(window.location.href); + let params = url.searchParams; + if (params.get('dirty') === '1') { // 資料有更新時執行 getlist + this.search = JSON.parse(sessionStorage.getItem("member_query_params")); + this.getList(); + + params.delete('dirty'); + window.history.replaceState({}, '', url.pathname + url.search); + } + if (isReload) { sessionStorage.removeItem("followerpage"); + sessionStorage.removeItem("member_list_cache"); + sessionStorage.removeItem("member_query_params"); + } + else if ("<%=lastAddedID%>" !== "") { + const newQuery = { f_number: '<%=lastAddedID%>' }; + sessionStorage.setItem('member_query_params', JSON.stringify(newQuery)); + this.search = newQuery; + this.isSearched = true; } else { const savedPage = parseInt(sessionStorage.getItem('followerpage')); + const savedData = sessionStorage.getItem("member_list_cache"); + const savedQuery = JSON.parse(sessionStorage.getItem("member_query_params")); + if (savedQuery) { + this.search = savedQuery; + this.isSearched = true; + } if (savedPage) { this.options.page = savedPage; } + if (savedData && savedData !== "undefined") { + this.data_table = JSON.parse(savedData); + this.isSearched = true; + } } + + //if (params.has('year')) { + // this.print_search.year = parseInt(params.get('year')); + // this.print_dialog.show = true; + //} + //if (params.has('month')) { + // this.print_search.month = parseInt(params.get('month')); + // this.print_dialog.show = true; + //} + //if (params.has('season')) { + // this.print_search.season = parseInt(params.get('season')); + // this.print_dialog.show = true; + //} + //if (params.has('mode')) { + // this.print_conditions = params.get('mode'); + // this.print_dialog.show = true; + //} + + if (printResult === 'nodata' || printResult === 'success') { + this.$nextTick(() => { + this.print_search.year = parseInt(document.getElementById('<%= hid_print_year.ClientID %>').value) || this.print_search.year; + this.print_search.month = parseInt(document.getElementById('<%= hid_print_month.ClientID %>').value) || this.print_search.month; + this.print_search.season = parseInt(document.getElementById('<%= hid_print_season.ClientID %>').value) || this.print_search.season; + this.print_conditions = document.getElementById('<%= hid_print_mode.ClientID %>').value || 'yy'; + this.print_dialog.show = true; + if (printResult === 'nodata') { + this.print_error_msg = "查無資料，請重新選擇區間"; + } + }); + } + this.$nextTick(() => { + setTimeout(() => { + ['year', 'month', 'season', 'mode', 'msg'].forEach(p => params.delete(p)); + window.history.replaceState({}, '', url.pathname + url.search); + }, 100); + }); }, methods: { + triggerManagementExport(mode) { + this.print_dialog.show = false; + this.print_error_msg = ""; + if (this.print_search.year == '') { + msgbox('請輸入年份'); + return; + } + + document.getElementById('<%= hid_print_mode.ClientID %>').value = this.print_conditions; + document.getElementById('<%= hid_print_year.ClientID %>').value = this.print_search.year; + if (this.print_conditions == 'mm') { + document.getElementById('<%= hid_print_month.ClientID %>').value = this.print_search.month; + } + else if (this.print_conditions == 'ss') { + document.getElementById('<%= hid_print_season.ClientID %>').value = this.print_search.season; + } + + if (mode === 'print') { + const printWindow = window.open('about:blank', '列印信眾資料'); + document.getElementById('<%= print_management.ClientID %>').click(); + } + else if (mode === "excel") { + document.getElementById('<%= excel_management.ClientID %>').click(); + } + }, search_show(curr) { //console.log("btn_click:", curr, curr.api_url); this.search_dialog.current = curr; @@ -228,6 +332,7 @@ //console.log(row, row["u_name"], row["f_number"], curr.id, target); }, getList(clearpage = false) { + console.log("do getlist") const { sortBy, sortDesc, page, itemsPerPage } = this.options const params = { sortBy: sortBy[0], sortDesc: sortDesc[0], @@ -241,6 +346,9 @@ this.data_table.list = response.data.list this.data_table.count = response.data.count; this.data_table.loading = false + + const dataToStore = JSON.stringify(this.data_table); + sessionStorage.setItem("member_list_cache", dataToStore); }) .catch( error => console.log(error) @@ -262,7 +370,7 @@ const index = this.data_table.list.indexOf(item) if (index != -1) { axios - .delete(HTTP_HOST + 'api/follower/' + item.num) + .delete(HTTP_HOST + 'api/follower/Delete/' + item.num) .then(response => { this.getList(); }) @@ -282,18 +390,23 @@ //} //this.data_table.selected = []; //this.data_table.count = this.data_table.list.length - location.reload(); + //location.reload(); + this.getList(); }) .catch(error => console.log(error)) } }, btn_search() { + isSearched = true; + sessionStorage.setItem("member_query_params", JSON.stringify(this.search)); this.getList(true) bootstrap.Offcanvas.getInstance(document.getElementById("offcanvasRight")).hide() }, btn_all() { + isSearched = false; clearObjProps(this.search); - this.btn_search() + sessionStorage.setItem("member_query_params", JSON.stringify(this.search)); + //this.btn_search() }, goPrint() { //debugger; @@ -309,6 +422,7 @@ //列印管理報表 print_close() { this.print_dialog.show = false; + this.print_error_msg = ""; } , initPrintSearch() { @@ -391,10 +505,30 @@ $('#country2').val(''); VueApp.search.country2 = ''; }); + + $(document).ready(function () { + // 判斷是否彈出 search dialog + let hasSearchResult = sessionStorage.getItem("member_list_cache") !== null; + + if (!hasSearchResult && window._printResult === '') { + let $btn = $("a[data-bs-target='#offcanvasRight'][href='#search_panel']"); + $btn.click(); + let el = document.getElementById('offcanvasRight'); + let offcanvas = bootstrap.Offcanvas.getOrCreateInstance(el); + offcanvas.show(); + } + }); + + + + + +
diff --git a/web/admin/follower/order_record_detail.aspx b/web/admin/follower/order_record_detail.aspx index b75ee45..166fd73 100644 --- a/web/admin/follower/order_record_detail.aspx +++ b/web/admin/follower/order_record_detail.aspx @@ -4,10 +4,11 @@
-
- 信眾姓名: -
-
+
+ 信眾姓名: +
+
+ " class="btn btn-outline-secondary">返回
diff --git a/web/admin/follower/print.aspx.cs b/web/admin/follower/print.aspx.cs index 939d7ba..c4e7728 100644 --- a/web/admin/follower/print.aspx.cs +++ b/web/admin/follower/print.aspx.cs @@ -3,6 +3,7 @@ using DocumentFormat.OpenXml.Vml.Office; using OfficeOpenXml.FormulaParsing.Excel.Functions.Information; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Web; using System.Web.UI; @@ -26,7 +27,7 @@ public partial class admin_follower_print_ : System.Web.UI.Page //紀錄匯出條件 string _query = ""; var qry = _db.followers.AsQueryable(); - + // ❌ 錯誤寫法: qry = qry.Where(o => o.f_number.Contains(Request["f_number"].Trim())); // LINQ to Entities 無法轉換 Request[] 方法，必須先轉換為變數再使用 string fNumberParam = Request["f_number"]?.Trim(); @@ -85,7 +86,7 @@ public partial class admin_follower_print_ : System.Web.UI.Page } _query += "國家:" + (_db.countries.Where(x => x.ID == country2Id).Select(x => x.name_zh).FirstOrDefault() ?? "") + "\n"; } - + //管理報表 if (!string.IsNullOrEmpty(Request["year"])) { diff --git a/web/admin/follower/reg.aspx b/web/admin/follower/reg.aspx index c1128ed..93d8e6e 100644 --- a/web/admin/follower/reg.aspx +++ b/web/admin/follower/reg.aspx @@ -190,7 +190,7 @@ text_prop: 'name_zh', value_prop: 'id', keys: [ - { id: 'keyword', title: '關鍵字' }, + { id: 'keyword', title: '關鍵字' }, ], api_url: HTTP_HOST + 'api/country/GetList', columns: [ @@ -208,11 +208,11 @@ title: '稱謂', text_prop: 'title', value_prop: 'num', - keys: [ + keys: [ ], api_url: HTTP_HOST + 'api/appellation/GetList', columns: [ - { id: 'title', title: '稱謂' }, + { id: 'title', title: '稱謂' }, ], selected: {}, select(item, index, t) { @@ -230,7 +230,7 @@ { id: 'f_number', title: '編號' }, { id: 'u_name', title: '姓名' }, { id: 'address', title: '地址' }, - { id: 'onlyfamily', title: '只查親屬'}, + { id: 'onlyfamily', title: '只查親屬' }, ], api_url: HTTP_HOST + 'api/follower/GetList', columns: [ @@ -241,7 +241,7 @@ selected: {}, select(item, index, t) { console.log("select search5", t); - + } }, }, @@ -314,10 +314,10 @@ birthday: '', phoneDes: '', demo: '', - appellation_id_selected : + appellation_id_selected: { - text : '', - val : 0, + text: '', + val: 0, }, }, @@ -372,33 +372,33 @@ ], tabletsDetail: { multiSort: false }, tabletTable: { - Loading:true, + Loading: true, disableButton: true, searchDetail: '', headersDetail: [ - { text: '超渡/陽上', value: 'type', sortable: false, width: "100px" }, - { text: '* 牌位標題', value: 'title', sortable: true }, + { text: '超渡/陽上', value: 'type', sortable: false, width: "100px" }, + { text: '* 牌位標題', value: 'title', sortable: true }, { text: '', value: 'actions', sortable: false, width: "100px" }, - ], + ], desserts: [], desserts_count: 0, editedIndex: -1, editedItem: { id: 0, - num: 0, - f_num: 0, - title: '', + num: 0, + f_num: 0, + title: '', }, defaultItem: { id: 0, - num: 0, - f_num: 0, + num: 0, + f_num: 0, type: this.selectedTabletType, - title:'', + title: '', }, }, //新:家人 - family:{ + family: { dialog: false, isEditing: false, is_tw: true, @@ -420,8 +420,8 @@ chinese_year: "", zodiac: "", birth_time: "", - city:"", - area:"", + city: "", + area: "", address: "", phone: "", mobile: "", @@ -440,8 +440,8 @@ chinese_year: "", zodiac: "", birth_time: "", - city:"", - area:"", + city: "", + area: "", address: "", phone: "", mobile: "", @@ -458,11 +458,11 @@ areaOptions: {}, // 區域選項 //天干地支:甲子, 乙丑... chineseYears: [ - '甲子', '乙丑', '丙寅', '丁卯', '戊辰', '己巳', '庚午', '辛未', '壬申', '癸酉', - '甲戌', '乙亥', '丙子', '丁丑', '戊寅', '己卯', '庚辰', '辛巳', '壬午', '癸未', - '甲申', '乙酉', '丙戌', '丁亥', '戊子', '己丑', '庚寅', '辛卯', '壬辰', '癸巳', - '甲午', '乙未', '丙申', '丁酉', '戊戌', '己亥', '庚子', '辛丑', '壬寅', '癸卯', - '甲辰', '乙巳', '丙午', '丁未', '戊申', '己酉', '庚戌', '辛亥', '壬子', '癸丑', + '甲子', '乙丑', '丙寅', '丁卯', '戊辰', '己巳', '庚午', '辛未', '壬申', '癸酉', + '甲戌', '乙亥', '丙子', '丁丑', '戊寅', '己卯', '庚辰', '辛巳', '壬午', '癸未', + '甲申', '乙酉', '丙戌', '丁亥', '戊子', '己丑', '庚寅', '辛卯', '壬辰', '癸巳', + '甲午', '乙未', '丙申', '丁酉', '戊戌', '己亥', '庚子', '辛丑', '壬寅', '癸卯', + '甲辰', '乙巳', '丙午', '丁未', '戊申', '己酉', '庚戌', '辛亥', '壬子', '癸丑', '甲寅', '乙卯', '丙辰', '丁巳', '戊午', '己未', '庚申', '辛酉', '壬戌', '癸亥' ], //生肖 @@ -585,7 +585,7 @@ this.search_dialog.list = response.data.list this.search_dialog.count = response.data.count this.search_dialog.loading = false - + console.log(this.search_dialog.list) }) .catch(error => { console.log(error) @@ -1332,7 +1332,7 @@
- + diff --git a/web/admin/follower/reg.aspx.cs b/web/admin/follower/reg.aspx.cs index a3be434..d0e2c4d 100644 --- a/web/admin/follower/reg.aspx.cs +++ b/web/admin/follower/reg.aspx.cs @@ -1,34 +1,44 @@ -using System; +using Model; +using Newtonsoft.Json; +using System; using System.Collections; using System.Collections.Generic; +using System.Configuration; using System.Data; +using System.Data.Entity; using System.Data.OleDb; +using System.Diagnostics; +using System.Globalization; +using System.IO; +using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using System.Configuration; -using System.IO; -using System.Linq; -using System.Globalization; -using Model; public partial class admin_follower_reg : MyWeb.config { private Model.ezEntities _db = new Model.ezEntities(); public ArrayList _tmp = new ArrayList(); + public bool isDataChanged = false; + public bool isAutoNumbering = ConfigurationManager.AppSettings["IsAutoNumbering"].ToString() == "true" ? true : false; protected void Page_Load(object sender, EventArgs e) { CallAjax(); if (!IsPostBack) - { + { InitEnumsOptions(identity_type); //身分別 //var qry = _db.followers.AsEnumerable(); - var qry = _db.followers.AsQueryable(); - + var qry = _db.followers.AsQueryable(); + if (isStrNull(Request["num"])) { + if (!isAutoNumbering) + { + f_number.ReadOnly = false; + } + if (!isStrNull(Request["leader"])) { int _num = Val(Request["leader"]); @@ -50,9 +60,14 @@ public partial class admin_follower_reg : MyWeb.config //預設國籍 country.Value = "158"; country_txt.Value = "中華民國(台灣)"; + + // 預設加入日期 + join_date.Text = DateTime.Now.ToString("yyyy-MM-dd"); } else { + f_number.ReadOnly = true; + int _num = Val(Request["num"]); var prod = qry.Where(q => q.num == _num).FirstOrDefault(); if (prod != null) @@ -206,8 +221,11 @@ public partial class admin_follower_reg : MyWeb.config } } } - // 使用新的 generate_f_number 方法，已內建重號檢查和重試機制 - followers.f_number = follower.generate_f_number(sex.SelectedValue); + if (isAutoNumbering) + { + // 使用新的 generate_f_number 方法，已內建重號檢查和重試機制 + followers.f_number = follower.generate_f_number(sex.SelectedValue); + } followers.identity_type = Val(identity_type.SelectedValue); if(!isStrNull(leader.Value)) followers.leader = Val(leader.Value); if (!isStrNull(country.Value)) followers.country = country.Value; @@ -239,7 +257,9 @@ public partial class admin_follower_reg : MyWeb.config Model.admin_log admin_log = new Model.admin_log(); admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Insert, f_number.Text + u_name.Text); - + + Session["LastAddedID"] = followers.f_number; + Response.Redirect("index.aspx"); } else @@ -282,7 +302,7 @@ public partial class admin_follower_reg : MyWeb.config try { foreach (Control obj in cardBodyPanel.Controls) - { + { if (obj is TextBox) { var ObjValue = followers.GetType().GetProperty(obj.ID); @@ -300,7 +320,7 @@ public partial class admin_follower_reg : MyWeb.config ObjValue.SetValue(followers, null); } - + } @@ -310,22 +330,60 @@ public partial class admin_follower_reg : MyWeb.config followers.sex = sex.SelectedValue; followers.blood = blood.SelectedValue; followers.tab = tab.Value.Trim(','); - followers.admin_log = admin.info.u_id + " " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"); + //followers.admin_log = admin.info.u_id + " " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"); followers.follower_hash = encrypt.followerHash(followers.phone, followers.id_code); - + // 如果啟用 search_keywords 功能，生成並更新 search_keywords if (GlobalVariables.UseSearchKeywords) { followers.search_keywords = encrypt.GenerateSearchKeywords(followers); } - - _db.SaveChanges(); - Model.admin_log admin_log = new Model.admin_log(); - admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Update, f_number.Text + u_name.Text); + // 檢查是否有修改資料 + var entry = _db.Entry(followers); + this.isDataChanged = entry.CurrentValues.PropertyNames.Any(name => + { + if (name == "admin_log" || name == "follower_hash") + return false; - Response.Redirect("index.aspx?page=" + Convert.ToString(Request["page"])); + var originalVal = entry.OriginalValues[name]?.ToString(); + var currentVal = entry.CurrentValues[name]?.ToString(); + // 針對加密欄位進行特殊處理 + bool isEncryptedField = (name == "phone" || name == "id_code"); + + if (isEncryptedField) + { + string originalPlain = !string.IsNullOrEmpty(originalVal) ? encrypt.DecryptAutoKey(originalVal) : ""; + string currentPlain = !string.IsNullOrEmpty(currentVal) ? encrypt.DecryptAutoKey(currentVal) : ""; + return originalPlain.Trim() != currentPlain.Trim(); + } + + return !object.Equals(originalVal, currentVal); + }); + + if (this.isDataChanged) + { + followers.admin_log = admin.info.u_id + " " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"); + } + else + { + entry.State = EntityState.Unchanged; + } + + int isDataSaved = _db.SaveChanges(); + if (isDataSaved > 0) + { + //L_msg.Type = alert_type.success; + //L_msg.Text = "修改成功"; + Model.admin_log admin_log = new Model.admin_log(); + admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Update, f_number.Text + u_name.Text); + Response.Redirect("index.aspx?dirty=1&page=" + Convert.ToString(Request["page"])); + } + else + { + Response.Redirect("index.aspx?page=" + Convert.ToString(Request["page"])); + } } catch (Exception ex) { @@ -339,7 +397,7 @@ public partial class admin_follower_reg : MyWeb.config L_msg.Type = alert_type.danger; L_msg.Text = "查無資料"; } - /* + /* if (chk_pro_num(f_number.Text, Val(Request["num"]))) { } @@ -349,7 +407,7 @@ public partial class admin_follower_reg : MyWeb.config L_msg.Text = "信眾編號重複"; } */ - } + } } #endregion diff --git a/web/admin/menu.ascx b/web/admin/menu.ascx index b379ba8..8647bdc 100644 --- a/web/admin/menu.ascx +++ b/web/admin/menu.ascx @@ -8,7 +8,7 @@
    -
  • " +
  • " target="<%#(ValString(Eval("target"))=="B"?"_blank":"_self") %>"><%#Eval("title") %>
    •      diff --git a/web/admin/order/index.aspx b/web/admin/order/index.aspx index f4e13da..1b9cca3 100644 --- a/web/admin/order/index.aspx +++ b/web/admin/order/index.aspx @@ -39,6 +39,7 @@ vuetify: new Vuetify(vuetify_options), data() { return { + isFirstLoad: true, this_act : '<%= Request["act_id"]%>', options: { multiSort: false }, search_options: { multiSort: false }, @@ -211,9 +212,13 @@ this.initActivity(); const navEntries = performance.getEntriesByType("navigation"); const isReload = navEntries.length > 0 && navEntries[0].type === "reload"; + const isBackForward = navEntries.length > 0 && navEntries[0].type === "back_forward"; if (isReload) { sessionStorage.removeItem("orderpage"); } + else if (isBackForward) { + this.isFirstLoad = false; + } else { const savedPage = parseInt(sessionStorage.getItem('orderpage')); if (savedPage) { @@ -224,6 +229,11 @@ watch: { options: { handler() { + if (this.isFirstLoad) { + this.isFirstLoad = false; + this.data_table.loading = false; + return; + } this.getDefault() }, deep: true, @@ -368,7 +378,8 @@ //} //this.data_table.selected = []; //this.data_table.count = this.data_table.list.length - location.reload(); + //location.reload(); + this.getDefault(); }) .catch(error => console.log(error)) } @@ -537,7 +548,7 @@ initActivity() { axios.get(HTTP_HOST + 'api/activity') .then(response => { - this.select_act_list = response.data + this.select_act_list = response.data }) .catch(error => { console.log(error) diff --git a/web/admin/order/reg.aspx b/web/admin/order/reg.aspx index 50bd964..a702fce 100644 --- a/web/admin/order/reg.aspx +++ b/web/admin/order/reg.aspx @@ -526,7 +526,7 @@ window.addEventListener('message', async (event) => { if (event.data.source === 'editor.btn.click') { const receivedData = event.data.data; - + // 更新編輯中的項目 //if (receivedData.tabletItem && this.editedIndex > -1) { if (receivedData.tabletItem) { @@ -807,7 +807,7 @@ isValidDate = Date.parse(item.pay_date); if (!isNaN(isValidDate)) item.pay_date = new Date(item.pay_date).format("yyyy-MM-dd") - + console.log(item); this.editedItem = $.extend(true, {}, item); this.data_dialog.show = true; this.data_dialog.isAddNew = false; @@ -971,9 +971,11 @@ /* (this.editedItem.category=="1"? this.editedItem.from_id_selected.val != 0 : true) &&*/ this.requireData(this.editedItem.qty, (this.editedItem.num == 0 ? false : true)) ) /* qty為0視為不需要此項目,不儲存此筆資料*/ { + console.log(this.editedItem); //check price if (this.editedItem.pay <= this.editedItem.price * this.editedItem.qty) { - + console.log(this.editedItem.f_num_selected.val); + console.log(this.editedItem.from_id_selected.val); //check qty //數量不可小於掛單明細的數量 if (this.editedItem.qty >= this.editedItem.writeBedQty + this.editedItem.notBedQty) { diff --git a/web/admin/order/reg.aspx.cs b/web/admin/order/reg.aspx.cs index decce99..e63f365 100644 --- a/web/admin/order/reg.aspx.cs +++ b/web/admin/order/reg.aspx.cs @@ -1,15 +1,16 @@ -using System; +using DocumentFormat.OpenXml.Spreadsheet; +using System; using System.Collections; using System.Collections.Generic; +using System.Configuration; using System.Data; +using System.Data.Entity.Infrastructure; using System.Data.OleDb; +using System.IO; +using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using System.Configuration; -using System.IO; -using System.Linq; -using System.Data.Entity.Infrastructure; public partial class admin_order_reg : MyWeb.config { @@ -187,16 +188,26 @@ public partial class admin_order_reg : MyWeb.config { if (!isStrNull(pro_order.order_no)) { - _db.pro_order.Add(pro_order); - _db.SaveChanges(); + bool isRegistered = _db.pro_order.Any(x => x.f_num == pro_order.f_num && x.activity_num == pro_order.activity_num); - Model.admin_log admin_log = new Model.admin_log(); - admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Order, (int)Model.admin_log.Status.Insert, pro_order.order_no); + if (isRegistered) // 重複報名 + { + L_msg.Type = alert_type.warning; + L_msg.Text = "此信眾已報名過本活動"; + } + else + { + _db.pro_order.Add(pro_order); + _db.SaveChanges(); + + Model.admin_log admin_log = new Model.admin_log(); + admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Order, (int)Model.admin_log.Status.Insert, pro_order.order_no); - string url = "index.aspx"; - url = "reg.aspx?order_no=" + pro_order.order_no; - Response.Redirect(url); + string url = "index.aspx"; + url = "reg.aspx?order_no=" + pro_order.order_no; + Response.Redirect(url); + } } else { diff --git a/web/web.config b/web/web.config index 466bace..81d4ae7 100644 --- a/web/web.config +++ b/web/web.config @@ -42,11 +42,13 @@ + + - - + +