Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/TaskManagePlat/Dtos/Nomination/TaskRollingNominationShowDto.cs

@@ -234,7 +234,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 
         /// </summary>
-        public Nullable<decimal> FFE { get; set; }
+        public Nullable<decimal> FEE { get; set; }
 
         /// <summary>
         /// 

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)

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<TaskRollingNominationShipDetailShowDto>()).ToList();
                 }
@@ -243,77 +245,95 @@ namespace Myshipping.Application
         }
         #endregion
 
+        #region 生成预甩货客户访问链接
         /// <summary>
         /// 生成预甩货客户访问链接
         /// </summary>
         /// <param name="taskPkIds">预甩货任务主键组</param>
         /// <returns>返回回执</returns>
-        public async Task<TaskManageOrderResultDto> CreateShareLink(string[] taskPkIds)
+        [HttpPost("/TaskManageRollingNomination/CreateShareLink")]
+        public async Task<TaskManageOrderResultDto> CreateShareLink([FromQuery] string[] taskPkIds)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
             return result;
         }
+        #endregion
 
+        #region 取消预甩货客户访问链接
         /// <summary>
         /// 取消预甩货客户访问链接
         /// </summary>
         /// <param name="taskPkIds">预甩货任务主键组</param>
         /// <returns>返回回执</returns>
+        [HttpPost("/TaskManageRollingNomination/CancelShareLink")]
         public async Task<TaskManageOrderResultDto> CancelShareLink(string[] taskPkIds)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
             return result;
         }
+        #endregion
 
+        #region 推送预甩货客户访问链接
         /// <summary>
         /// 推送预甩货客户访问链接
         /// </summary>
         /// <param name="taskPkIds">预甩货任务主键组</param>
         /// <returns>返回回执</returns>
+        [HttpPost("/TaskManageRollingNomination/PushShareLink")]
         public async Task<TaskManageOrderResultDto> PushShareLink(string[] taskPkIds)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
             return result;
         }
+        #endregion
 
+        #region 生成预甩货调度
         /// <summary>
         /// 生成预甩货调度
         /// </summary>
         /// <param name="nominationShipId">预甩货船信息主键</param>
         /// <param name="loadDetailIds">预甩货可Load明细信息主键组</param>
         /// <returns>返回回执</returns>
+        [HttpPost("/TaskManageRollingNomination/DispatchRollingNomination")]
         public async Task<TaskManageOrderResultDto> DispatchRollingNomination(string nominationShipId, string[] loadDetailIds)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
             return result;
         }
+        #endregion
 
+        #region 查看分享链接
         /// <summary>
         /// 查看分享链接
         /// </summary>
         /// <param name="batchId">预甩任务主键</param>
         /// <returns>返回回执</returns>
+        [HttpGet("/TaskManageRollingNomination/GetUrl")]
         public async Task<TaskManageOrderResultDto> GetUrl(string batchId)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
             return result;
         }
+        #endregion
 
+        #region 获取Status是load的可配载的列表
         /// <summary>
         /// 获取Status是load的可配载的列表
         /// </summary>
         /// <param name="taskPkId">预甩货任务主键</param>
         /// <returns>返回回执</returns>
+        [HttpGet("/TaskManageRollingNomination/GetLoadStatusDetailList")]
         public async Task<TaskManageOrderResultDto> GetLoadStatusDetailList(string taskPkId)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
             return result;
         }
+        #endregion
     }
 }