diff --git a/AMESCoreStudio.WebApi/Code/CustomContractResolver.cs b/AMESCoreStudio.WebApi/Code/CustomContractResolver.cs
index 56e2423f..65e862c9 100644
--- a/AMESCoreStudio.WebApi/Code/CustomContractResolver.cs
+++ b/AMESCoreStudio.WebApi/Code/CustomContractResolver.cs
@@ -8,14 +8,15 @@ using System.Reflection;
namespace AMESCoreStudio.WebApi
{
- public class CustomContractResolver : DefaultContractResolver
+ public class CustomContractResolver : CamelCasePropertyNamesContractResolver
{
+ //public static CustomContractResolver Instance { get; } = new CustomContractResolver();
public static CustomContractResolver Instance { get; } = new CustomContractResolver();
protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
{
JsonProperty property = base.CreateProperty(member, memberSerialization);
- if (member.Name == "LazyLoader")
+ if (member.Name == "lazyLoader")
{
property.Ignored = true;
}
diff --git a/AMESCoreStudio.WebApi/Models/AMES/FactoryInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/FactoryInfo.cs
deleted file mode 100644
index da913c68..00000000
--- a/AMESCoreStudio.WebApi/Models/AMES/FactoryInfo.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Runtime.Serialization;
-
-namespace AMESCoreStudio.WebApi.Models.AMES
-{
- ///
- /// 用户资料表
- ///
- [Table("FACTORY_INFO", Schema = "JHAMES")]
- [DataContract]
- public class FactoryInfo
- {
- ///
- /// 廠別ID
- ///
- [Key]
- [Column("FACTORY_ID")]
- [Required(ErrorMessage = "{0},不能空白")]
- [DataMember]
- public decimal FactoryID { get; set; }
-
- ///
- /// 廠別中文名稱
- ///
- [Column("FACTORY_NAME_CH")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "廠別中文名稱")]
- public string FactoryNameCH { get; set; }
-
- ///
- /// 廠別英文名稱
- ///
- [Column("FACTORY_NAME_EN")]
- [DataMember]
- [Display(Name = "廠別英文名稱")]
- public string FactoryNameEN { get; set; }
-
- ///
- /// 電話
- ///
- [Column("TEL_NO")]
- [DataMember]
- [Display(Name = "電話")]
- public string TelNO { get; set; }
-
- ///
- /// 傳真
- ///
- [Column("FAX_NO")]
- [DataMember]
- [Display(Name = "傳真")]
- public string FaxNO { get; set; }
-
- ///
- /// 地址
- ///
- [Column("ADDRESS")]
- [DataMember]
- [Display(Name = "地址")]
- public string Address { get; set; }
-
- ///
- /// 地區
- ///
- [Column("COUNTRY_ID")]
- [DataMember]
- [Display(Name = "地區")]
- public string CountryID { get; set; }
-
- ///
- ///
- ///
- [Column("ORG_ID")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "")]
- public decimal OrgID { get; set; }
-
- ///
- /// 建立者
- ///
- [Column("CREATE_USERID")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "建立者")]
- public decimal CreateUserID { get; set; }
-
- ///
- /// 建立日期
- ///
- [Column("CREATE_DATE")]
- [DataMember]
- [Display(Name = "建立日期")]
- public DateTime CreateDate { get; set; }
-
- ///
- /// 修改日期
- ///
- [Column("UPDATE_DATE")]
- [DataMember]
- [Display(Name = "修改日期")]
- public DateTime UpdateDate { get; set; }
-
- ///
- /// 廠別代碼
- ///
- [Column("FACTORY_NO")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "廠別代碼")]
- public string FactoryNO { get; set; }
-
- ///
- /// 區域
- ///
- [Column("FACTORY_CODE")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "區域")]
- public string FactoryCode { get; set; }
-
- ///
- ///
- ///
- [Column("VIRTUAL_FLAG")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "")]
- public string VirtualFlag { get; set; }
-
- ///
- /// 廠別狀態
- ///
- [Column("STATUS_NO")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "廠別狀態")]
- public string StatusNO { get; set; }
-
- }
-}
\ No newline at end of file
diff --git a/AMESCoreStudio.WebApi/Models/AMES/FactoryUnit.cs b/AMESCoreStudio.WebApi/Models/AMES/FactoryUnit.cs
deleted file mode 100644
index a5c463f4..00000000
--- a/AMESCoreStudio.WebApi/Models/AMES/FactoryUnit.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Runtime.Serialization;
-
-namespace AMESCoreStudio.WebApi.Models.AMES
-{
- ///
- /// 用户资料表
- ///
- [Table("FACTORY_UNIT", Schema = "JHAMES")]
- [DataContract]
- public class FactoryUnit
- {
- ///
- ///
- ///
- [Key]
- [Column("UNIT_NO")]
- [DataMember]
- public string UnitNO { get; set; }
-
- ///
- ///
- ///
- [Column("UNIT_NAME")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "")]
- public string UnitName { get; set; }
-
- ///
- ///
- ///
- [Column("UNIT_CODE")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "")]
- public string UnitCode { get; set; }
-
- ///
- ///
- ///
- [Column("SEQ")]
- [DataMember]
- [Required(ErrorMessage = "{0},不能空白")]
- [Display(Name = "")]
- public decimal SEQ { get; set; }
-
- }
-}