whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
booking_auth_dev
wet 2 years ago
parent 270745adb7 c267b4eaa6
commit 548d3750e3
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
Unescape Escape View File

@ -1208,7 +1208,7 @@ namespace Myshipping.Application
public async Task<IActionResult> Print(long bookingId, string type)
{
var bs = await GetReportFile(bookingId, type);
var fileName = HttpUtility.UrlEncode($"{bookingId}_{DateTime.Now.Ticks}.xlsx", Encoding.GetEncoding("UTF-8"));
var fileName = HttpUtility.UrlEncode($"{bookingId}_{DateTime.Now.Ticks}.pdf", Encoding.GetEncoding("UTF-8"));
var result = new FileContentResult(bs, "application/octet-stream") { FileDownloadName = fileName };
return result;
}

44
Myshipping.Core/Myshipping.Core.xml
Unescape Escape View File

@ -7872,116 +7872,116 @@
关键字
</summary>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllCarrier">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllCarrier(System.Boolean)">
<summary>
获取船公司
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingCarrier">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingCarrier(System.Boolean)">
<summary>
获取船公司映射
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllVessel">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllVessel(System.Boolean)">
<summary>
获取船名
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingVessel">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingVessel(System.Boolean)">
<summary>
获取船名映射
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllForwarder">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllForwarder(System.Boolean)">
<summary>
获取船代
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllYard">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllYard(System.Boolean)">
<summary>
获取场站
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingYard">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingYard(System.Boolean)">
<summary>
获取场站映射
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllPortload">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllPortload(System.Boolean)">
<summary>
获取起始港
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllPort">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllPort(System.Boolean)">
<summary>
获取目的港
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllPackage">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllPackage(System.Boolean)">
<summary>
获取包装
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllService">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllService(System.Boolean)">
<summary>
获取运输方式
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllCtn">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllCtn(System.Boolean)">
<summary>
获取箱型
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingCtn">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingCtn(System.Boolean)">
<summary>
获取箱型映射
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllFrt">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllFrt(System.Boolean)">
<summary>
付费方式
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingFrt">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingFrt(System.Boolean)">
<summary>
付费方式映射
</summary>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingPortLoad">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingPortLoad(System.Boolean)">
<summary>
起始港映射
</summary>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingPort">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingPort(System.Boolean)">
<summary>
目的港映射
</summary>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingPackage">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingPackage(System.Boolean)">
<summary>
包装映射
</summary>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingService">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingService(System.Boolean)">
<summary>
运输服务映射
</summary>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllCodeIssueType">
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllCodeIssueType(System.Boolean)">
<summary>
签单方式
</summary>
@ -8454,7 +8454,7 @@
<param name="code"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.SysDictDataService.CacheData">
<member name="M:Myshipping.Core.Service.SysDictDataService.CacheData(System.Boolean)">
<summary>
缓存数据
</summary>
@ -9513,7 +9513,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.DjyEdiSettingService.CacheData">
<member name="M:Myshipping.Core.Service.DjyEdiSettingService.CacheData(System.Boolean)">
<summary>
缓存数据
</summary>

4
Myshipping.Web.Core/applicationconfig.json
Unescape Escape View File

@ -113,5 +113,9 @@
"RulesEngineProjects": "OCEAN_BOOKING",
"FriendlyExceptionSettings": {
"HideErrorCode": true
},
"TempFile": {
"Path": "TempFiles",
"RemainHours": 2
}
}
Write Preview
Loading…
Cancel
Save