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

Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs

@@ -17,6 +17,7 @@ using Myshipping.Core.Service;
 using Microsoft.Extensions.Logging;
 using Myshipping.Application.Helper;
 using System.Text.RegularExpressions;
+using System.Globalization;
 
 namespace Myshipping.Application.Service.BookingOrder
 {
@@ -280,6 +281,7 @@ namespace Myshipping.Application.Service.BookingOrder
                     userSecret = App.Configuration["MSKAPIDjyUserSecret"],
                     operatingEnvironment = App.Configuration["MSKAPIOPEnvironment"],
                     mskAppKey = webAccountConfig.Account,
+                    mskAppSecret = webAccountConfig.Password,
                     bookingBody = new MSKAPIBookingBodyDto()
                 };
 
@@ -288,6 +290,7 @@ namespace Myshipping.Application.Service.BookingOrder
                     priceReference = model.priceReference,
                     productCode = model.productCode,
                     sender = model.sender,
+                    bookingOfficeUNLocationCode = "CNTAO"
                 };
 
                 bookingDto.bookingBody.mandatoryParties = new MSKAPIBookingMandatoryParties
@@ -311,7 +314,7 @@ namespace Myshipping.Application.Service.BookingOrder
                 bookingDto.bookingBody.transport = new MSKAPIBookingTransport
                 {
                     carrierCode = model.carrierCode,
-                    earliestDepartureDate = model.earliestDepartureDate,
+                    earliestDepartureDate = model.earliestDepartureDate.Value.ToString("yyyy-MM-ddTHH:mm:ss"),
                     exportServiceMode = model.exportServiceMode,
                     importServiceMode = model.importServiceMode,
                     routeDetails = new MSKAPIBookingRouteDetails
@@ -328,10 +331,11 @@ namespace Myshipping.Application.Service.BookingOrder
                         },
                         selectedRoute = new MSKAPIBookingRoute
                         {
-                            bookingSchedules = new MSKAPIBookingSchedules
+                            bookingSchedules = new List<MSKAPIBookingSchedules> { 
+                                new MSKAPIBookingSchedules
                                 {
-                                originDepartureDateTimeLocal = model.originDepartureDateTimeLocal.Value.ToString("yyyy-MM-dd"),
+                                    originDepartureDateTimeLocal = model.originDepartureDateTimeLocal.Value.ToString("yyyy-MM-ddTHH:mm:ss"),
-                                destinationArrivalDateTimeLocal = model.destinationArrivalDateTimeLocal.Value.ToString("yyyy-MM-dd"),
+                                    destinationArrivalDateTimeLocal = model.destinationArrivalDateTimeLocal.Value.ToString("yyyy-MM-ddTHH:mm:ss"),
                                     transportMode = new MSKAPIBookingTransportMode
                                     {
                                         vessel = new MSKAPIBookingTransportModeVessel
@@ -353,6 +357,7 @@ namespace Myshipping.Application.Service.BookingOrder
                                     },
                                     transportModeCode = model.transportMode
                                 } 
+                            }
                         },
                     }
                 };
@@ -412,13 +417,14 @@ namespace Myshipping.Application.Service.BookingOrder
                     });
                 }
 
-                var id = await Save(model);
+                var id = await InnerSave(model, isSendApi: true);
 
                 MSKAPIBookingResultDto resultInfo = null;
 
                 _logger.LogInformation($"开始请求MSK API订舱，JSON={JSON.Serialize(bookingDto)}");
 
-                var rlt = await sendUrl.SetBody(bookingDto)
+                var jsonBody = Newtonsoft.Json.JsonConvert.SerializeObject(bookingDto);
+                var rlt = await sendUrl.SetBody(jsonBody)
                  .PostAsStringAsync();
 
                 _logger.LogInformation($"开始请求MSK API订舱，返回结果 JSON={JSON.Serialize(rlt)}");
@@ -437,14 +443,21 @@ namespace Myshipping.Application.Service.BookingOrder
                     }
                 }
 
+                MSKAPIBookingResultDataDto resultData = null;
+
+                if(resultInfo.code == 200)
+                {
+                    resultData = JSON.Deserialize<MSKAPIBookingResultDataDto>(JSON.Serialize(resultInfo.data));
+                }
+
                 var entity = _bookingDeliveryRecordRep
                     .FirstOrDefault(a => a.Id == recordInfo.Id);
 
                 if (resultInfo != null && resultInfo.code == 200
-                    && resultInfo.data != null)
+                    && resultData != null)
                 {
-                    entity.REQUEST_ACKNOWLEDGEMENT_ID = resultInfo.data.requestAcknowledgementId;
+                    entity.REQUEST_ACKNOWLEDGEMENT_ID = resultData.requestAcknowledgementId;
-                    entity.BOOKING_REFERENCE = resultInfo.data.bookingReference;
+                    entity.BOOKING_REFERENCE = resultData.bookingReference;
                     entity.STATUS = "SUCC";
 
                     await _bookingDeliveryRecordRep.AsUpdateable(entity).UpdateColumns(x => new
@@ -464,6 +477,9 @@ namespace Myshipping.Application.Service.BookingOrder
                         x.STATUS,
                         x.NOTES
                     }).ExecuteCommandAsync();
+
+
+                    throw Oops.Bah(resultInfo.msg);
                 }
             }
             catch (Exception ex)
@@ -500,6 +516,7 @@ namespace Myshipping.Application.Service.BookingOrder
             12、如果选择了冷冻处理，至少要填个温度
             13、箱型、箱量、重量必填
             14、总重=箱量*单箱重量
+            15、预计离港日期必填
             */
             if (string.IsNullOrWhiteSpace(model.priceReference))
                 throw Oops.Bah($"订舱合同惟一ID必填");
@@ -585,6 +602,9 @@ namespace Myshipping.Application.Service.BookingOrder
             if (string.IsNullOrWhiteSpace(model.cargoType))
                 throw Oops.Bah($"货物标志必填");
 
+            if(!model.earliestDepartureDate.HasValue)
+                throw Oops.Bah($"预计离港日期必填"); 
+
             if (model.isReefer)
             {
                 if (!model.temperature.HasValue)
@@ -960,9 +980,9 @@ namespace Myshipping.Application.Service.BookingOrder
         /// <param name="id">马士基API订舱ID</param>
         /// <returns>返回详情</returns>
         [HttpGet("/BookingMSKAPI/GetInfo")]
-        public async Task<BookingDeliveryRecordDto> GetInfo(long id)
+        public async Task<MSKBookingDto> GetInfo(long id)
         {
-            BookingDeliveryRecordDto model = null;
+            MSKBookingDto model = null;
 
             var entity = await _bookingDeliveryRecordRep.AsQueryable()
                  .FirstAsync(a => a.Id == id);
@@ -970,14 +990,15 @@ namespace Myshipping.Application.Service.BookingOrder
             if(entity == null)
                 throw Oops.Oh($"获取马士基API订舱详情失败，不存在或已作废");
 
-            model = entity.Adapt<BookingDeliveryRecordDto>();
+            model = entity.Adapt<MSKBookingDto>();
 
             var ctnList = _bookingDeliveryRecordCtnRep.AsQueryable()
                 .Where(a => a.RECORD_ID == id && a.IsDeleted == false).ToList();
 
             if (ctnList.Count > 0)
             {
-                model.ctns = ctnList.Select(a => new BookingDeliveryRecordCtnDto { 
+                model.ctns = ctnList.Select(a => new MSKBookingCtnInfo
+                { 
                     id = a.Id,
                     ctnCode = a.CTN_CODE,
                     carrierCtnCode = a.CARRIER_CTN_CODE,
@@ -1000,6 +1021,18 @@ namespace Myshipping.Application.Service.BookingOrder
         /// <returns>返回ID</returns>
         [HttpPost("/BookingMSKAPI/Save")]
         public async Task<long> Save([FromBody] MSKBookingDto model)
+        {
+            return await InnerSave(model);
+        }
+        #endregion
+
+        /// <summary>
+        /// 保存内部方法
+        /// </summary>
+        /// <param name="model">API订舱详情</param>
+        /// <param name="isSendApi">是否发送API，true-发送需要校验状态；false-不校验状态</param>
+        /// <returns></returns>
+        private async Task<long> InnerSave(MSKBookingDto model,bool isSendApi = false)
         {
             DateTime nowDate = DateTime.Now;
 
@@ -1013,10 +1046,20 @@ namespace Myshipping.Application.Service.BookingOrder
                     .Select(a => $"{a.Key}*{a.ToList().Sum(b => b.ctnNum.HasValue ? b.ctnNum.Value : 0)}").ToArray());
             }
 
+            if (model.id.HasValue && model.id.Value > 0)
+            {
+                var oldInfo = _bookingDeliveryRecordRep.AsQueryable()
+                    .First(a=>a.Id == model.id);
 
+                if (oldInfo == null)
+                    throw Oops.Oh("订舱数据不存在或已作废");
 
-            if (model.id.HasValue && model.id.Value > 0)
+                if (isSendApi)
                 {
+                    if(oldInfo.STATUS == "SUCC")
+                        throw Oops.Oh("订舱数据已发送成功，不能重复发送");
+                }
+
                 BookingDeliveryRecord entity = model.Adapt<BookingDeliveryRecord>();
 
                 entity.Id = model.id.Value;
@@ -1086,7 +1129,7 @@ namespace Myshipping.Application.Service.BookingOrder
 
                     });
 
-                    if(ctnEntityList.Count > 0)
+                    if (ctnEntityList.Count > 0)
                     {
                         ctnEntityList.ForEach(async ctn => {
                             ctn.IsDeleted = true;
@@ -1140,7 +1183,6 @@ namespace Myshipping.Application.Service.BookingOrder
                 return entity.Id;
             }
         }
-        #endregion
 
         #region 删除
         /// <summary>

Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs

@@ -136,8 +136,56 @@ namespace Myshipping.Application
                 .Map(dest => dest.PRICE_REFERENCE_NAME, src => src.priceReferenceName)
                 .Map(dest => dest.PRICE_OWNER_REFERENCE_ID, src => src.priceOwnerReferenceId)
                 .Map(dest => dest.PRICE_OWNER_REFERENCE, src => src.priceOwnerReference)
-                .Map(dest => dest.PRICE_OWNER_REFERENCE_NAME, src => src.priceOwnerReferenceName);
+                .Map(dest => dest.PRICE_OWNER_REFERENCE_NAME, src => src.priceOwnerReferenceName)
+                .Map(dest => dest.IS_REEFER, src => src.isReefer);
 
+            config.ForType<BookingDeliveryRecord, MSKBookingDto>()
+                .Map(dest => dest.id, src => src.Id)
+                .Map(dest => dest.carrierId, src => src.CARRIERID)
+                .Map(dest => dest.priceReference, src => src.PRICE_REFERENCE)
+                .Map(dest => dest.productCode, src => src.PRODUCT_CODE)
+                .Map(dest => dest.sender, src => src.SENDER)
+                .Map(dest => dest.bookedByCompanyName, src => src.BOOKEDBY_COMPANY_NAME)
+                .Map(dest => dest.bookedByMaerskPartyCode, src => src.BOOKEDBY_COMPANY_PARTYCODE)
+                .Map(dest => dest.bookedByCompanyContactName, src => src.BOOKEDBY_COMPANY_CONTACT)
+                .Map(dest => dest.bookedByCompanyContactEmail, src => src.BOOKEDBY_COMPANY_CONTACT_EMAIL)
+                .Map(dest => dest.isBookingPartOwnPrice, src => src.IS_BOOKING_PART_OWN_PRICE)
+                .Map(dest => dest.priceOwnerCompanyName, src => src.PRICE_OWNER_COMPANY_NAME)
+                .Map(dest => dest.priceOwnerMaerskPartyCode, src => src.PRICE_OWNER_COMPANY_PARTYCODE)
+                .Map(dest => dest.priceOwnerContactName, src => src.PRICE_OWNER_COMPANY_CONTACT)
+                .Map(dest => dest.priceOwnerContactEmail, src => src.PRICE_OWNER_COMPANY_CONTACT_EMAIL)
+                .Map(dest => dest.carrierCode, src => src.CARRIER_CODE)
+                .Map(dest => dest.earliestDepartureDate, src => src.EARLIEST_DEPARTURE_DATE)
+                .Map(dest => dest.exportServiceMode, src => src.EXPORT_SERVICE_MODE)
+                .Map(dest => dest.importServiceMode, src => src.IMPORT_SERVICE_MODE)
+                .Map(dest => dest.placeOfReceiptCityName, src => src.PLACERECEIPT_CITY)
+                .Map(dest => dest.placeOfReceiptUnLocCode, src => src.PLACERECEIPT_UNLOC_CODE)
+                .Map(dest => dest.placeOfDeliveryCityName, src => src.PLACEDELIVERY_CITY)
+                .Map(dest => dest.placeOfDeliveryUnLocCode, src => src.PLACEDELIVERY_UNLOC_CODE)
+                .Map(dest => dest.originDepartureDateTimeLocal, src => src.ETD)
+                .Map(dest => dest.destinationArrivalDateTimeLocal, src => src.ETA)
+                .Map(dest => dest.vesselName, src => src.VESSEL)
+                .Map(dest => dest.carrierVesselCode, src => src.VESSEL_CODE)
+                .Map(dest => dest.exportVoyageNumber, src => src.VOYNO)
+                .Map(dest => dest.transportMode, src => src.TRANSPORT_MODE)
+                .Map(dest => dest.totalCargoWeight, src => src.TOTAL_CARGO_WEIGHT)
+                .Map(dest => dest.noOfProbes, src => src.NO_OF_PROBES)
+                .Map(dest => dest.temperature, src => src.TEMPSET)
+                .Map(dest => dest.ventilation, src => src.VENT)
+                .Map(dest => dest.humidity, src => src.HUMIDITY)
+                .Map(dest => dest.commodityCodeType, src => src.COMMODITY_CODE_TYPE)
+                .Map(dest => dest.commodityCode, src => src.GOODSCODE)
+                .Map(dest => dest.commodityName, src => src.GOODSNAME)
+                .Map(dest => dest.isReefer, src => src.IS_REEFER)
+                .Map(dest => dest.cargoType, src => src.CARGO_TYPE)
+                .Map(dest => dest.placeOfReceiptCountryCode, src => src.PLACERECEIPT_COUNTRY_CODE)
+                .Map(dest => dest.placeOfDeliveryCountryCode, src => src.PLACEDELIVERY_COUNTRY_CODE)
+                .Map(dest => dest.EstSailingDays, src => src.EST_SAILING_DAYS)
+                .Map(dest => dest.priceReferenceId, src => src.PRICE_REFERENCE_ID)
+                .Map(dest => dest.priceReferenceName, src => src.PRICE_REFERENCE_NAME)
+                .Map(dest => dest.priceOwnerReferenceId, src => src.PRICE_OWNER_REFERENCE_ID)
+                .Map(dest => dest.priceOwnerReference, src => src.PRICE_OWNER_REFERENCE)
+                .Map(dest => dest.priceOwnerReferenceName, src => src.PRICE_OWNER_REFERENCE_NAME);
 
             config.ForType<MSKBookingCtnInfo, BookingDeliveryRecordCtn>()
                 .Map(dest => dest.CTN_CODE, src => src.ctnCode)

Myshipping.Application/Service/BookingOrder/Dto/MSKAPI/MSKAPIBookingDto.cs

@@ -382,7 +382,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 
         /// </summary>
-        public MSKAPIBookingSchedules bookingSchedules { get; set; }
+        public List<MSKAPIBookingSchedules> bookingSchedules { get; set; }
 
         /// <summary>
         /// 航行时间,分钟为单位

Myshipping.Application/Service/BookingOrder/Dto/MSKAPI/MSKAPIBookingResultDto.cs

@@ -21,7 +21,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 订舱回执详情
         /// </summary>
-        public MSKAPIBookingResultDataDto data { get; set; }
+        public object data { get; set; }
     }
 
     /// <summary>

Myshipping.Application/Service/BookingOrder/Dto/MSKBookingDto.cs

@@ -121,7 +121,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 最早起运日期, 不可小于当前日期
         /// </summary>
-        public string earliestDepartureDate { get; set; }
+        public Nullable<DateTime> earliestDepartureDate { get; set; }
 
         /// <summary>
         /// 出口服务类型(CY, SD, CFS)
@@ -293,5 +293,20 @@ namespace Myshipping.Application
         /// 集装箱主键
         /// </summary>
         public Nullable<long> id { get; set; }
+
+        /// <summary>
+        /// 对应船公司箱型
+        /// </summary>
+        public string carrierCtnCode { get; set; }
+
+        /// <summary>
+        /// 箱计量单位
+        /// </summary>
+        public string stuffingMeasurementType { get; set; }
+
+        /// <summary>
+        /// 重量或者体积的计量单位
+        /// </summary>
+        public string stuffingMeasurementUnit { get; set; }
     }
 }

Myshipping.Application/Service/BookingOrder/IBookingMSKAPIService.cs

@@ -50,7 +50,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="id">马士基API订舱ID</param>
         /// <returns>返回详情</returns>
-        Task<BookingDeliveryRecordDto> GetInfo(long id);
+        Task<MSKBookingDto> GetInfo(long id);
 
         /// <summary>
         /// 保存

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

@@ -89,5 +89,12 @@ namespace Myshipping.Application
         /// <param name="taskPKId">BC任务主键</param>
         /// <returns>返回回执</returns>
         Task<List<CompareResultDetailInfo>> GetCompareResult(string taskPKId);
+
+        /// <summary>
+        /// 同步舱位变更
+        /// </summary>
+        /// <param name="taskPKId">BC任务主键</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageOrderResultDto> SyncBookingSlotChange(string taskPKId);
     }
 }

Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs

@@ -925,7 +925,7 @@ namespace Myshipping.Application
         /// <param name="taskBCCtnList">BC任务集装箱列表</param>
         /// <param name="taskFileList">BC任务附件列表</param>
         /// <returns>返回舱位ID</returns>
-        private async Task<long> GenerateBookingSlot(TaskBCInfo taskBCInfo, List<TaskBCCTNInfo> taskBCCtnList, List<TaskFileInfo> taskFileList)
+        private async Task<long> GenerateBookingSlot(TaskBCInfo taskBCInfo, List<TaskBCCTNInfo> taskBCCtnList, List<TaskFileInfo> taskFileList,string opType = "add")
         {
             long id = 0;
 
@@ -972,7 +972,7 @@ namespace Myshipping.Application
                         TRANSFER_PORT_2 = taskBCInfo.TRANSFER_PORT_2,
                         CtnList = new List<BookingSlotCtnSaveInput>()
                     },
-                    OpType = "add"
+                    OpType = opType
                 };
 
                 var ctnCodeList = _cache.GetAllCodeCtn().GetAwaiter().GetResult().ToList();
@@ -1809,6 +1809,54 @@ namespace Myshipping.Application
 
             return await _bookingSlotService.GetSlotCompareResult(bcOrder.BOOKING_SLOT_ID.Value, bcOrder.BATCH_NO);
         }
+
+        /// <summary>
+        /// 同步舱位变更
+        /// </summary>
+        /// <param name="taskPKId">BC任务主键</param>
+        /// <returns>返回回执</returns>
+        [HttpGet("/TaskManageBC/SyncBookingSlotChange")]
+        public async Task<TaskManageOrderResultDto> SyncBookingSlotChange(string taskPKId)
+        {
+            TaskManageOrderResultDto result = new TaskManageOrderResultDto();
+
+            /*
+             1、检索对应舱位，比对差异
+             2、更新舱位信息。
+             3、检索舱位对应的订舱信息，如果有则生成通知邮件
+             */
+            try
+            {
+                var bcOrder = _taskBCInfoRepository.AsQueryable().First(a => a.TASK_ID == taskPKId);
+
+                if (bcOrder == null)
+                    throw Oops.Oh($"任务主键{taskPKId}无法获取BC业务信息");
+
+
+                if(bcOrder.BOOKING_SLOT_ID.HasValue && bcOrder.BOOKING_SLOT_ID.Value > 0)
+                {
+                    var bcCtnList = _taskBCCTNInfoRepository.AsQueryable().Where(a => a.P_ID == bcOrder.PK_ID).ToList();
+
+                    var fileList = _taskFileRepository.AsQueryable().Where(a => a.TASK_PKID == taskPKId).ToList();
+
+                    //推送舱位
+                    var bookingSlotId = GenerateBookingSlot(bcOrder, bcCtnList, fileList,"update").GetAwaiter().GetResult();
+
+
+                }
+                else
+                {
+                    throw Oops.Oh($"未检索到对应的舱位信息");
+                }
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"处理异常，原因：{ex.Message}";
+            }
+
+            return result;
+        }
     }
 
     /// <summary>

Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs

@@ -741,6 +741,21 @@ namespace Myshipping.Application
 
                         await _taskBCCTNInfoRepository.InsertAsync(bcCtnInfo);
                     });
+
+                    /*
+                     BC_MODIFY
+                     1、检索对应舱位，比对差异
+                     2、更新舱位信息。
+                     3、检索舱位对应的订舱信息，如果有则生成通知邮件
+                     CANCELLATION
+                     1、更新舱位状态。
+                     2、取消舱位与订舱的关系。
+                     */
+
+                    if (info.Main.TaskType == TaskBaseTypeEnum.BC_MODIFY)
+                    {
+
+                    }
                 }
                 #endregion