diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs index 151682af..bb08cc25 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs @@ -1502,7 +1502,7 @@ namespace DSWeb.MvcShipping.Controllers /// /// 业务编号 逗号隔开的文本 /// 修改类型 B:新增 E:修改 D:删除 - private void MakeFee(List headlist, string filetype,bool isfen=false) + private void MakeFee(List headlist, string filetype,bool isfen=false, List FenList=null) { var cangdaninfo = new CangDanPriceParam(); @@ -1526,7 +1526,7 @@ namespace DSWeb.MvcShipping.Controllers var 单量 = 1; - if (isfen) + if (isfen && FenList!=null) { if (filetype == "B") { @@ -1540,8 +1540,8 @@ namespace DSWeb.MvcShipping.Controllers { amount = cangdaninfo.FenPrice3; } - var 分单列表 = MsOpSeaeDAL.GetManifestList($" BSNO='{item.BSNO}' "); - 单量 = 分单列表.Count(); + //var 分单列表 = MsOpSeaeDAL.GetManifestList($" BSNO='{item.BSNO}' "); + 单量 = FenList.Count(); } MsChFeeDAL.MakeNewFee(USERID, item.BSNO, cangdaninfo.DJYName, "其它", 2, "舱单费", amount * 单量, "单票", 单量); @@ -1607,7 +1607,7 @@ namespace DSWeb.MvcShipping.Controllers } /// - /// 直发舱单EDI_分单 + /// 直发舱单EDI_提单信息 /// /// /// @@ -1852,7 +1852,7 @@ namespace DSWeb.MvcShipping.Controllers //增加费用 if (result.Success) - MakeFee(headList, filetype); + MakeFee(headList, filetype,true, billList); var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message, Data = result.Data }; return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };