From 72755898b67e4914012f30f008dcfaef0e57d027 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Thu, 4 Jul 2024 10:27:50 +0800 Subject: [PATCH] =?UTF-8?q?20240704=20=E5=85=A8=E6=B3=B0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DSWeb/Areas/CommMng/Models/PubSysModel.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/DSWeb/Areas/CommMng/Models/PubSysModel.cs b/DSWeb/Areas/CommMng/Models/PubSysModel.cs index 1283b5d..714273c 100644 --- a/DSWeb/Areas/CommMng/Models/PubSysModel.cs +++ b/DSWeb/Areas/CommMng/Models/PubSysModel.cs @@ -254,6 +254,8 @@ namespace DSWeb.Areas.CommMng.Models private List 账单费用名称配置 { get; set; } + private List 台湾价格港口 { get; set; } + private decimal GetPrice(string BILLFeeName) { if (拆分费用参数.Exists(x => x.EnumValueID == BILLFeeName)) { return Convert.ToDecimal(拆分费用参数.First(x => x.EnumValueID == BILLFeeName).EnumValueName); @@ -377,6 +379,8 @@ namespace DSWeb.Areas.CommMng.Models 账单费用名称配置 = cdc.tSysEnumValue.Where(x => x.EnumTypeID == 46).ToList(); + 账单费用名称配置 = cdc.tSysEnumValue.Where(x => x.EnumTypeID == 47).ToList(); + var currfee = cdc.ch_fee.Where(x => x.BSNO == head.BSNO).ToList(); @@ -639,7 +643,11 @@ namespace DSWeb.Areas.CommMng.Models var ctn20 = GetPrice("20"); var ctn40 = GetPrice("40"); - if (head.PORTDISCHARGE == "KAOHSIUNG") + var All40RH = GetPrice("40RH"); + + + + if (台湾价格港口.Exists(x=>x.EnumValueName== head.PORTDISCHARGE) ) { foreach (var ctn in ctnList) { @@ -945,7 +953,8 @@ namespace DSWeb.Areas.CommMng.Models var ctn20 = GetPrice("20"); var ctn40 = GetPrice("40"); - if (head.PORTDISCHARGE == "KAOHSIUNG") + //if (head.PORTDISCHARGE == "KAOHSIUNG") + if (台湾价格港口.Exists(x=>x.EnumValueName== head.PORTDISCHARGE)) { foreach (var ctn in ctnList) {