20231215

DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs

@@ -1470,7 +1470,7 @@ namespace DSWeb.MvcShipping.Controllers
                     //增加费用
                     //20220530 改为只有成功时才生成费用
                     if (result.Success)
-                        MsOpSeaeEdiDAL.MakeFee(headList, filetype, Convert.ToString(Session["USERID"]));
+                        MsOpSeaeEdiDAL.MakeFee(headList, dcarrier, filetype, Convert.ToString(Session["USERID"]));
 
                     return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
                 }
@@ -1749,7 +1749,7 @@ namespace DSWeb.MvcShipping.Controllers
             //增加费用
             //分单
 
-            MsOpSeaeEdiDAL.MakeFee(headList, filetype, Convert.ToString(Session["USERID"]), true);
+            MsOpSeaeEdiDAL.MakeFee(headList, dcarrier, filetype, Convert.ToString(Session["USERID"]), true);
             
             var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message, Data = result.Data };
             return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };

DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs

@@ -11917,7 +11917,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL
         /// </summary>
         /// <param name="bsnos">业务编号 逗号隔开的文本</param>
         /// <param name="filetype">修改类型 B:新增 E:修改 D:删除</param>
-        public static void MakeFee(List<MsOpSeae> headlist, string filetype,string USERID, bool isfen = false)
+        public static void MakeFee(List<MsOpSeae> headlist,string dcarrier, string filetype,string USERID, bool isfen = false)
         {
             var 已发单号list = new List<string>();
 
@@ -11940,7 +11940,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL
                     已发单号list.Add(单号);
                 }
 
-                var amount = pricehelper.getPrice(item.CARRIER, filetype, isfen);
+                var amount = pricehelper.getPrice(dcarrier, filetype, isfen);
 
                 //var amount = 0M;
                 //if (filetype == "B")
@@ -11995,7 +11995,22 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL
 
                 try
                 {
-
+                    //Zi.LAN.CARRIER = "Carrier"; //"船公司";
+                    //Zi.LAN.CARRIER_COSU = "COSCO";
+                    //Zi.LAN.CARRIER_HaiFeng = "SITC";
+                    //Zi.LAN.CARRIER_HuaGang = "华港";
+                    //Zi.LAN.CARRIER_LianDai = "联代";
+                    //Zi.LAN.CARRIER_PX = "鹏信";
+                    //Zi.LAN.CARRIER_DongSheng = "东胜";
+                    //Zi.LAN.CARRIER_WaiDai = "外代";
+                    //Zi.LAN.CARRIER_WaiYun = "外运";
+                    //Zi.LAN.CARRIER_ZC = "正常";
+                    //Zi.LAN.CARRIER_ZhenHua = "振华";
+                    //Zi.LAN.CARRIER_ZhongChuang = "中创";
+                    //Zi.LAN.CARRIER_ZhongHaiQinggang = "中海(青港)";
+                    //Zi.LAN.CARRIER_ZhongHai = "中海";
+                    //Zi.LAN.CARRIER_ZhongTong = "中通";
+                    //Zi.LAN.CARRIER_ZhongYuan = "中远";
                     var _d = DetailList.First(x => x.EnumValueID == "其他");
                     if (DetailList.Exists(x => x.EnumValueID == carrier))
                     {