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