From 36111f28cd6458fcb7aa558337acf22dc2434863 Mon Sep 17 00:00:00 2001
From: dengyu <ddlucky@sina.com>
Date: Mon, 30 Sep 2024 14:23:16 +0800
Subject: [PATCH] 20240930

---
 DSWeb.Common/DB/Comm.cs                   | 10 ++++++++++
 DSWeb/Areas/CommMng/Models/PubSysModel.cs | 12 ++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/DSWeb.Common/DB/Comm.cs b/DSWeb.Common/DB/Comm.cs
index 6d7d334..8862c04 100644
--- a/DSWeb.Common/DB/Comm.cs
+++ b/DSWeb.Common/DB/Comm.cs
@@ -2702,6 +2702,16 @@ namespace DSWeb.Common.DB
         public bool? BSSTATUS { get; set; }
         public bool? FEESTATUS { get; set; }
         public long? DJYID { get; set; }
+
+        public DateTime? BSDATE { get; set; }
+
+        public string FORWARDER { get; set; }
+
+        public string LANE { get; set; }
+        public string PORTDISCHARGE { get; set; }
+        public string OP { get; set; }
+        public string VESSEL { get; set; }
+        public string VOYNO { get; set; }
     }
 
     ///// <summary>
diff --git a/DSWeb/Areas/CommMng/Models/PubSysModel.cs b/DSWeb/Areas/CommMng/Models/PubSysModel.cs
index 5a5e7c6..e759878 100644
--- a/DSWeb/Areas/CommMng/Models/PubSysModel.cs
+++ b/DSWeb/Areas/CommMng/Models/PubSysModel.cs
@@ -216,13 +216,15 @@ namespace DSWeb.Areas.CommMng.Models
 
         public Bill_Head BillHead { get; set; }
 
-        public opseae_md head { get; set; }
+        public op_seae_md head { get; set; }
         public List<op_ctn_md> ctnList { get; set; }
 
         public Int32 CtnNum { get; set; }
 
         public List<ch_fee_md> NewFeeList { get; set; }
 
+        private List<code_fee_md> codefeelist { get; set; }
+
         private void addfee(ch_fee_md fee) {
             if (NewFeeList == null) NewFeeList = new List<ch_fee_md>();
             fee.CUSTOMERTYPE = "订舱代理";
@@ -325,6 +327,8 @@ namespace DSWeb.Areas.CommMng.Models
 
             CanMake = new DBResult();
 
+            codefeelist = cdc.code_fee.Where(x => 1 == 1).ToList();
+
             var opseaeList = cdc.OP_SEAE.Where(x => x.MBLNO == BillHead.bill_no).ToList();
 
             if (opseaeList == null || opseaeList.Count == 0) {
@@ -649,7 +653,7 @@ namespace DSWeb.Areas.CommMng.Models
 
                         码头操作费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == price).REMARK += ";"+ ctn.CNTRNO;
 
-                        码头操作费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == price).setTax();
+                        码头操作费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == price).setTax(codefeelist);
                     }
                     else
                     {
@@ -790,7 +794,7 @@ namespace DSWeb.Areas.CommMng.Models
 
                             海运费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == newfee.UNITPRICE).REMARK += ";" + ctn.CNTRNO;
 
-                            海运费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == newfee.UNITPRICE).setTax();
+                            海运费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == newfee.UNITPRICE).setTax(codefeelist);
                         }
                         else
                         {
@@ -932,7 +936,7 @@ namespace DSWeb.Areas.CommMng.Models
                         码头操作费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == price && x.FEENAME == FEENAME).AMOUNT += amount;
 
                         码头操作费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == price && x.FEENAME == FEENAME).REMARK += ";" + ctn.CNTRNO;
-                        码头操作费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == price && x.FEENAME == FEENAME).setTax();
+                        码头操作费List.First(x => x.UNIT == ctn.CTNALL && x.UNITPRICE == price && x.FEENAME == FEENAME).setTax(codefeelist);
                     }
                     else
                     {