From 5a4fa96f969534f00e2ecc45c94cbfc800f54e4b Mon Sep 17 00:00:00 2001
From: alina <1449359159@qq.com>
Date: Tue, 21 Feb 2023 17:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=A1=E8=BB=8A=E6=8A=BC?=
 =?UTF-8?q?=E8=BB=8A=E8=B2=BB=E7=94=A8=E8=A6=8F=E5=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShowEasy/ONSiteMaintain_QryService.cs           | 13 +++++++++++++
 EuroTran/Entity/ShowEasyDtos/ONSiteBaseInfoDTO.cs   |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs
index 04c05a0..b43c088 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/ONSiteMaintain_QryService.cs
@@ -1797,6 +1797,19 @@ namespace EasyBL.WEBAPP.ShowEasy
 
                             objONSiteItem.TruckMarkupByModel = lstTruckMarkupByModel;
 
+
+                            //卡車押車費用表
+                            if (objONSiteItem.EscortFreeCityID != null) {
+
+                                var lstTruckEscortCostRules = db.Queryable<SETB_PDT_ServiceTruckCostRules>()
+                                                       .Where(x => x.QSID == objONSiteItem.Guid && x.CityID == objONSiteItem.EscortFreeCityID)
+                                                       .Select(x => new ServiceTruckCostRulesDTO { TruckID = x.TruckID, CityID = x.CityID, Price = x.Price })
+                                                       .ToList();
+
+
+                                objONSiteItem.TruckEscortCostRules = lstTruckEscortCostRules;
+
+                            }
                         }
                         else
                         {
diff --git a/EuroTran/Entity/ShowEasyDtos/ONSiteBaseInfoDTO.cs b/EuroTran/Entity/ShowEasyDtos/ONSiteBaseInfoDTO.cs
index 67d33ce..331d3f0 100644
--- a/EuroTran/Entity/ShowEasyDtos/ONSiteBaseInfoDTO.cs
+++ b/EuroTran/Entity/ShowEasyDtos/ONSiteBaseInfoDTO.cs
@@ -194,6 +194,11 @@ namespace Entity.ShowEasyDtos
         //卡車車型加價
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public List<ServiceTruckOtherCostDTO> TruckMarkupByModel = new List<ServiceTruckOtherCostDTO>();
+
+        //卡車押車費用規則
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public List<ServiceTruckCostRulesDTO> TruckEscortCostRules = new List<ServiceTruckCostRulesDTO>();
+
         //非卡車，堆高機費用規則
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public List<ONSiteOtherCostRulesDTO> OtherCostRules = new List<ONSiteOtherCostRulesDTO>();