[WHAT] Company欄位名稱調整 [WHY] 開發 ShowEasy 前台

EuroTran/EasyBL.WEBAPP/ShowEasy/CompanyMaintain_QryService.cs

@@ -43,30 +43,12 @@ namespace EasyBL.WEBAPP.SYS
                         })
                         .ToList();
 
-                    RegionMaintain_QryService region_qry = new RegionMaintain_QryService();
                     CountryMaintain_QryService country_qry = new CountryMaintain_QryService();
-                    CityMaintain_QryService city_qry = new CityMaintain_QryService();
 
-                    var RegionMap = region_qry.FindAllByIDsAsDictionary(sLanguageID, "");
                     var CountryMap = country_qry.FindAllByIDsAsDictionary(sLanguageID, "", "");
-                    var CityMap = city_qry.FindAllByIDsAsDictionary(sLanguageID, "", "", "");
 
                     foreach (var Company in rsCompanyList) {
 
-                        if (!string.IsNullOrEmpty(Company.RegionID))
-                        {
-
-                            if (RegionMap.ContainsKey(Company.RegionID))
-                            {
-
-                                var Region = RegionMap[Company.RegionID];
-                                Company.Region.RegionID = Region.RegionID;
-                                Company.Region.RegionName = Region.RegionName;
-
-                            }
-
-                        }
-
                         if (!string.IsNullOrEmpty(Company.CountryID))
                         {
 
@@ -80,20 +62,6 @@ namespace EasyBL.WEBAPP.SYS
 
                         }
 
-                        if (!string.IsNullOrEmpty(Company.CityID))
-                        {
-
-                            if (CityMap.ContainsKey(Company.CityID))
-                            {
-
-                                var City = CityMap[Company.CityID];
-                                Company.City.CityID = City.CityID;
-                                Company.City.CityName = City.CityName;
-
-                            }
-
-                        }
-
                         rsResultList.Add(Company);
                     }
 

EuroTran/Entity/Sugar/SETB_CRM_Company.cs

@@ -54,24 +54,25 @@ namespace Entity.Sugar
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string RegionID { get; set; }
-        public const string CN_REGIONID = "RegionID";
+        public string CountryID { get; set; }
+        public const string CN_COUNTRYID = "CountryID";
 
         /// <summary>
         /// Desc:
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string CountryID { get; set; }
-        public const string CN_COUNTRYID = "CountryID";
+        public string StateName { get; set; }
+        public const string CN_StateName = "StateName";
+
 
         /// <summary>
         /// Desc:
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string CityID { get; set; }
-        public const string CN_CITYID = "CityID";
+        public string CityName { get; set; }
+        public const string CN_CityName = "CityName";
 
         /// <summary>
         /// Desc: