From 4f65092f411939f50bb1bd484327053cb880bb97 Mon Sep 17 00:00:00 2001 From: alina <1449359159@qq.com> Date: Thu, 2 Mar 2023 16:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A0=86=E9=AB=98=E6=A9=9F=E8=B2=BB=E7=94=A8?= =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9=E5=92=8C=E6=9C=8D?= =?UTF-8?q?=E5=8B=99=E9=A1=9E=E5=9E=8B=E6=9F=A5=E8=A9=A2=E5=8D=A1=E8=BB=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs | 4 ++-- EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_UpdService.cs | 2 +- .../EasyBL.WEBAPP/ShowEasy/ServiceQSMaintain_UpdService.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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();