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

Myshipping.Application/Enum/TaskBaseTypeEnum.cs

@@ -145,7 +145,12 @@ namespace Myshipping.Application
         /// Transfer Nomination(预甩货通知)
         /// </summary>
         [Description("TransferNomination")]
-        TRANSFER_NOMINATION
+        TRANSFER_NOMINATION,
+        /// <summary>
+        /// VGM回执
+        /// </summary>
+        [Description("VGM回执")]
+        VGM_FEEDBACK,
 
     }
 }

Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs

@@ -55,7 +55,7 @@ namespace Myshipping.Application.Service.BookingOrder
         /// </summary>
         /// <param name="model">请求船期详情</param>
         /// <returns>返回船期结果</returns>
-        [HttpPost("/BookingOrder/SearchShipSailingSchedule")]
+        [HttpPost("/BookingMSKAPI/SearchShipSailingSchedule")]
         public async Task<List<SearchShipSailingScheduleResultDto>> SearchShipSailingSchedule(QueryShipSailingScheduleDto model)
         {
             List<SearchShipSailingScheduleResultDto> list = new List<SearchShipSailingScheduleResultDto>();
@@ -224,7 +224,7 @@ namespace Myshipping.Application.Service.BookingOrder
         /// </summary>
         /// <param name="model">请求订舱详情</param>
         /// <returns></returns>
-        [HttpPost("/BookingOrder/SendMSKBooking")]
+        [HttpPost("/BookingMSKAPI/SendMSKBooking")]
         public async Task<MSKBookingResultDto> SendMSKBooking(MSKBookingDto model)
         {
             MSKBookingResultDto result = new MSKBookingResultDto();
@@ -485,7 +485,7 @@ namespace Myshipping.Application.Service.BookingOrder
         /// </summary>
         /// <param name="model">请求详情</param>
         /// <returns>返回检索结果</returns>
-        [HttpPost("/BookingOrder/SearchCommodities")]
+        [HttpPost("/BookingMSKAPI/SearchCommodities")]
         public async Task<List<SearchCommodityResultDto>> SearchCommodities(QueryCommoditiesDto model)
         {
             List<SearchCommodityResultDto> list = new List<SearchCommodityResultDto>();
@@ -576,7 +576,7 @@ namespace Myshipping.Application.Service.BookingOrder
         /// </summary>
         /// <param name="model">请求详情</param>
         /// <returns>返回检索结果</returns>
-        [HttpPost("/BookingOrder/SearchLocations")]
+        [HttpPost("/BookingMSKAPI/SearchLocations")]
         public async Task<List<QueryLocationsResultDto>> SearchLocations(QueryLocationsDto model)
         {
             List<QueryLocationsResultDto> list = new List<QueryLocationsResultDto>();

Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs

@@ -1220,7 +1220,8 @@ namespace Myshipping.Application
                             if (File.Exists(fileFullPath))
                             {
                                 //如果确认文件读取成功
-                                var bookFilePath = FileAttachHelper.MoveFile(id.ToString(), fileFullPath, batchNo).GetAwaiter().GetResult();
+                                var bookFilePath = FileAttachHelper.MoveFile(id.ToString(), fileFullPath, batchNo
+                                    , false, null, true).GetAwaiter().GetResult();
 
                                 //将格式单附件写入订舱的附件
                                 SaveEDIFile(id, bookFilePath, new System.IO.FileInfo(bookFilePath).Name, taskBCInfo.TenantId.Value,
@@ -1234,7 +1235,8 @@ namespace Myshipping.Application
                             if (File.Exists(fileFullPath))
                             {
                                 //如果确认文件读取成功
-                                var bookFilePath = FileAttachHelper.MoveFile(id.ToString(), fileFullPath, batchNo, false, "bcnoticefile").GetAwaiter().GetResult();
+                                var bookFilePath = FileAttachHelper.MoveFile(id.ToString(), fileFullPath, batchNo
+                                    , false, "bcnoticefile",true).GetAwaiter().GetResult();
 
                                 //将格式单附件写入订舱的附件
                                 SaveEDIFile(id, bookFilePath, new System.IO.FileInfo(bookFilePath).Name, taskBCInfo.TenantId.Value,