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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -120,7 +120,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/page")]
+        [HttpGet("/BookingOrder/Page")]
         public async Task<dynamic> Page([FromQuery] BookingOrderInput input)
         {
             List<long> userlist = await DataFilterExtensions.GetDataScopeIdList();
@@ -256,7 +256,7 @@ namespace Myshipping.Application
         /// <param name="input"></param>
         /// <returns></returns>
         [SqlSugarUnitOfWork]
-        [HttpPost("/BookingOrder/add")]
+        [HttpPost("/BookingOrder/Add")]
         public async Task Add(AddBookingOrderInput input)
         {
             JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail");
@@ -311,7 +311,7 @@ namespace Myshipping.Application
         /// <param name="Id"></param>
         /// <returns></returns>
         [SqlSugarUnitOfWork]
-        [HttpPost("/BookingOrder/delete")]
+        [HttpPost("/BookingOrder/Delete")]
         public async Task Delete(long Id)
         {
             var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == Id).Select(x => x.Id).ToListAsync();
@@ -326,7 +326,7 @@ namespace Myshipping.Application
         /// <param name="input"></param>
         /// <returns></returns>
         [SqlSugarUnitOfWork]
-        [HttpPost("/BookingOrder/update")]
+        [HttpPost("/BookingOrder/Update")]
         public async Task Update(UpdateBookingOrderInput input)
         {
             JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail");
@@ -418,7 +418,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/get")]
+        [HttpGet("/BookingOrder/Get")]
         public async Task<BookingOrderOutput> Get(long Id)
         {
             BookingOrderOutput ordOut = new BookingOrderOutput();
@@ -456,7 +456,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/getLog")]
+        [HttpGet("/BookingOrder/GetLog")]
         public async Task<List<BookingLogDto>> GetLog(long Id)
         {
             List<BookingLogDto> list = new List<BookingLogDto>();
@@ -478,7 +478,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/getRemark")]
+        [HttpGet("/BookingOrder/GetRemark")]
         public async Task<List<BookingRemark>> GetRemark(long Id)
         {
             var list = await _bookingremark.AsQueryable().Where(u => u.PId == Id).ToListAsync();
@@ -491,7 +491,7 @@ namespace Myshipping.Application
         /// <param name="dto"></param>
         /// <returns></returns>
         [SqlSugarUnitOfWork]
-        [HttpPost("/BookingOrder/addRemark")]
+        [HttpPost("/BookingOrder/AddRemark")]
         public async Task AddRemark(BookingRemarkDto dto)
         {
             var entity = dto.Adapt<BookingRemark>();
@@ -504,7 +504,7 @@ namespace Myshipping.Application
         /// <param name="file"></param>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpPost("/BookingOrder/addFile")]
+        [HttpPost("/BookingOrder/AddFile")]
         public async Task AddFile(IFormFile file, [FromForm] BookingFileDto dto)
         {
             //未上传打印模板文件
@@ -562,7 +562,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/getFile")]
+        [HttpGet("/BookingOrder/GetFile")]
         public async Task<List<BookingFile>> GetFile(long Id)
         {
             var list = await _bookingfile.AsQueryable().Where(u => u.BookingId == Id).ToListAsync();
@@ -982,7 +982,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="bookingId"></param>
         /// <returns></returns>
-        [HttpPost("/BookingOrder/sendxhz")]
+        [HttpPost("/BookingOrder/SendXHZ")]
         public async Task SendXHZ(long bookingId)
         {
             var rtn = await XiahuozhiHelpler.Send(bookingId, "9");
@@ -1074,7 +1074,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="bookingId"></param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/txxplink")]
+        [HttpGet("/BookingOrder/TxxpLink")]
         public async Task<string> TxxpLink(long bookingId)
         {
             var order = _rep.FirstOrDefault(x => x.Id == bookingId);
@@ -1215,7 +1215,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="bookingId"></param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/vgmlink")]
+        [HttpGet("/BookingOrder/VgmLink")]
         public async Task<string[]> VgmLink(long bookingId)
         {
             var order = _rep.FirstOrDefault(x => x.Id == bookingId);
@@ -1381,7 +1381,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="bookingId"></param>
         /// <returns></returns>
-        [HttpPost("/BookingOrder/vgmsend")]
+        [HttpPost("/BookingOrder/VgmSend")]
         public async Task VgmSend(long bookingId)
         {
             var order = _rep.FirstOrDefault(x => x.Id == bookingId);
@@ -1851,7 +1851,7 @@ namespace Myshipping.Application
         /// 获取用户报表的json
         /// </summary>
         /// <param name="id"></param>
-        [HttpGet("/BookingOrder/reportJson")]
+        [HttpGet("/BookingOrder/GenReportJson")]
         public async Task<IActionResult> GenReportJson(long id)
         {
             var jsonUrl = _cache.GetAllDictData().Result.FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "url_report_generate").Value;
@@ -1874,7 +1874,7 @@ namespace Myshipping.Application
         /// <param name="id"></param>
         /// <param name="type">类型，对应字典中的【订舱打印模板类型】</param>
         /// <returns></returns>
-        [HttpGet("/BookingOrder/reportFile")]
+        [HttpGet("/BookingOrder/GenReportJson")]
         public async Task<IActionResult> GenReportJson(long id, string type)
         {
             //打印报表服务地址