diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/Nomination/TaskRollingNominationShowDto.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/Nomination/TaskRollingNominationShowDto.cs
index 59f6544a..8bc03053 100644
--- a/Myshipping.Application/Service/TaskManagePlat/Dtos/Nomination/TaskRollingNominationShowDto.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/Nomination/TaskRollingNominationShowDto.cs
@@ -234,7 +234,7 @@ namespace Myshipping.Application
///
///
///
- public Nullable FFE { get; set; }
+ public Nullable FEE { get; set; }
///
///
diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageMapper.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageMapper.cs
index 268942fe..e6ea197f 100644
--- a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageMapper.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageMapper.cs
@@ -928,7 +928,7 @@ namespace Myshipping.Application
.Map(dest => dest.EquSize, src => src.EQU_SIZE)
.Map(dest => dest.ContainerType, src => src.CONTAINER_TYPE)
.Map(dest => dest.ContainerHeight, src => src.CONTAINER_HEIGHT)
- .Map(dest => dest.FFE, src => src.FEE)
+ .Map(dest => dest.FEE, src => src.FEE)
.Map(dest => dest.Weight, src => src.WEIGHT)
.Map(dest => dest.PlaceOfReceipt, src => src.PLACEOF_RECEIPT)
.Map(dest => dest.LoadPortName, src => src.LOADPORT_NAME)
diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageRollingNominationService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageRollingNominationService.cs
index acbdb4ce..1b236196 100644
--- a/Myshipping.Application/Service/TaskManagePlat/TaskManageRollingNominationService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageRollingNominationService.cs
@@ -178,7 +178,8 @@ namespace Myshipping.Application
.Select((detail, dispatch) => new { Detail = detail, Dispatch = dispatch }).ToList();
model.PreBillList = withDispatchList.Where(a=>
- a.Dispatch != null || (a.Dispatch == null && !a.Detail.NOM_STATUS_NOTE.Equals("Load",StringComparison.OrdinalIgnoreCase)))
+ a.Dispatch != null || ((a.Dispatch == null || string.IsNullOrWhiteSpace(a.Dispatch.PK_ID))
+ && !a.Detail.NOM_STATUS_NOTE.Equals("Load",StringComparison.OrdinalIgnoreCase)))
.GroupBy(a => a.Detail.CUSTOMERID)
.SelectMany((a,idx) => {
var cArg = a.ToList();
@@ -225,10 +226,11 @@ namespace Myshipping.Application
}).ToList();
}).ToList();
- if(withDispatchList.Any(a=>a.Dispatch == null
+ if(withDispatchList.Any(a=>(a.Dispatch == null || string.IsNullOrWhiteSpace(a.Dispatch.PK_ID))
&& a.Detail.NOM_STATUS_NOTE.Equals("Load", StringComparison.OrdinalIgnoreCase)))
{
- model.LoadDetailList = withDispatchList.Where(a => a.Dispatch == null
+ model.LoadDetailList = withDispatchList.Where(a =>
+ (a.Dispatch == null || string.IsNullOrWhiteSpace(a.Dispatch.PK_ID))
&& a.Detail.NOM_STATUS_NOTE.Equals("Load", StringComparison.OrdinalIgnoreCase))
.Select(a => a.Detail.Adapt()).ToList();
}
@@ -243,77 +245,95 @@ namespace Myshipping.Application
}
#endregion
+ #region 生成预甩货客户访问链接
///
/// 生成预甩货客户访问链接
///
/// 预甩货任务主键组
/// 返回回执
- public async Task CreateShareLink(string[] taskPkIds)
+ [HttpPost("/TaskManageRollingNomination/CreateShareLink")]
+ public async Task CreateShareLink([FromQuery] string[] taskPkIds)
{
TaskManageOrderResultDto result = new TaskManageOrderResultDto();
return result;
}
+ #endregion
+ #region 取消预甩货客户访问链接
///
/// 取消预甩货客户访问链接
///
/// 预甩货任务主键组
/// 返回回执
+ [HttpPost("/TaskManageRollingNomination/CancelShareLink")]
public async Task CancelShareLink(string[] taskPkIds)
{
TaskManageOrderResultDto result = new TaskManageOrderResultDto();
return result;
}
+ #endregion
+ #region 推送预甩货客户访问链接
///
/// 推送预甩货客户访问链接
///
/// 预甩货任务主键组
/// 返回回执
+ [HttpPost("/TaskManageRollingNomination/PushShareLink")]
public async Task PushShareLink(string[] taskPkIds)
{
TaskManageOrderResultDto result = new TaskManageOrderResultDto();
return result;
}
+ #endregion
+ #region 生成预甩货调度
///
/// 生成预甩货调度
///
/// 预甩货船信息主键
/// 预甩货可Load明细信息主键组
/// 返回回执
+ [HttpPost("/TaskManageRollingNomination/DispatchRollingNomination")]
public async Task DispatchRollingNomination(string nominationShipId, string[] loadDetailIds)
{
TaskManageOrderResultDto result = new TaskManageOrderResultDto();
return result;
}
+ #endregion
+ #region 查看分享链接
///
/// 查看分享链接
///
/// 预甩任务主键
/// 返回回执
+ [HttpGet("/TaskManageRollingNomination/GetUrl")]
public async Task GetUrl(string batchId)
{
TaskManageOrderResultDto result = new TaskManageOrderResultDto();
return result;
}
+ #endregion
+ #region 获取Status是load的可配载的列表
///
/// 获取Status是load的可配载的列表
///
/// 预甩货任务主键
/// 返回回执
+ [HttpGet("/TaskManageRollingNomination/GetLoadStatusDetailList")]
public async Task GetLoadStatusDetailList(string taskPkId)
{
TaskManageOrderResultDto result = new TaskManageOrderResultDto();
return result;
}
+ #endregion
}
}