添加幣別Name

EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs

@@ -1565,15 +1565,16 @@ namespace EasyBL.WEBAPP.ShowEasy
                 do
                 {
                     var sORIGID = WebAppGlobalConstWord.TG_ORGID;
-                     objONSiteBaseInfo = db.Queryable<SETB_PDT_ONSiteBaseInfo,OTB_SYS_Arguments>((t1, t2) =>
+                     objONSiteBaseInfo = db.Queryable<SETB_PDT_ONSiteBaseInfo,OTB_SYS_Arguments, OTB_SYS_Arguments>((t1, t2,t3) =>
                      new object[] {
-                                JoinType.Left, t1.OrgID == t2.OrgID && t1.ConfirmDays == t2.ArgumentID && t2.ArgumentClassID=="OrderConfirmDays"
+                                JoinType.Left, t1.OrgID == t2.OrgID && t1.ConfirmDays == t2.ArgumentID && t2.ArgumentClassID=="OrderConfirmDays",
+                                JoinType.Left, t1.OrgID == t3.OrgID && t1.CurrencyID == t3.ArgumentID && t3.ArgumentClassID=="Currency"
 
                       }
                         )
                         //搜尋條件
                         .Where((t1) => t1.OrgID == sORIGID && t1.ServiceID == sServiceID && t1.LangID == sLanguageID)
-                        .Select((t1, t2) => new ONSiteBaseInfoDTO
+                        .Select((t1, t2, t3) => new ONSiteBaseInfoDTO
                         {
                             ServiceID = t1.ServiceID,
                             ServiceNo=t1.ServiceNo,
@@ -1585,6 +1586,7 @@ namespace EasyBL.WEBAPP.ShowEasy
                             Details=t1.Details,
                             MinPrice=t1.MinPrice,
                             CurrencyID=t1.CurrencyID,
+                            CurrencyName=t3.ArgumentValue,
                             ExpenseDescription =""
 
                         }).Single();

EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs

@@ -232,10 +232,11 @@ namespace EasyBL.WEBAPP.ShowEasy
                     };
                     var iPageCount = 0;
                     var sORIGID = WebAppGlobalConstWord.TG_ORGID;
-                    pml.DataList = db.Queryable<SETB_PDT_ONSiteBaseInfo, SETB_SCM_Supplier>
-                        ((t1, t2) =>
+                    pml.DataList = db.Queryable<SETB_PDT_ONSiteBaseInfo, SETB_SCM_Supplier,OTB_SYS_Arguments>
+                        ((t1, t2,t3) =>
                         new object[] {
-                                JoinType.Left, t1.OrgID == t2.OrgID && t1.SupplierID == t2.SupplierID  && t1.LangID == t2.LangType
+                                JoinType.Left, t1.OrgID == t2.OrgID && t1.SupplierID == t2.SupplierID  && t1.LangID == t2.LangType,
+                                 JoinType.Left, t1.OrgID == t3.OrgID && t1.CurrencyID == t3.ArgumentID && t3.ArgumentClassID=="Currency" ,
                               }
                         )
                         .Where((t1) => t1.LangID == sLangID && t1.Effective == "Y" && t1.OrgID == sORIGID)
@@ -245,7 +246,7 @@ namespace EasyBL.WEBAPP.ShowEasy
                          .WhereIF(!string.IsNullOrEmpty(sLocations), (t1) => t1.SuitPlace.Contains(sLocations))
                          .WhereIF(iMinPrice != 0 && iMaxPrice != 0, (t1) => t1.MinPrice >= iMinPrice)
                          .WhereIF(iMinPrice != 0 && iMaxPrice != 0, (t1) => t1.MinPrice <= iMaxPrice)
-                        .Select((t1, t2) => new ONSiteBaseListDTO
+                        .Select((t1, t2,t3) => new ONSiteBaseListDTO
                         {
 
                             ServiceID = t1.ServiceID,
@@ -256,7 +257,8 @@ namespace EasyBL.WEBAPP.ShowEasy
                             PlaceName = "",
                             ServiceCategoryName = t1.SubCategoryID,
                             ServiceNo = t1.ServiceNo,
-                            CurrencyID = t1.CurrencyID
+                            CurrencyID = t1.CurrencyID,
+                            CurrencyName=t3.ArgumentValue
 
                         })
                         .OrderBy(sSortField, sSortOrder)

EuroTran/Entity/ShowEasyDtos/ONSiteBaseInfoDTO.cs

@@ -41,6 +41,7 @@ namespace Entity.ShowEasyDtos
         public int? MinPrice { get; set; }
 
         public string CurrencyID { get; set; }
+        public string CurrencyName { get; set; }
         //public string SupplierID { get; set; }
 
         //public string CurrencyID { get; set; }
@@ -90,6 +91,7 @@ namespace Entity.ShowEasyDtos
 
         public string LangID { get; set; }
         public string CurrencyID { get; set; }
+        public string CurrencyName { get; set; }
     }
 
     public class FQADTO