Revert "关贸云对接，费用名称改为通过code_fee_edi对应"

This reverts commit 908d2e3ee9.

DSWeb.Common/DB/Comm.cs

@@ -1528,19 +1528,6 @@ namespace DSWeb.Common.DB
         #endregion
     }
 
-    [Table("code_fee_edi")]
-    public partial class code_fee_edi_md
-    {
-        [Key]
-        public int ID { get; set; }
-        public string FEEENAME { get; set; }
-        public string FEENAME { get; set; }
-
-        #region 外键 => 导航属性，ManyToMany
-
-        #endregion
-    }
-
 
     [Table("op_seae_edi")]
 

DSWeb.Common/DB/CommonDataContext.cs

@@ -84,8 +84,7 @@ namespace DSWeb.Common.DB
         public DbSet<Receipt_Doc_md> Receipt_Doc { get; set; }
 
         public DbSet<code_cust_edi_md> code_cust_edi { get; set; }
-        public DbSet<code_fee_edi_md> code_fee_edi { get; set; }
-        
+
         public DbSet<op_seae_edi_md> op_seae_edi { get; set; }
         public DbSet<op_seae_edi_ctn_md> op_seae_edi_ctn { get; set; }
 

DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs

@@ -20,7 +20,6 @@ using DSWeb.MvcShipping.Helper;
 using DSWeb.MvcShipping.Helper.Repository;
 using DSWeb.MvcShipping.Models.MsInfoClient;
 using DSWeb.MvcShipping.Models.MsOpApply;
-using DSWeb.ParameterSet;
 using DSWeb.SoftMng.Model;
 using DSWeb.TruckMng.Comm.Cookie;
 
@@ -229,11 +228,7 @@ namespace DSWeb.Areas.CommMng.DAL
                 feecustidList.Add(costs.COAGENT_ID.ToString());
             }
 
-            var feecodelist=new List<string>();
-            foreach (var costs in FeeHead.COSTS)
-            {
-                feecodelist.Add(costs.FEE_TYPE_CODE.ToString());
-            }
+            
 
             var customernameList = cdc.code_cust_edi.Where(x => x.EDINAME == "关贸云" && feecustidList.Contains(x.EDICODE) ).ToList();
 
@@ -263,15 +258,7 @@ namespace DSWeb.Areas.CommMng.DAL
                 return result;
             }
 
-            var feelist = cdc.code_fee_edi.Where(x =>  feecodelist.Contains(x.FEEENAME)).ToList();
-            foreach (var costs in FeeHead.COSTS) 
-            {
-                if (!feelist.Exists(x => x.FEEENAME == costs.FEE_TYPE_CODE)) {
-                    result = new JsonResponse { Success = false, Message = "【" + costs.FEE_TYPE_CODE + "】没有对应的费用名称" };
 
-                    return result;
-                }
-            }
 
             var CurrChfeelist = cdc.ch_fee.Where(x => x.BSNO == BSNO && x.BXGID=="GMY").ToList();
 
@@ -572,11 +559,7 @@ namespace DSWeb.Areas.CommMng.DAL
             string BSNO = FeeHead.JOB_ID;
             string CUSTOMERNAME = CUSTOMER.SHORTNAME;
             int FEETYPE=Fee.BALANCE_DIRECTION_ID.ToUpper() == "PAYOUT" ? 2 : 1;
-            var cdc = new CommonDataContext();
-
-            //string FEENAME = string.IsNullOrWhiteSpace( Fee.FEE_TYPE_NAME)?Fee.MEMO: Fee.FEE_TYPE_NAME;
-            string FEENAME = cdc.code_fee_edi.First(x => x.FEEENAME==Fee.FEE_TYPE_CODE).FEENAME;
-
+            string FEENAME = string.IsNullOrWhiteSpace( Fee.FEE_TYPE_NAME)?Fee.MEMO: Fee.FEE_TYPE_NAME;
             decimal AMOUNT = Fee.AMOUNT==null?0:(decimal)Fee.AMOUNT;
             string UNIT = "";
             decimal QUANTITY = Fee.UNIT_NUMBER == null ? 0 : (decimal)Fee.UNIT_NUMBER;