diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs index a4ed7ac..0e9219b 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs @@ -1414,7 +1414,7 @@ namespace EasyBL.WEBAPP.ShowEasy new object[] { JoinType.Left, t1.OrgID == t2.OrgID && t1.ItemType == t2.ArgumentID && t2.ArgumentClassID=="ServiceItem" } ) - .Where((t1, t2) => t1.Effective == "Y" && t1.LangID== sLanguageID && t1.OrgID== sORIGID && t1.ServiceID== sServiceID && t2.ArgumentClassID== "ServiceItem" && t1.ItemType!="02") + .Where((t1, t2) => t1.Effective == "Y" && t1.LangID== sLanguageID && t1.OrgID== sORIGID && t1.ServiceID== sServiceID && t2.ArgumentClassID== "ServiceItem") .Select((t1, t2) => new ArgumentDTO { ArgumentID =t1.Guid, @@ -1749,7 +1749,7 @@ namespace EasyBL.WEBAPP.ShowEasy //堆高機 var lstServiceCostRules = db.Queryable() .Where(x => x.QSID == objONSiteItem.Guid) - .OrderBy(x => x.CreateDate) + .OrderBy(x => x.Weight_Min) .Select(x => new ServiceCostRulesDTO { Guid = x.Guid, Weight_Min = x.Weight_Min, Weight_Max = x.Weight_Max, Price = x.Price, PricingMode = x.PricingMode, Memo = x.Memo, CreateDate = x.CreateDate }) .ToList(); diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_UpdService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_UpdService.cs index 42b0091..bbc1ae1 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_UpdService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_UpdService.cs @@ -233,7 +233,7 @@ namespace EasyBL.WEBAPP.ShowEasy //堆高機 var lstServiceCostRules = db.Queryable() .WhereIF(!string.IsNullOrEmpty(sPlanID), x => x.QSID == sPlanID) - .OrderBy(x => x.CreateDate) + .OrderBy(x => x.Weight_Min) .Select(x => new View_PDT_ServiceCostRules { Guid = x.Guid, QSID = x.QSID, Weight_Min = x.Weight_Min, Weight_Max = x.Weight_Max, Price = x.Price, PricingMode = x.PricingMode, Memo = x.Memo, CreateDate = x.CreateDate }) .ToList(); diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/ServiceQSMaintain_UpdService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/ServiceQSMaintain_UpdService.cs index 213277b..e20ae36 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/ServiceQSMaintain_UpdService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/ServiceQSMaintain_UpdService.cs @@ -65,7 +65,7 @@ namespace EasyBL.WEBAPP.ShowEasy //堆高機 var lstServiceCostRules = db.Queryable() .WhereIF(!string.IsNullOrEmpty(sQSID), x => x.QSID == sQSID) - .OrderBy(x => x.CreateDate) + .OrderBy(x => x.Weight_Min) .Select(x => new View_PDT_ServiceCostRules { Guid = x.Guid, QSID = x.QSID, Weight_Min = x.Weight_Min, Weight_Max = x.Weight_Max, Price = x.Price, PricingMode = x.PricingMode, Memo = x.Memo, CreateDate = x.CreateDate }) .ToList();