Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasy into Dev

EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs

@@ -1208,14 +1208,23 @@ namespace EasyBL.WEBAPP.ShowEasy
                     }
 
 
-                    var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline>()
-                            //搜尋條件
-                            .Where(x => x.OrgID == sORIGID && x.BookingID == strBookingID)
-                           .Select((t1) => new View_SAL_BookingOnline
-                           {
-                               BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID),
+                    var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Exhibition>
+                    ((t1, t2, t3) =>
+                    new object[] {
+                                            JoinType.Left, t1.ServiceID == t2.ServiceID && t1.OrgID==t2.OrgID && t1.LangType==t2.LangID,
+                                            JoinType.Left, t1.OrgID == t3.OrgID && t1.ExhibitionID == t3.ExhibitionID && t1.LangType == t3.LanguageID
+                            }
+                    )
+                    .Where((t1, t2, t3) => t1.OrgID == sORIGID && t1.BookingID == strBookingID)
+                    .Select((t1, t2, t3) => new View_SAL_BookingOnline
+                    {
+                        BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID),
+                        ServiceName = t2.ServiceName,
+                        ExhibitionName = t3.ExhibitionName
+
+                    })
+                    .Single();
 
-                           }).Single();
                     if (objBookingOnline != null) {
                         if (objBookingOnline.BookingDate!=null) {
                             objBookingOnline.BookingDateFormat = Convert.ToDateTime(objBookingOnline.BookingDate).ToString("yyyy/MM/dd HH:mm");

EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs

@@ -18,7 +18,7 @@ namespace Entity.ViewModels
         public SETB_CMS_Member Member = new SETB_CMS_Member();
 
 
-        //public string MemberName { get; set; }
+        public string ExhibitionName { get; set; }
         //public string MemberName { get; set; }
     }
 }