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
optimize
wet 2 years ago
parent 6d0964f325 7171046d79
commit 1e8cbf1703
6 changed files with 166 additions and 7 deletions
Show Stats Download Patch File Download Diff File

3
Myshipping.Application/Myshipping.Application.xml
Unescape Escape View File

@ -4989,11 +4989,12 @@
<param name="carrierId">船公司ID</param> <param name="carrierId">船公司ID</param>
<returns>返回适用的路由枚举</returns> <returns>返回适用的路由枚举</returns>
</member> </member>
<member name="M:Myshipping.Application.BookingOrderService.OcrUpFile(Microsoft.AspNetCore.Http.IFormFile)"> <member name="M:Myshipping.Application.BookingOrderService.OcrUpFile(Microsoft.AspNetCore.Http.IFormFile,System.Int64)">
<summary> <summary>
上传ocr文件 上传ocr文件
</summary> </summary>
<param name="file"></param> <param name="file"></param>
<param name="bookingId">订舱id</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Myshipping.Application.BookingOrderService.OcrGetImg(System.String,System.Single)"> <member name="M:Myshipping.Application.BookingOrderService.OcrGetImg(System.String,System.Single)">

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

@ -745,7 +745,7 @@ namespace Myshipping.Application
[HttpPost("/BookingOrder/AddFile")] [HttpPost("/BookingOrder/AddFile")]
public async Task AddFile(IFormFile file, [FromForm] BookingFileDto dto) public async Task AddFile(IFormFile file, [FromForm] BookingFileDto dto)
{ {
//未上传打印模板文件 //未上传文件
if (file == null || file.Length == 0) if (file == null || file.Length == 0)
{ {
throw Oops.Bah(BookingErrorCode.BOOK200); throw Oops.Bah(BookingErrorCode.BOOK200);
@ -893,8 +893,8 @@ namespace Myshipping.Application
{ {
BusinessId = BusinessId, BusinessId = BusinessId,
MBLNO = MBLNO, MBLNO = MBLNO,
YARD = YARD==""?null: YARD, YARD = YARD == "" ? null : YARD,
YardCode = YARDID == ""? null: YARDID, YardCode = YARDID == "" ? null : YARDID,
CARRIER = CARRIER == "" ? null : CARRIER, CARRIER = CARRIER == "" ? null : CARRIER,
CARRIERID = CARRIERID == "" ? null : CARRIERID, CARRIERID = CARRIERID == "" ? null : CARRIERID,
isBook = isbook isBook = isbook
@ -2807,9 +2807,10 @@ namespace Myshipping.Application
/// 上传ocr文件 /// 上传ocr文件
/// </summary> /// </summary>
/// <param name="file"></param> /// <param name="file"></param>
/// <param name="bookingId">订舱id</param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/BookingOrder/OcrUpFile")] [HttpPost("/BookingOrder/OcrUpFile")]
public async Task<string> OcrUpFile(IFormFile file) public async Task<string> OcrUpFile(IFormFile file, long bookingId)
{ {
//未上传文件 //未上传文件
if (file == null || file.Length == 0) if (file == null || file.Length == 0)
@ -2817,6 +2818,14 @@ namespace Myshipping.Application
throw Oops.Bah("未上传文件"); throw Oops.Bah("未上传文件");
} }
//保存到订舱
await AddFile(file, new BookingFileDto()
{
BookingId = bookingId,
TypeCode = "other",
TypeName = "其他"
});
var originalFilename = file.FileName; // 文件原始名称 var originalFilename = file.FileName; // 文件原始名称
var fileSuffix = Path.GetExtension(file.FileName).ToLower(); // 文件后缀 var fileSuffix = Path.GetExtension(file.FileName).ToLower(); // 文件后缀

33
Myshipping.Core/Entity/DJY/DjyCustomer.cs
Unescape Escape View File

@ -99,5 +99,38 @@ namespace Myshipping.Core.Entity
/// 备注 /// 备注
/// </summary> /// </summary>
public string Remark { get; set; } public string Remark { get; set; }
/// <summary>
/// 操作id
/// </summary>
public string OPID { get; set; }
/// <summary>
/// 单证id
/// </summary>
public string DOCID { get; set; }
/// <summary>
/// 操作
/// </summary>
public string OP { get; set; }
/// <summary>
/// 单证
/// </summary>
public string DOC { get; set; }
/// <summary>
/// 销售ID
/// </summary>
public string SALEID { get; set; }
/// <summary>
/// 销售
/// </summary>
public string SALE { get; set; }
/// <summary>
/// 客服ID
/// </summary>
public string CUSTSERVICEID { get; set; }
/// <summary>
/// 客服
/// </summary>
public string CUSTSERVICE { get; set; }
} }
} }

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

@ -1704,6 +1704,46 @@
备注 备注
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.OPID">
<summary>
操作id
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.DOCID">
<summary>
单证id
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.OP">
<summary>
操作
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.DOC">
<summary>
单证
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.SALEID">
<summary>
销售ID
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.SALE">
<summary>
销售
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.CUSTSERVICEID">
<summary>
客服ID
</summary>
</member>
<member name="P:Myshipping.Core.Entity.DjyCustomer.CUSTSERVICE">
<summary>
客服
</summary>
</member>
<member name="T:Myshipping.Core.Entity.DjyCustomerContact"> <member name="T:Myshipping.Core.Entity.DjyCustomerContact">
<summary> <summary>
@ -9053,11 +9093,12 @@
<param name="customerId"></param> <param name="customerId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Myshipping.Core.Service.DjyCustomerService.Suggest(System.String)"> <member name="M:Myshipping.Core.Service.DjyCustomerService.Suggest(System.String,System.String)">
<summary> <summary>
下拉筛选 下拉筛选
</summary> </summary>
<param name="keyword">关键字</param> <param name="keyword">关键字</param>
<param name="type">类型，参考字典参数：客户属性（djy_cust_prop）</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:Myshipping.Core.Service.DjyCustomerContactDto"> <member name="T:Myshipping.Core.Service.DjyCustomerContactDto">
@ -9550,6 +9591,46 @@
备注 备注
</summary> </summary>
</member> </member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.OPID">
<summary>
操作id
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.DOCID">
<summary>
单证id
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.OP">
<summary>
操作
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.DOC">
<summary>
单证
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.SALEID">
<summary>
销售ID
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.SALE">
<summary>
销售
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.CUSTSERVICEID">
<summary>
客服ID
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyCustomerInput.CUSTSERVICE">
<summary>
客服
</summary>
</member>
<member name="T:Myshipping.Core.Service.AddDjyCustomerInput"> <member name="T:Myshipping.Core.Service.AddDjyCustomerInput">
<summary> <summary>
订舱客户新增输入参数 订舱客户新增输入参数

4
Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs
Unescape Escape View File

@ -175,13 +175,15 @@ namespace Myshipping.Core.Service
/// 下拉筛选 /// 下拉筛选
/// </summary> /// </summary>
/// <param name="keyword">关键字</param> /// <param name="keyword">关键字</param>
/// <param name="type">类型，参考字典参数：客户属性（djy_cust_prop）</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("/DjyCustomer/Suggest")] [HttpGet("/DjyCustomer/Suggest")]
public async Task<dynamic> Suggest(string keyword) public async Task<dynamic> Suggest(string keyword, string type)
{ {
List<long> userlist = await DataFilterExtensions.GetDataScopeIdList(); List<long> userlist = await DataFilterExtensions.GetDataScopeIdList();
var entities = await _rep.AsQueryable().Filter(null, true) var entities = await _rep.AsQueryable().Filter(null, true)
.Where(x => x.TenantId == UserManager.TENANT_ID) .Where(x => x.TenantId == UserManager.TENANT_ID)
.WhereIF(!string.IsNullOrWhiteSpace(type), u => u.PropString.Contains(type))
.WhereIF(!string.IsNullOrWhiteSpace(keyword), u => u.CodeName.Contains(keyword) || u.ShortName.Contains(keyword)) .WhereIF(!string.IsNullOrWhiteSpace(keyword), u => u.CodeName.Contains(keyword) || u.ShortName.Contains(keyword))
.ToPagedListAsync(1, 10); .ToPagedListAsync(1, 10);
return entities.XnPagedResult(); return entities.XnPagedResult();

33
Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs
Unescape Escape View File

@ -125,6 +125,39 @@ namespace Myshipping.Core.Service
/// </summary> /// </summary>
public virtual string Remark { get; set; } public virtual string Remark { get; set; }
/// <summary>
/// 操作id
/// </summary>
public string OPID { get; set; }
/// <summary>
/// 单证id
/// </summary>
public string DOCID { get; set; }
/// <summary>
/// 操作
/// </summary>
public string OP { get; set; }
/// <summary>
/// 单证
/// </summary>
public string DOC { get; set; }
/// <summary>
/// 销售ID
/// </summary>
public string SALEID { get; set; }
/// <summary>
/// 销售
/// </summary>
public string SALE { get; set; }
/// <summary>
/// 客服ID
/// </summary>
public string CUSTSERVICEID { get; set; }
/// <summary>
/// 客服
/// </summary>
public string CUSTSERVICE { get; set; }
public List<AddDjyCustomerContactInput> Contacts { get; set; } public List<AddDjyCustomerContactInput> Contacts { get; set; }
} }

Write Preview
Loading…
Cancel
Save