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 24597855ef 45fc70ad9f
commit c7fb0cd358
3 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File

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

@ -3304,7 +3304,7 @@ namespace Myshipping.Application
{
ChengZhongZhongLiang = ctn.WEIGHKGS.Value.ToString(),
ChengZhongShiJian = ctn.WEIGHDATE,
CTNALL = ctn.CTNALL,
CTNALL = ctn.CTNALL.Replace("'", ""),
CNTRNO = ctn.CNTRNO,
SEALNO = ctn.SEALNO
});
@ -4002,6 +4002,38 @@ namespace Myshipping.Application
primaryModel.SERVICEEDICODE = currServiceInfo.MapCode?.Trim();
}
//签单方式EDI
var baseIssueTypeList = _cache.GetAllCodeIssueType().GetAwaiter().GetResult();
var baseIssueTypeInfo = baseIssueTypeList.FirstOrDefault(t =>
t.EnName.Equals(order.ISSUETYPE, StringComparison.OrdinalIgnoreCase));
if (baseServiceInfo == null)
throw Oops.Bah($"签单方式{order.ISSUETYPE}的基础代码未找到");
//付费方式映射
var ediIssueTypeList = _cache.GetAllMappingIssueType().GetAwaiter().GetResult()
.Where(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase)
).ToList();
if (!string.IsNullOrWhiteSpace(order.ISSUETYPE))
{
var currIssueTypeInfo = ediIssueTypeList.FirstOrDefault(t => !string.IsNullOrWhiteSpace(t.CarrierCode)
&& t.CarrierCode.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase)
&& t.Code.Equals(baseServiceInfo.Code, StringComparison.OrdinalIgnoreCase));
if (currIssueTypeInfo == null)
{
//如果没有对应的船司记录，则取默认的第一个代码对应的记录
currIssueTypeInfo = ediIssueTypeList.FirstOrDefault(t => t.Code.Equals(baseServiceInfo.Code, StringComparison.OrdinalIgnoreCase));
}
if (currIssueTypeInfo == null)
throw Oops.Bah($"签单方式{order.ISSUETYPE}的EDI代码未找到");
primaryModel.ISSUETYPE = currIssueTypeInfo.MapCode?.Trim();
}
primaryModel.CARRIEREDICODE = ediSOSICfg.MapCode;
primaryModel.ORDERNO = order.BOOKINGNO;
@ -5431,7 +5463,7 @@ namespace Myshipping.Application
if (!string.IsNullOrEmpty(item.CARRIERID))
{
var CARRIER = _cache.GetAllCodeCarrier().Result.Where(x =>x.Code == item.CARRIERID).Select(x => x.CnName).FirstOrDefault();
var CARRIER = _cache.GetAllCodeCarrier().Result.Where(x => x.Code == item.CARRIERID).Select(x => x.CnName).FirstOrDefault();
if (CARRIER != null)
{
@ -5449,11 +5481,11 @@ namespace Myshipping.Application
item.ISSUETYPE = ISSUETYPE;
}
var ctn = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == item.Id ).ToListAsync();
var ctn = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == item.Id).ToListAsync();
item.ctnInputs = ctn.Adapt<List<BookingCtnDto>>();
foreach (var it in item.ctnInputs)
{
var ctnDetailInputs = await _ctndetailrep.AsQueryable().Filter(null, true).Where(x => x.CTNID == it.Id ).ToListAsync();
var ctnDetailInputs = await _ctndetailrep.AsQueryable().Filter(null, true).Where(x => x.CTNID == it.Id).ToListAsync();
it.ctnDetailInputs = ctnDetailInputs.Adapt<List<BookingCtnDetailDto>>();
}
var BookingLetteryard = await _repLetterYard.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id).FirstAsync();
@ -5461,7 +5493,7 @@ namespace Myshipping.Application
{
item.BookingLetteryard = BookingLetteryard;
}
var BookingEDIExt = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id ).FirstAsync();
var BookingEDIExt = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id).FirstAsync();
if (BookingEDIExt != null)
{
item.BookingEDIExt = BookingEDIExt.Adapt<BookingEDIExtDto>();
@ -5474,12 +5506,12 @@ namespace Myshipping.Application
ExtData = t.ExtData
}).Distinct().ToListAsync();
var childrens = await _rep.AsQueryable().Filter(null, true).Where(x => x.ParentId == item.Id && x.TenantId == UserManager.TENANT_ID).ToListAsync();
var childrens = await _rep.AsQueryable().Filter(null, true).Where(x => x.ParentId == item.Id && x.TenantId == UserManager.TENANT_ID).ToListAsync();
item.childrens = childrens.Adapt<List<Children>>();
foreach (var childitem in item.childrens)
{
var ctnInputs = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == childitem.Id ).ToListAsync();
var ctnInputs = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == childitem.Id).ToListAsync();
childitem.ctnInputs = ctnInputs.Adapt<List<BookingCtnDto>>();
foreach (var it in childitem.ctnInputs)
@ -5488,7 +5520,7 @@ namespace Myshipping.Application
it.ctnDetailInputs = ctnDetailInputs.Adapt<List<BookingCtnDetailDto>>();
}
var childBookingEDIExt = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == childitem.Id ).FirstAsync();
var childBookingEDIExt = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == childitem.Id).FirstAsync();
if (childBookingEDIExt != null)
{
childitem.BookingEDIExt = childBookingEDIExt.Adapt<BookingEDIExtDto>();

10
Myshipping.Core/Entity/CommonDB/CodeIssueType.cs
Unescape Escape View File

@ -62,14 +62,20 @@ namespace Myshipping.Core.Entity.CommonDB
/// </summary>
public string MapName { get; set; }
/// <summary>
/// 映射代码
/// </summary>
public string MapCode { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 船司代码
/// </summary>
public string CarrierCode { get; set; }
}

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

@ -1102,11 +1102,21 @@
映射名称
</summary>
</member>
<member name="P:Myshipping.Core.Entity.CommonDB.MappingIssueType.MapCode">
<summary>
映射代码
</summary>
</member>
<member name="P:Myshipping.Core.Entity.CommonDB.MappingIssueType.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Myshipping.Core.Entity.CommonDB.MappingIssueType.CarrierCode">
<summary>
船司代码
</summary>
</member>
<member name="P:Myshipping.Core.Entity.CodeLane.Code">
<summary>
航线代码

Write Preview
Loading…
Cancel
Save