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

修改新增SITC中转信息

Browse Source
master^2
jianghaiqing 4 days ago
parent a25ce7ef54
commit 5bd0ebe79f
5 changed files with 628 additions and 0 deletions
Show Stats Download Patch File Download Diff File

198
Myshipping.Application/EDI/Dtos/EDIBaseModel.cs
Unescape Escape View File

@ -91,5 +91,203 @@ namespace Myshipping.Application
/// 付费方式代码
/// </summary>
public string PAYABLE { get; set; }
/// <summary>
/// 海丰扩展信息
/// </summary>
public SITCExtInfo SITCExt { get; set; }
}
public class SITCExtInfo
{
/// <summary>
/// 运程类型（DIRECT-直达，SECOND-二程，THIRD-三程）
/// </summary>
public string TransferType { get; set; }
/// <summary>
/// 运程类型名称（DIRECT-直达，SECOND-二程，THIRD-三程）
/// </summary>
public string TransferTypeName { get; set; }
/// <summary>
/// 一程运力类型（MAIN-干线，BRANCH-支线）
/// </summary>
public string FstShipCapacity { get; set; }
/// <summary>
/// 一程运力类型名称（MAIN-干线，BRANCH-支线）
/// </summary>
public string FstShipCapacityName { get; set; }
/// <summary>
/// 一程ETD
/// </summary>
public Nullable<DateTime> FstETD { get; set; }
/// <summary>
/// 一程船名
/// </summary>
public string FstVessel { get; set; }
/// <summary>
/// 一程航次号
/// </summary>
public string FstVoyno { get; set; }
/// <summary>
/// 一程装货港代码
/// </summary>
public string FstPortLoadCode { get; set; }
/// <summary>
/// 一程装货港名称
/// </summary>
public string FstPortLoad { get; set; }
/// <summary>
/// 一程卸货港代码
/// </summary>
public string FstPortDischargeCode { get; set; }
/// <summary>
/// 一程卸货港名称
/// </summary>
public string FstPortDischarge { get; set; }
/// <summary>
/// 一程港属类型（LOCATION-本港）
/// </summary>
public string FstTransferLocType { get; set; }
/// <summary>
/// 一程港属类型名称（LOCATION-本港）
/// </summary>
public string FstTransferLogTypeName { get; set; }
/// <summary>
/// 一程航线
/// </summary>
public string FstLaneName { get; set; }
/// <summary>
/// 二程运力类型（MAIN-干线，BRANCH-支线）
/// </summary>
public string SecShipCapacity { get; set; }
/// <summary>
/// 二程运力类型名称（MAIN-干线，BRANCH-支线）
/// </summary>
public string SecShipCapacityName { get; set; }
/// <summary>
/// 二程ETD
/// </summary>
public Nullable<DateTime> SecETD { get; set; }
/// <summary>
/// 二程船名
/// </summary>
public string SecVessel { get; set; }
/// <summary>
/// 二程航次号
/// </summary>
public string SecVoyno { get; set; }
/// <summary>
/// 二程装货港代码
/// </summary>
public string SecPortLoadCode { get; set; }
/// <summary>
/// 二程装货港名称
/// </summary>
public string SecPortLoad { get; set; }
/// <summary>
/// 二程卸货港代码
/// </summary>
public string SecPortDischargeCode { get; set; }
/// <summary>
/// 二程卸货港名称
/// </summary>
public string SecPortDischarge { get; set; }
/// <summary>
/// 二程港属类型（LOCATION-本港）
/// </summary>
public string SecTransferLocType { get; set; }
/// <summary>
/// 二程港属类型名称（LOCATION-本港）
/// </summary>
public string SecTransferLogTypeName { get; set; }
/// <summary>
/// 二程航线
/// </summary>
public string SecLaneName { get; set; }
/// <summary>
/// 三程运力类型（MAIN-干线，BRANCH-支线）
/// </summary>
public string ThdShipCapacity { get; set; }
/// <summary>
/// 三程运力类型名称（MAIN-干线，BRANCH-支线）
/// </summary>
public string ThdShipCapacityName { get; set; }
/// <summary>
/// 三程ETD
/// </summary>
public Nullable<DateTime> ThdETD { get; set; }
/// <summary>
/// 三程船名
/// </summary>
public string ThdVessel { get; set; }
/// <summary>
/// 三程航次号
/// </summary>
public string ThdVoyno { get; set; }
/// <summary>
/// 三程装货港代码
/// </summary>
public string ThdPortLoadCode { get; set; }
/// <summary>
/// 三程装货港名称
/// </summary>
public string ThdPortLoad { get; set; }
/// <summary>
/// 三程卸货港代码
/// </summary>
public string ThdPortDischargeCode { get; set; }
/// <summary>
/// 三程卸货港名称
/// </summary>
public string ThdPortDischarge { get; set; }
/// <summary>
/// 三程港属类型（LOCATION-本港）
/// </summary>
public string ThdTransferLocType { get; set; }
/// <summary>
/// 三程港属类型名称（LOCATION-本港）
/// </summary>
public string ThdTransferLogTypeName { get; set; }
/// <summary>
/// 三程航线
/// </summary>
public string ThdLaneName { get; set; }
}
}

40
Myshipping.Application/EDI/SITCEdiHelper.cs
Unescape Escape View File

@ -1,5 +1,6 @@
using DocumentFormat.OpenXml.ExtendedProperties;
using Google.Protobuf.WellKnownTypes;
using Mapster.Utils;
using Myshipping.Application.EDI.ESL;
using MySqlX.XDevAPI.Common;
using Newtonsoft.Json;
@ -203,6 +204,30 @@ namespace Myshipping.Application.EDI.SITC
});
}
/*
1.直达无需处理 OUT特殊设置TRA
2.若有中转，根据一程 二程 三程 处理 json中 clen的值‘1-3’
3.干线支线的选择，如接口文档中 支线：0 干线：1
4.港口及代码的处理，均按照映射中 船公司为SITC的港口代码进行处理
5.运输类型 cCommodity 默认为0
*/
if (InttrEdi.SITCExt != null && !string.IsNullOrWhiteSpace(InttrEdi.SITCExt.TransferType) && !InttrEdi.SITCExt.TransferType.Equals("DIRECT",StringComparison.OrdinalIgnoreCase))
{
//if (InttrEdi.SITCExt.TransferType.Equals("SECOND", StringComparison.OrdinalIgnoreCase))
//{
// postModel.extras.Add(new SitcApiPostModelExtra
// {
// ctype = "TRA",
// clen = 1,
// cnum = InttrEdi.SITCExt.FstShipCapacity == "MAIN" ? 1 : 0,
// vent = InttrEdi.SITCExt.FstVessel?.Trim(),
// humdity = InttrEdi.SITCExt.FstVoyno?.Trim(),
// soc = InttrEdi.SITCExt.FstLaneName?.Trim(),
// unit =
// });
//}
}
string json = JsonConvert.SerializeObject(postModel, Formatting.Indented, new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
@ -573,6 +598,21 @@ namespace Myshipping.Application.EDI.SITC
/// 类型
/// </summary>
public string ctype { get; set; }
/// <summary>
/// 程次(TRA)
/// </summary>
public Nullable<int> clen { get; set; }
/// <summary>
/// 支线:0;干线:1(TRA)
/// </summary>
public Nullable<int> cnum { get; set; }
/// <summary>
/// 航线代码
/// </summary>
public string soc { get; set; }
}
public class SitcApiPostModelDangerInfo

190
Myshipping.Application/Entity/BookingMultiLineSplitRecord.cs
Unescape Escape View File

@ -75,5 +75,195 @@ namespace Myshipping.Application.Entity
/// 付费方式代码
/// </summary>
public string PAYABLE { get; set; }
/// <summary>
/// 运程类型（DIRECT-直达，SECOND-二程，THIRD-三程）
/// </summary>
public string TransferType { get; set; }
/// <summary>
/// 运程类型名称（DIRECT-直达，SECOND-二程，THIRD-三程）
/// </summary>
public string TransferTypeName { get; set; }
/// <summary>
/// 一程运力类型（MAIN-干线，BRANCH-支线）
/// </summary>
public string FstShipCapacity { get; set; }
/// <summary>
/// 一程运力类型名称（MAIN-干线，BRANCH-支线）
/// </summary>
public string FstShipCapacityName { get; set; }
/// <summary>
/// 一程ETD
/// </summary>
public Nullable<DateTime> FstETD { get; set; }
/// <summary>
/// 一程船名
/// </summary>
public string FstVessel { get; set; }
/// <summary>
/// 一程航次号
/// </summary>
public string FstVoyno { get; set; }
/// <summary>
/// 一程装货港代码
/// </summary>
public string FstPortLoadCode { get; set; }
/// <summary>
/// 一程装货港名称
/// </summary>
public string FstPortLoad { get; set; }
/// <summary>
/// 一程卸货港代码
/// </summary>
public string FstPortDischargeCode { get; set; }
/// <summary>
/// 一程卸货港名称
/// </summary>
public string FstPortDischarge { get; set; }
/// <summary>
/// 一程港属类型（LOCATION-本港）
/// </summary>
public string FstTransferLocType { get; set; }
/// <summary>
/// 一程港属类型名称（LOCATION-本港）
/// </summary>
public string FstTransferLogTypeName { get; set; }
/// <summary>
/// 一程航线
/// </summary>
public string FstLaneName { get; set; }
/// <summary>
/// 二程运力类型（MAIN-干线，BRANCH-支线）
/// </summary>
public string SecShipCapacity { get; set; }
/// <summary>
/// 二程运力类型名称（MAIN-干线，BRANCH-支线）
/// </summary>
public string SecShipCapacityName { get; set; }
/// <summary>
/// 二程ETD
/// </summary>
public Nullable<DateTime> SecETD { get; set; }
/// <summary>
/// 二程船名
/// </summary>
public string SecVessel { get; set; }
/// <summary>
/// 二程航次号
/// </summary>
public string SecVoyno { get; set; }
/// <summary>
/// 二程装货港代码
/// </summary>
public string SecPortLoadCode { get; set; }
/// <summary>
/// 二程装货港名称
/// </summary>
public string SecPortLoad { get; set; }
/// <summary>
/// 二程卸货港代码
/// </summary>
public string SecPortDischargeCode { get; set; }
/// <summary>
/// 二程卸货港名称
/// </summary>
public string SecPortDischarge { get; set; }
/// <summary>
/// 二程港属类型（LOCATION-本港）
/// </summary>
public string SecTransferLocType { get; set; }
/// <summary>
/// 二程港属类型名称（LOCATION-本港）
/// </summary>
public string SecTransferLogTypeName { get; set; }
/// <summary>
/// 二程航线
/// </summary>
public string SecLaneName { get; set; }
/// <summary>
/// 三程运力类型（MAIN-干线，BRANCH-支线）
/// </summary>
public string ThdShipCapacity { get; set; }
/// <summary>
/// 三程运力类型名称（MAIN-干线，BRANCH-支线）
/// </summary>
public string ThdShipCapacityName { get; set; }
/// <summary>
/// 三程ETD
/// </summary>
public Nullable<DateTime> ThdETD { get; set; }
/// <summary>
/// 三程船名
/// </summary>
public string ThdVessel { get; set; }
/// <summary>
/// 三程航次号
/// </summary>
public string ThdVoyno { get; set; }
/// <summary>
/// 三程装货港代码
/// </summary>
public string ThdPortLoadCode { get; set; }
/// <summary>
/// 三程装货港名称
/// </summary>
public string ThdPortLoad { get; set; }
/// <summary>
/// 三程卸货港代码
/// </summary>
public string ThdPortDischargeCode { get; set; }
/// <summary>
/// 三程卸货港名称
/// </summary>
public string ThdPortDischarge { get; set; }
/// <summary>
/// 三程港属类型（LOCATION-本港）
/// </summary>
public string ThdTransferLocType { get; set; }
/// <summary>
/// 三程港属类型名称（LOCATION-本港）
/// </summary>
public string ThdTransferLogTypeName { get; set; }
/// <summary>
/// 三程航线
/// </summary>
public string ThdLaneName { get; set; }
}
}

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

@ -8246,6 +8246,10 @@ namespace Myshipping.Application
primaryModel.FEETYPE = multiline.FEETYPE;
primaryModel.PAYABLEEXT = multiline.PAYABLE;
ediModel.SITCExt = multiline.Adapt<SITCExtInfo>();
//这里做个检查
}
}
@ -12386,6 +12390,12 @@ namespace Myshipping.Application
result.succ = true;
result.extra = sitcModel;
var record = _repBookingMultiLineSplitRecord.AsQueryable().Where(a => a.BOOKING_ID == model.Id).OrderByDescending(a => a.CreatedTime).First();
if (record != null)
{
result.extra2 = record;
}
return result;
}

190
Myshipping.Application/Service/BookingOrder/Dto/MultilineSplit/BookingMultiLineSplitDto.cs
Unescape Escape View File

@ -70,5 +70,195 @@ namespace Myshipping.Application
/// 付费方式代码
/// </summary>
public string PAYABLE { get; set; }
/// <summary>
/// 运程类型（DIRECT-直达，SECOND-二程，THIRD-三程）
/// </summary>
public string TransferType { get; set; }
/// <summary>
/// 运程类型名称（DIRECT-直达，SECOND-二程，THIRD-三程）
/// </summary>
public string TransferTypeName { get; set; }
/// <summary>
/// 一程运力类型（MAIN-干线，BRANCH-支线）
/// </summary>
public string FstShipCapacity { get; set; }
/// <summary>
/// 一程运力类型名称（MAIN-干线，BRANCH-支线）
/// </summary>
public string FstShipCapacityName { get; set; }
/// <summary>
/// 一程ETD
/// </summary>
public Nullable<DateTime> FstETD { get; set; }
/// <summary>
/// 一程船名
/// </summary>
public string FstVessel { get; set; }
/// <summary>
/// 一程航次号
/// </summary>
public string FstVoyno { get; set; }
/// <summary>
/// 一程装货港代码
/// </summary>
public string FstPortLoadCode { get; set; }
/// <summary>
/// 一程装货港名称
/// </summary>
public string FstPortLoad { get; set; }
/// <summary>
/// 一程卸货港代码
/// </summary>
public string FstPortDischargeCode { get; set; }
/// <summary>
/// 一程卸货港名称
/// </summary>
public string FstPortDischarge { get; set; }
/// <summary>
/// 一程港属类型（LOCATION-本港）
/// </summary>
public string FstTransferLocType { get; set; }
/// <summary>
/// 一程港属类型名称（LOCATION-本港）
/// </summary>
public string FstTransferLogTypeName { get; set; }
/// <summary>
/// 一程航线
/// </summary>
public string FstLaneName { get; set; }
/// <summary>
/// 二程运力类型（MAIN-干线，BRANCH-支线）
/// </summary>
public string SecShipCapacity { get; set; }
/// <summary>
/// 二程运力类型名称（MAIN-干线，BRANCH-支线）
/// </summary>
public string SecShipCapacityName { get; set; }
/// <summary>
/// 二程ETD
/// </summary>
public Nullable<DateTime> SecETD { get; set; }
/// <summary>
/// 二程船名
/// </summary>
public string SecVessel { get; set; }
/// <summary>
/// 二程航次号
/// </summary>
public string SecVoyno { get; set; }
/// <summary>
/// 二程装货港代码
/// </summary>
public string SecPortLoadCode { get; set; }
/// <summary>
/// 二程装货港名称
/// </summary>
public string SecPortLoad { get; set; }
/// <summary>
/// 二程卸货港代码
/// </summary>
public string SecPortDischargeCode { get; set; }
/// <summary>
/// 二程卸货港名称
/// </summary>
public string SecPortDischarge { get; set; }
/// <summary>
/// 二程港属类型（LOCATION-本港）
/// </summary>
public string SecTransferLocType { get; set; }
/// <summary>
/// 二程港属类型名称（LOCATION-本港）
/// </summary>
public string SecTransferLogTypeName { get; set; }
/// <summary>
/// 二程航线
/// </summary>
public string SecLaneName { get; set; }
/// <summary>
/// 三程运力类型（MAIN-干线，BRANCH-支线）
/// </summary>
public string ThdShipCapacity { get; set; }
/// <summary>
/// 三程运力类型名称（MAIN-干线，BRANCH-支线）
/// </summary>
public string ThdShipCapacityName { get; set; }
/// <summary>
/// 三程ETD
/// </summary>
public Nullable<DateTime> ThdETD { get; set; }
/// <summary>
/// 三程船名
/// </summary>
public string ThdVessel { get; set; }
/// <summary>
/// 三程航次号
/// </summary>
public string ThdVoyno { get; set; }
/// <summary>
/// 三程装货港代码
/// </summary>
public string ThdPortLoadCode { get; set; }
/// <summary>
/// 三程装货港名称
/// </summary>
public string ThdPortLoad { get; set; }
/// <summary>
/// 三程卸货港代码
/// </summary>
public string ThdPortDischargeCode { get; set; }
/// <summary>
/// 三程卸货港名称
/// </summary>
public string ThdPortDischarge { get; set; }
/// <summary>
/// 三程港属类型（LOCATION-本港）
/// </summary>
public string ThdTransferLocType { get; set; }
/// <summary>
/// 三程港属类型名称（LOCATION-本港）
/// </summary>
public string ThdTransferLogTypeName { get; set; }
/// <summary>
/// 三程航线
/// </summary>
public string ThdLaneName { get; set; }
}
}

Write Preview
Loading…
Cancel
Save