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

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

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application
+{
+    /// <summary>
+    /// 生成预甩货调度请求
+    /// </summary>
+    public class RollingNominationDispatchRequestDto
+    {
+        /// <summary>
+        /// 预甩货主键
+        /// </summary>
+        public string nominationId { get; set; }
+
+        /// <summary>
+        /// 是否新增（true-新增，不处理NOM_STATUS_NOTE=Load的记录 false-可以处理任意记录）
+        /// </summary>
+        public bool isAdd { get; set; } = false;
+
+        /// <summary>
+        /// 预甩货可Load明细信息主键组
+        /// </summary>
+        public string[] loadDetailIds { get; set; }
+
+        /// <summary>
+        /// 预甩货调度批次主键
+        /// </summary>
+        public string nominationBatchId { get; set; }
+    }
+}

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

@@ -234,5 +234,20 @@ namespace Myshipping.Application
         /// 
         /// </summary>
         public string BBYMAIL { get; set; }
+
+        /// <summary>
+        /// 箱型代码
+        /// </summary>
+        public string CtnCode { get; set; }
+
+        /// <summary>
+        /// 箱型名称
+        /// </summary>
+        public string CtnAll { get; set; }
+
+        /// <summary>
+        /// 箱量
+        /// </summary>
+        public int CtnNum { get; set; }
     }
 }

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

@@ -67,6 +67,16 @@ namespace Myshipping.Application
         /// Load列表
         /// </summary>
         public List<TaskRollingNominationShipDetailShowDto> LoadDetailList { get; set; }
+
+        /// <summary>
+        /// 合计单票汇总合计箱型箱量
+        /// </summary>
+        public string TotalPreBillCtnStat { get; set; }
+
+        /// <summary>
+        /// 合计load汇总合计箱型箱量
+        /// </summary>
+        public string TotalLoadCtnStat { get; set; }
     }
 
     /// <summary>
@@ -78,6 +88,12 @@ namespace Myshipping.Application
         /// 批次ID
         /// </summary>
         public string BatchId { get; set; }
+
+        /// <summary>
+        /// 预甩货调度主键
+        /// </summary>
+        public string NominationDispatchId { get; set; }
+
         /// <summary>
         /// 状态
         /// </summary>
@@ -280,5 +296,20 @@ namespace Myshipping.Application
         /// 箱量
         /// </summary>
         public int CtnNum { get; set; }
+
+        /// <summary>
+        /// 预甩货调度主键
+        /// </summary>
+        public string NominationDispatchId { get; set; }
+
+        /// <summary>
+        /// 箱备注（主要）
+        /// </summary>
+        public string CtnNote { get; set; }
+
+        /// <summary>
+        /// 明细主键
+        /// </summary>
+        public string PKId { get; set; }
     }
 }

Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageMapper.cs

@@ -898,7 +898,10 @@ namespace Myshipping.Application
             .Map(dest => dest.LOADPORT_NAME, src => src.LoadPortName)
             .Map(dest => dest.DISCHARGEPORT_NAME, src => src.DischargePortName)
             .Map(dest => dest.PLACEOF_DELIVERY, src => src.PlaceOfDelivery)
-            .Map(dest => dest.BBYMAIL, src => src.BBYMAIL);
+            .Map(dest => dest.BBYMAIL, src => src.BBYMAIL)
+            .Map(dest => dest.CTNALL, src => src.CtnAll)
+            .Map(dest => dest.CTNCODE, src => src.CtnCode)
+            .Map(dest => dest.CTNNUM, src => src.CtnNum);
 
 
             config.ForType<TaskRollingNominationShipInfo, TaskRollingNominationShipDto>()
@@ -937,7 +940,8 @@ namespace Myshipping.Application
             .Map(dest => dest.BBYMAIL, src => src.BBYMAIL)
             .Map(dest => dest.CtnCode, src => src.CTNCODE)
             .Map(dest => dest.CtnAll, src => src.CTNALL)
-            .Map(dest => dest.CtnNum, src => src.CTNNUM);
+            .Map(dest => dest.CtnNum, src => src.CTNNUM)
+            .Map(dest => dest.PKId, src => src.PK_ID);
         }
 
     }

Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageAccessShareLinkService.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application
+{
+    public interface ITaskManageAccessShareLinkService
+    {
+        /// <summary>
+        /// 访问链接
+        /// </summary>
+        /// <param name="Url">请求链接</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageOrderResultDto> AccessRollingNomination(string shareKey);
+    }
+}

Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageRollingNominationService.cs

@@ -28,44 +28,50 @@ namespace Myshipping.Application
         /// <summary>
         /// 生成预甩货客户访问链接
         /// </summary>
-        /// <param name="taskPkIds">预甩货任务主键组</param>
+        /// <param name="nominationDispatchIds">预甩货调度主键组</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> CreateShareLink(string[] taskPkIds);
+        Task<TaskManageOrderResultDto> CreateShareLink(string[] nominationDispatchIds);
 
         /// <summary>
         /// 取消预甩货客户访问链接
         /// </summary>
-        /// <param name="taskPkIds">预甩货任务主键组</param>
+        /// <param name="nominationDispatchIds">预甩货调度主键组</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> CancelShareLink(string[] taskPkIds);
+        Task<TaskManageOrderResultDto> CancelShareLink(string[] nominationDispatchIds);
 
         /// <summary>
         /// 推送预甩货客户访问链接
         /// </summary>
-        /// <param name="taskPkIds">预甩货任务主键组</param>
+        /// <param name="nominationDispatchId">预甩货调度主键组</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> PushShareLink(string[] taskPkIds);
+        Task<TaskManageOrderResultDto> PushShareLink(string[] nominationDispatchId);
 
         /// <summary>
         /// 生成预甩货调度
         /// </summary>
-        /// <param name="nominationShipId">预甩货船信息主键</param>
+        /// <param name="model">生成预甩货调度请求</param>
-        /// <param name="loadDetailIds">预甩货可Load明细信息主键组</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> DispatchRollingNomination(string nominationShipId, string[] loadDetailIds);
+        Task<TaskManageOrderResultDto> DispatchRollingNomination(RollingNominationDispatchRequestDto model);
+
+        /// <summary>
+        /// 刷新预甩货对应订舱
+        /// </summary>
+        /// <param name="detailPkIds">预甩货明细任务主键组</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageOrderResultDto> RefreshBookingOrder(string[] detailPkIds);
 
         /// <summary>
         /// 查看分享链接
         /// </summary>
-        /// <param name="batchId">预甩任务主键</param>
+        /// <param name="nominationDispatchId">预甩货调度批次主键组</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> GetUrl(string batchId);
+        Task<TaskManageOrderResultDto> GetUrl(string nominationDispatchId);
 
         /// <summary>
         /// 获取Status是load的可配载的列表
         /// </summary>
-        /// <param name="taskPkId">预甩货任务主键</param>
+        /// <param name="nominationId">预甩货主键</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> GetLoadStatusDetailList(string taskPkId);
+        Task<TaskManageOrderResultDto> GetLoadStatusDetailList(string nominationId);
     }
 }

Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageShareLinkService.cs

@@ -37,11 +37,6 @@ namespace Myshipping.Application
         Task<TaskManageOrderResultDto> ValidateShareLink(string Url);
 
 
-        /// <summary>
+        
-        /// 访问链接
-        /// </summary>
-        /// <param name="Url">请求链接</param>
-        /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> QueryShareLink(string Url);
     }
 }

Myshipping.Application/Service/TaskManagePlat/TaskManageRollingNominationService.cs

@@ -1,4 +1,6 @@
-using Furion.DynamicApiController;
+using Furion.DependencyInjection;
+using Furion.DistributedIDGenerator;
+using Furion.DynamicApiController;
 using Furion.FriendlyException;
 using Mapster;
 using Microsoft.AspNetCore.Components;
@@ -22,7 +24,7 @@ namespace Myshipping.Application
     /// 预甩货通知
     /// </summary>
     [ApiDescriptionSettings("Application", Name = "TaskManageRollingNomination", Order = 10)]
-    public class TaskManageRollingNominationService : ITaskManageRollingNominationService, IDynamicApiController
+    public class TaskManageRollingNominationService : ITaskManageRollingNominationService, IDynamicApiController, ITransient
     {
         private readonly ISysCacheService _cache;
         private readonly ILogger<TaskManageRollingNominationService> _logger;
@@ -177,6 +179,8 @@ namespace Myshipping.Application
                         && (string.IsNullOrWhiteSpace(dispatch.PK_ID) || (!string.IsNullOrWhiteSpace(dispatch.PK_ID) && dispatch.IsDeleted == false)))
                     .Select((detail, dispatch) => new { Detail = detail, Dispatch = dispatch }).ToList();
 
+                List<Tuple<string,int>> tuples = new List<Tuple<string,int>>();
+
                 model.PreBillList = withDispatchList.Where(a=>
                     a.Dispatch != null || ((a.Dispatch == null || string.IsNullOrWhiteSpace(a.Dispatch.PK_ID))
                         && !a.Detail.NOM_STATUS_NOTE.Equals("Load",StringComparison.OrdinalIgnoreCase)))
@@ -192,9 +196,14 @@ namespace Myshipping.Application
                                 var preBillDetail = preBillArg.FirstOrDefault().Detail;
                                 var preBillDispatch = preBillArg.FirstOrDefault().Dispatch;
 
-                                string ctnStat = string.Join(",", preBillArg.GroupBy(x => x.Detail.CTNALL)
+                                var cStaticlst = preBillArg.GroupBy(x => x.Detail.CTNALL)
                                     .Select(x =>
-                                    $"{x.Key}*{x.Sum(t => t.Detail.CTNNUM)}").ToArray());
+                                    new { Key = x.Key, Num = x.Sum(t => t.Detail.CTNNUM) }).ToList();
+
+                                string ctnStat = string.Join(",", cStaticlst.Select(x =>
+                                    $"{x.Key}*{x.Num}").ToArray());
+
+                                cStaticlst.ForEach(y => tuples.Add(new Tuple<string, int>(y.Key, y.Num)));
 
                                 TaskRollingNominationShipPreBillShowDto preBillInfo = new TaskRollingNominationShipPreBillShowDto
                                 {
@@ -219,7 +228,7 @@ namespace Myshipping.Application
                                     UserOpinionTxt = preBillDispatch?.USER_OPINION_TXT,
                                     BatchId = preBillDispatch?.BATCH_ID,
                                     BookingId = preBillDetail.BOOKING_ID,
-                                    GroupName = $"CUST_{idx + 1}",
+                                    GroupName = preBillDetail.CUSTOMERID.HasValue?$"CUST_{idx + 1}":"",
                                 };
 
                                 return preBillInfo;
@@ -234,6 +243,20 @@ namespace Myshipping.Application
                     && a.Detail.NOM_STATUS_NOTE.Equals("Load", StringComparison.OrdinalIgnoreCase))
                         .Select(a => a.Detail.Adapt<TaskRollingNominationShipDetailShowDto>()).ToList();
                 }
+
+                if(tuples.Count > 0)
+                {
+                    model.TotalPreBillCtnStat = string.Join(",", tuples.GroupBy(x => x.Item1)
+                                    .Select(x =>
+                                    $"{x.Key}*{x.Sum(t => t.Item2)}").ToArray());
+                }
+
+                if (model.LoadDetailList.Count > 0)
+                {
+                    model.TotalLoadCtnStat = string.Join(",", model.LoadDetailList.GroupBy(x => x.CtnAll)
+                                    .Select(x =>
+                                    $"{x.Key}*{x.Sum(t => t.CtnNum)}").ToArray());
+                }
             }
             catch (Exception ex)
             {
@@ -249,13 +272,23 @@ namespace Myshipping.Application
         /// <summary>
         /// 生成预甩货客户访问链接
         /// </summary>
-        /// <param name="taskPkIds">预甩货任务主键组</param>
+        /// <param name="nominationDispatchIds">预甩货调度主键组</param>
         /// <returns>返回回执</returns>
         [HttpPost("/TaskManageRollingNomination/CreateShareLink")]
-        public async Task<TaskManageOrderResultDto> CreateShareLink([FromQuery] string[] taskPkIds)
+        public async Task<TaskManageOrderResultDto> CreateShareLink([FromBody] string[] nominationDispatchIds)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
+            try
+            {
+
+            }
+            catch(Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"生成预甩货客户访问链接异常，原因:{ex.Message}";
+            }
+
             return result;
         }
         #endregion
@@ -264,13 +297,23 @@ namespace Myshipping.Application
         /// <summary>
         /// 取消预甩货客户访问链接
         /// </summary>
-        /// <param name="taskPkIds">预甩货任务主键组</param>
+        /// <param name="nominationDispatchIds">预甩货调度主键组</param>
         /// <returns>返回回执</returns>
         [HttpPost("/TaskManageRollingNomination/CancelShareLink")]
-        public async Task<TaskManageOrderResultDto> CancelShareLink(string[] taskPkIds)
+        public async Task<TaskManageOrderResultDto> CancelShareLink([FromBody] string[] nominationDispatchIds)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
+            try
+            {
+
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"取消预甩货客户访问链接异常，原因:{ex.Message}";
+            }
+
             return result;
         }
         #endregion
@@ -279,13 +322,23 @@ namespace Myshipping.Application
         /// <summary>
         /// 推送预甩货客户访问链接
         /// </summary>
-        /// <param name="taskPkIds">预甩货任务主键组</param>
+        /// <param name="nominationDispatchId">预甩货任务主键组</param>
         /// <returns>返回回执</returns>
         [HttpPost("/TaskManageRollingNomination/PushShareLink")]
-        public async Task<TaskManageOrderResultDto> PushShareLink(string[] taskPkIds)
+        public async Task<TaskManageOrderResultDto> PushShareLink([FromBody] string[] nominationDispatchId)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
+            try
+            {
+
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"推送预甩货客户访问链接异常，原因:{ex.Message}";
+            }
+
             return result;
         }
         #endregion
@@ -294,14 +347,254 @@ namespace Myshipping.Application
         /// <summary>
         /// 生成预甩货调度
         /// </summary>
-        /// <param name="nominationShipId">预甩货船信息主键</param>
+        /// <param name="model">生成预甩货调度请求</param>
-        /// <param name="loadDetailIds">预甩货可Load明细信息主键组</param>
         /// <returns>返回回执</returns>
         [HttpPost("/TaskManageRollingNomination/DispatchRollingNomination")]
-        public async Task<TaskManageOrderResultDto> DispatchRollingNomination(string nominationShipId, string[] loadDetailIds)
+        public async Task<TaskManageOrderResultDto> DispatchRollingNomination([FromBody] RollingNominationDispatchRequestDto model)
+        {
+            TaskManageOrderResultDto result = new TaskManageOrderResultDto();
+
+            try
+            {
+                /*
+                 1、如果调度ID不为空，标识选择新的明细替换原有的调度。
+                 （1）首先匹配所选的箱型箱量是否一致，装货港、卸货港必需一致，不满足不能进行生成调度。
+                 （2）删除原调度，生成新调度。
+                 2、如果调度ID为空，标识是新增调度。
+                 3、没有订舱ID或委托单位ID的数据不能生成调度。
+                 */
+                DateTime nowDate = DateTime.Now;
+
+                if (!model.isAdd)
+                {
+                    if(string.IsNullOrWhiteSpace(model.nominationBatchId))
+                    {
+                        throw Oops.Oh($"改配调度需要提供预甩货调度批次ID");
+                    }
+
+                    if (model.loadDetailIds == null || model.loadDetailIds.Length == 0)
+                    {
+                        throw Oops.Oh($"预甩货可Load明细信息不能为空");
+                    }
+
+                    var detailList = _taskRollingNominationDetailInfoRepository.AsQueryable()
+                        .Where(a => model.loadDetailIds.Contains(a.PK_ID) && a.IsDeleted == false).ToList();
+
+                    if (detailList.Count != model.loadDetailIds.Length)
+                    {
+                        throw Oops.Oh($"预甩货明细部分获取失败，请重新获取预甩货明细");
+                    }
+
+                    if (detailList.Any(a => !a.BOOKING_ID.HasValue || !a.CUSTOMERID.HasValue))
+                    {
+                        throw Oops.Oh($"预甩货明细存在未对应订舱的记录，不能生成调度");
+                    }
+
+                    var nomId = detailList.FirstOrDefault().NOM_ID;
+
+                    var nomModel = _taskRollingNominationInfoRepository.AsQueryable()
+                            .First(a => a.PK_ID == nomId);
+
+                    var shipmentList = detailList.Select(a => a.SHIPMENT).Distinct().ToList();
+
+                    Dictionary<string, string> batchDict = shipmentList.Select(a => new { Key = a, BatchId = IDGen.NextID().ToString() })
+                            .ToDictionary(a => a.Key, b => b.BatchId);
+
+                    List<TaskRollingNominationDispatchInfo> dispatchList = new List<TaskRollingNominationDispatchInfo>();
+                    List<TaskRollingNominationDetailInfo> withDispatchDetailList = new List<TaskRollingNominationDetailInfo>();
+
+                    var withDispatchList = _taskRollingNominationDetailInfoRepository.AsQueryable().Filter(null, true)
+                        .InnerJoin<TaskRollingNominationDispatchInfo>((detail, dispatch) => detail.PK_ID == dispatch.DETAIL_ID)
+                        .Where((detail, dispatch) => detail.PK_ID == dispatch.DETAIL_ID && detail.IsDeleted == false
+                            && dispatch.IsDeleted == false && dispatch.BATCH_ID == model.nominationBatchId)
+                        .Select((detail, dispatch) => new { Detail = detail, Dispatch = dispatch }).ToList();
+
+                    if (withDispatchList.Count > 0)
+                    {
+                        withDispatchDetailList = withDispatchList.Select(a => a.Detail)
+                            .ToList();
+                    }
+
+                    if (dispatchList.Count == 0)
+                    {
+                        throw Oops.Oh($"预甩货调度获取失败，无法改配");
+                    }
+
+                    //如果原调度对应的明细含有本次提交的明细，不允许改配调度
+                    if (withDispatchDetailList.Any(a =>
+                        model.loadDetailIds.Any(b => b == a.PK_ID)))
+                    {
+                        throw Oops.Oh($"预甩货调度获取失败，提交明细已生成调度，无法改配");
+                    }
+
+                    //需要匹配箱型箱量
+                    var origCtnStat = string.Join(",", withDispatchDetailList
+                        .GroupBy(a => a.CTNALL).OrderBy(a => a.Key)
+                        .Select(a => $"{a.Key}*{a.Sum(b => b.CTNNUM)}").ToArray());
+
+                    detailList = _taskRollingNominationDetailInfoRepository.AsQueryable()
+                        .Where(a => shipmentList.Contains(a.SHIPMENT) && a.IsDeleted == false && a.NOM_ID == nomId).ToList();
+
+                    var targetCtnStat = string.Join(",", detailList
+                        .GroupBy(a => a.CTNALL).OrderBy(a => a.Key)
+                        .Select(a => $"{a.Key}*{a.Sum(b => b.CTNNUM)}").ToArray());
+
+                    //如果箱型箱量不一致不能改配
+                    if (!origCtnStat.Equals(targetCtnStat))
+                    {
+                        throw Oops.Oh($"预甩货调度获取失败，提交明细箱型箱量于被改配调度不一致，无法改配");
+                    }
+
+                    var origShip = withDispatchDetailList.FirstOrDefault();
+                    var targetShip = detailList.FirstOrDefault();
+
+                    var origKey = $"{origShip.PLACEOF_RECEIPT}_{origShip.LOADPORT_NAME}_{origShip.DISCHARGEPORT_NAME}_{origShip.PLACEOF_DELIVERY}";
+                    var targeKey = $"{targetShip.PLACEOF_RECEIPT}_{targetShip.LOADPORT_NAME}_{targetShip.DISCHARGEPORT_NAME}_{targetShip.PLACEOF_DELIVERY}";
+
+                    //收货地、装货港、卸货港、交货地必需一致
+                    if (!origKey.Equals(targeKey))
+                    {
+                        throw Oops.Oh($"预甩货调度获取失败，提交明细收货地、装货港、卸货港、交货地被改配调度不一致，无法改配");
+                    }
+
+                    //删除原调度
+                    withDispatchList.ForEach(async a =>
+                    {
+                        a.Dispatch.IsDeleted = true;
+                        a.Dispatch.UpdatedTime = nowDate;
+                        a.Dispatch.UpdatedUserId = UserManager.UserId;
+                        a.Dispatch.UpdatedUserName = UserManager.Name;
+
+                        await _taskRollingNominationDispatchInfoRepository.AsUpdateable(a.Dispatch)
+                            .UpdateColumns(it => new
+                            {
+                                it.IsDeleted,
+                                it.UpdatedTime,
+                                it.UpdatedUserId,
+                                it.UpdatedUserName
+                            }).ExecuteCommandAsync();
+                    });
+
+                    //写入新调度
+                    detailList.ForEach(a =>
+                    {
+                        TaskRollingNominationDispatchInfo dispatchInfo = new TaskRollingNominationDispatchInfo
+                        {
+                            PK_ID = IDGen.NextID().ToString(),
+                            CreatedTime = nowDate,
+                            UpdatedTime = nowDate,
+                            CreatedUserId = UserManager.UserId,
+                            CreatedUserName = UserManager.Name,
+                            DETAIL_ID = a.PK_ID,
+                            NOM_ID = a.NOM_ID,
+                            NOM_SHIP_ID = a.NOM_SHIP_ID,
+                            IsDeleted = false,
+                            STATUS = "WAIT",
+                            TASK_ID = nomModel.TASK_ID,
+                            TenantId = UserManager.TENANT_ID,
+                            TenantName = UserManager.TENANT_NAME,
+                            BATCH_ID = batchDict[a.SHIPMENT],
+                        };
+
+                        _taskRollingNominationDispatchInfoRepository.Insert(dispatchInfo);
+                    });
+                }
+                else
+                {
+                    var withDispatchList =
+                        _taskRollingNominationInfoRepository.AsQueryable().Filter(null, true)
+                        .InnerJoin<TaskRollingNominationDetailInfo>((nom, detail) => nom.PK_ID == detail.NOM_ID)
+                        .LeftJoin<TaskRollingNominationDispatchInfo>((nom, detail, dispatch) =>
+                            detail.PK_ID == dispatch.DETAIL_ID && dispatch.IsDeleted == false)
+                        .Where((nom, detail, dispatch) => 
+                            detail.IsDeleted == false
+                            && detail.NOM_ID == model.nominationId)
+                        .Select((nom, detail, dispatch) => 
+                            new { Nom = nom, Detail = detail, Dispatch = dispatch }).ToList();
+
+                    if (withDispatchList.Any(p => p.Dispatch != null
+                        && !string.IsNullOrWhiteSpace(p.Dispatch.PK_ID)))
+                    {
+                        throw Oops.Oh($"预甩货明细已生成调度不能重复");
+                    }
+
+                    var nomiInfo = withDispatchList.FirstOrDefault().Nom;
+
+                    var shipmentList = withDispatchList
+                        .Select(a => a.Detail.SHIPMENT)
+                        .Distinct().ToList();
+
+                    Dictionary<string, string> batchDict = shipmentList.Select(a => new { Key = a, BatchId = IDGen.NextID().ToString() })
+                            .ToDictionary(a => a.Key, b => b.BatchId);
+
+                    DateTime deadLine = nomiInfo.CONFIRM_DEAD_LINE.Value.AddHours(2);
+
+                    //开始写入调度
+                    withDispatchList.ForEach(info =>
+                    {
+                        var a = info.Detail;
+
+                        if (!a.NOM_STATUS_NOTE.Equals("Load", StringComparison.OrdinalIgnoreCase))
+                        {
+                            TaskRollingNominationDispatchInfo dispatchInfo = new TaskRollingNominationDispatchInfo
+                            {
+                                PK_ID = IDGen.NextID().ToString(),
+                                CreatedTime = nowDate,
+                                UpdatedTime = nowDate,
+                                CreatedUserId = UserManager.UserId,
+                                CreatedUserName = UserManager.Name,
+                                DETAIL_ID = a.PK_ID,
+                                NOM_ID = a.NOM_ID,
+                                NOM_SHIP_ID = a.NOM_SHIP_ID,
+                                IsDeleted = false,
+                                STATUS = "WAIT",
+                                TASK_ID = nomiInfo.TASK_ID,
+                                TenantId = UserManager.TENANT_ID,
+                                TenantName = UserManager.TENANT_NAME,
+                                BATCH_ID = batchDict[a.SHIPMENT],
+                                CONFIRM_DEAD_LINE = deadLine
+                            };
+
+                            _taskRollingNominationDispatchInfoRepository.Insert(dispatchInfo);
+                        }
+                    });
+                }
+
+                result.succ = true;
+                result.msg = "成功";
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"生成预甩货调度异常，原因:{ex.Message}";
+            }
+
+            return result;
+        }
+        #endregion
+
+        #region 刷新预甩货对应订舱
+        /// <summary>
+        /// 刷新预甩货对应订舱
+        /// </summary>
+        /// <param name="detailPkIds">预甩货明细任务主键组</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("/TaskManageRollingNomination/RefreshBookingOrder")]
+        public async Task<TaskManageOrderResultDto> RefreshBookingOrder([FromBody] string[] detailPkIds)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
+            try
+            {
+                
+
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"刷新预甩货对应订舱异常，原因:{ex.Message}";
+            }
+
             return result;
         }
         #endregion
@@ -317,6 +610,16 @@ namespace Myshipping.Application
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
+            try
+            {
+
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"推送预甩货客户访问链接异常，原因:{ex.Message}";
+            }
+
             return result;
         }
         #endregion
@@ -332,6 +635,30 @@ namespace Myshipping.Application
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
+            try
+            {
+                var withDispatchList =
+                        _taskRollingNominationInfoRepository.AsQueryable().Filter(null, true)
+                        .InnerJoin<TaskRollingNominationDetailInfo>((nom,detail)=> nom.PK_ID == detail.NOM_ID)
+                        .LeftJoin<TaskRollingNominationDispatchInfo>((nom,detail, dispatch) => 
+                            detail.PK_ID == dispatch.DETAIL_ID && dispatch.IsDeleted == false)
+                        .Where((nom,detail, dispatch) => 
+                            nom.TASK_ID == taskPkId && detail.IsDeleted == false && string.IsNullOrWhiteSpace(dispatch.TASK_ID))
+                        .Select((nom, detail, dispatch) => new { Detail = detail}).ToList();
+
+                if (withDispatchList.Count > 0)
+                {
+                    result.ext = withDispatchList.Select(a => a.Detail.Adapt<TaskRollingNominationShipDetailShowDto>()).ToList();
+                }
+
+                result.succ = true;
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"推送预甩货客户访问链接异常，原因:{ex.Message}";
+            }
+
             return result;
         }
         #endregion

Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs

@@ -112,6 +112,7 @@ namespace Myshipping.Application
         private readonly ISysDataUserMenu _sysDataUserMenuService;
 
         private readonly INamedServiceProvider<IBookingOrderService> _namedBookingOrderServiceProvider;
+        private readonly INamedServiceProvider<ITaskManageRollingNominationService> _namedRollingNominationServiceProvider;
 
         const string CONST_WEB_ACCOUNT_TYPE = "CmaWeb";
         const string CONST_BOOK_ORIGINAL_DOWN_URL_CODE = "bookOriginalDownUrl";
@@ -157,6 +158,7 @@ namespace Myshipping.Application
             IDjyWebsiteAccountConfigService webAccountConfig,
             ISysCacheService cache,
             ISysDataUserMenu sysDataUserMenuService,
+            INamedServiceProvider<ITaskManageRollingNominationService> namedRollingNominationServiceProvider,
             ILogger<BookingOrderService> logger)
         {
             _taskBaseInfoRepository = taskBaseInfoRepository;
@@ -190,6 +192,7 @@ namespace Myshipping.Application
             _taskRollingNominationDetailInfoRepository = taskRollingNominationDetailInfoRepository;
 
             _namedBookingOrderServiceProvider = namedBookingOrderServiceProvider;
+            _namedRollingNominationServiceProvider = namedRollingNominationServiceProvider;
 
             _sysDataUserMenuService = sysDataUserMenuService;
 
@@ -809,6 +812,8 @@ namespace Myshipping.Application
 
                     if (info.Main.RollingNomination.ToDetail != null && info.Main.RollingNomination.ToDetail.Count > 0)
                     {
+                        var ctnCodeList = _cache.GetAllCodeCtn().GetAwaiter().GetResult().ToList();
+
                         info.Main.RollingNomination.ToDetail.ForEach(t =>
                         {
                             var rollingNominationShip = t.Adapt<TaskRollingNominationShipInfo>();
@@ -829,10 +834,26 @@ namespace Myshipping.Application
 
                             if (t.NominationList != null && t.NominationList.Count > 0)
                             {
+                                //这里直接批量检索订舱信息，如果有对应的提单号直接写入订舱主键
+
+                                var billNoList = t.NominationList.Select(x => x.Shipment.ToUpper())
+                                    .Distinct().ToArray();
+
+                                var bookList = _bookingOrderRepository.AsQueryable().Filter(null, true)
+                                    .Where(x => billNoList.Contains(x.MBLNO) && x.IsDeleted == false && x.TenantId == taskInfo.TenantId).ToList();
+
                                 t.NominationList.ForEach(x =>
                                 {
                                     var rollingNominationDetail = x.Adapt<TaskRollingNominationDetailInfo>();
 
+                                    if (!string.IsNullOrWhiteSpace(rollingNominationDetail.CTNALL))
+                                    {
+                                        var ctnCode = ctnCodeList.FirstOrDefault(a => !string.IsNullOrWhiteSpace(a.Name) &&
+                                            a.Name.Equals(rollingNominationDetail.CTNALL, StringComparison.OrdinalIgnoreCase));
+
+                                        rollingNominationDetail.CTNCODE = ctnCode?.Code;
+                                    }
+
                                     rollingNominationDetail.PK_ID = IDGen.NextID().ToString();
                                     rollingNominationDetail.NOM_SHIP_ID = rollingNominationShip.PK_ID;
                                     rollingNominationDetail.NOM_ID = rollingNomination.PK_ID;
@@ -845,6 +866,16 @@ namespace Myshipping.Application
                                     rollingNominationDetail.TenantId = taskInfo.TenantId;
                                     rollingNominationDetail.TenantName = taskInfo.TenantName;
 
+                                    var bookingInfo = bookList.FirstOrDefault(x =>
+                                        x.MBLNO.Equals(rollingNominationDetail.SHIPMENT, StringComparison.OrdinalIgnoreCase));
+
+                                    if (bookingInfo != null)
+                                    {
+                                        rollingNominationDetail.BOOKING_ID = bookingInfo.Id;
+                                        rollingNominationDetail.CUSTOMERID = bookingInfo.CUSTOMERID;
+                                        rollingNominationDetail.CUSTOMERNAME = bookingInfo.CUSTOMERNAME;
+                                    }
+
                                     _taskRollingNominationDetailInfoRepository.Insert(rollingNominationDetail);
 
                                 });
@@ -853,7 +884,14 @@ namespace Myshipping.Application
                         });
                     }
 
-                    
+                    //异步生成调度
+                    var rollNominationService = _namedRollingNominationServiceProvider
+                        .GetService<ITransient>(nameof(TaskManageRollingNominationService));
+
+                    var dispatchRlt = await rollNominationService.DispatchRollingNomination(new RollingNominationDispatchRequestDto { 
+                        isAdd = true,
+                        nominationId = rollingNomination.PK_ID
+                    });
                 }
                 #endregion