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) {