Merge branch 'main' of http://60.209.125.238:20010/hanxuntao/D7QUANTAI

DSWeb/Areas/CommMng/Models/PubSysModel.cs

@@ -254,6 +254,8 @@ namespace DSWeb.Areas.CommMng.Models
 
         private List<tSysEnumValue_md> 账单费用名称配置 { get; set; }
 
+        private List<tSysEnumValue_md> 台湾价格港口 { 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)
                     {