修改MSK API

ds-wms-service/DS.WMS.Core/Op/Interface/SpaceBooking/ISpaceBookingMSKAPIService.cs

@@ -151,5 +151,12 @@ namespace DS.WMS.Core.Op.Interface
         /// <param name="ids">马士基API订舱ID组</param>
         /// <returns>返回回执</returns>
         Task<DataResult<string>> BatchCancelTimerBooking(long[] ids);
+
+        /// <summary>
+        /// 发送马士基订舱请求
+        /// </summary>
+        /// <param name="id">请求订舱ID</param>
+        /// <returns>返回检索结果</returns>
+        Task<DataResult<MSKBookingResultDto>> SendMSKBookingById(long id);
     }
 }

ds-wms-service/DS.WMS.Core/Op/Method/SpaceBooking/SpaceBookingMSKAPIService.cs

@@ -2863,5 +2863,36 @@ namespace DS.WMS.Core.Op.Method
             return DataResult<string>.Success(msg);
         }
         #endregion
+
+        #region 发送马士基订舱请求
+        /// <summary>
+        /// 发送马士基订舱请求
+        /// </summary>
+        /// <param name="id">请求订舱ID</param>
+        /// <returns>返回检索结果</returns>
+        public async Task<DataResult<MSKBookingResultDto>> SendMSKBookingById(long id)
+        {
+            var model =  GetInfo(id).GetAwaiter().GetResult().Data;
+
+            if (model != null)
+            {
+                if (model.Status == "SUCC")
+                {
+                    return DataResult<MSKBookingResultDto>.FailedData(new MSKBookingResultDto
+                    {
+                        succ = false,
+                        msg = "订舱数据已发送成功，不能重复发送"
+                    });
+                }
+
+                return await InnerSendMSKBooking(model, id, false);
+            }
+            return DataResult<MSKBookingResultDto>.FailedData(new MSKBookingResultDto
+            {
+                succ = false,
+                msg = "预订舱信息不存在"
+            });
+        }
+        #endregion
     }
 }

ds-wms-service/DS.WMS.OpApi/Controllers/SpaceBookingMSKAPIController.cs

@@ -1,8 +1,11 @@
 using DS.Module.Core;
+using DS.Module.Core.Attributes;
 using DS.WMS.Core.Op.Dtos;
 using DS.WMS.Core.Op.Interface;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Org.BouncyCastle.Crypto;
 
 namespace DS.WMS.OpApi.Controllers
 {
@@ -215,6 +218,7 @@ namespace DS.WMS.OpApi.Controllers
         }
         #endregion
 
+        #region 获取预订舱途径选择
         /// <summary>
         /// 获取预订舱途径选择
         /// </summary>
@@ -225,6 +229,70 @@ namespace DS.WMS.OpApi.Controllers
         {
             return await _spaceBookingMSKAPIService.GetBookingChannelSelectShow();
         }
+        #endregion
+
+        #region 生成订舱报告邮件并自动转发
+        /// <summary>
+        /// 生成订舱报告邮件并自动转发
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("GenerateTimerReportEmail")]
+        public async Task<DataResult<string>> GenerateTimerReportEmail()
+        {
+            return await _spaceBookingMSKAPIService.GenerateTimerReportEmail();
+        }
+        #endregion
+
+        #region 批量取消定时订舱时间
+        /// <summary>
+        /// 批量取消定时订舱时间
+        /// </summary>
+        /// <param name="ids">马士基API订舱ID组</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("BatchCancelTimerBooking")]
+        public async Task<DataResult<string>> BatchCancelTimerBooking([FromBody] long[] ids)
+        {
+            return await _spaceBookingMSKAPIService.BatchCancelTimerBooking(ids);
+        }
+        #endregion
+
+        #region 获取定时订舱方案列表
+        /// <summary>
+        /// 获取定时订舱方案列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("GetTimerSchemeList")]
+        public async Task<DataResult<List<MSKAPITimerSchemeDto>>> GetTimerSchemeList()
+        {
+            return await _spaceBookingMSKAPIService.GetTimerSchemeList();
+        }
+        #endregion
+
+        #region 批量设定定时订舱时间
+        /// <summary>
+        /// 批量设定定时订舱时间
+        /// </summary>
+        /// <param name="model">请求详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("BatchSetupTimerBooking")]
+        public async Task<DataResult<string>> BatchSetupTimerBooking([FromBody] MSKAPITimerBookingDto model)
+        {
+            return await _spaceBookingMSKAPIService.BatchSetupTimerBooking(model);
+        }
+        #endregion
+
+        #region 发送马士基订舱请求
+        /// <summary>
+        /// 发送马士基订舱请求
+        /// </summary>
+        /// <param name="id">请求订舱ID</param>
+        /// <returns>返回检索结果</returns>
+        [HttpGet("SendMSKBookingById"), AllowAnonymous, ApiUser(ApiCode = "BCTaskManage")]
+        public async Task<DataResult<MSKBookingResultDto>> SendMSKBookingById([FromQuery] long id)
+        {
+            return await _spaceBookingMSKAPIService.SendMSKBookingById(id);
+        }
+        #endregion
     }
 }