diff --git a/ds-wms-service/DS.WMS.Core/Op/Templates/CutoffDetailMSK.cshtml b/ds-wms-service/DS.WMS.Core/Op/Templates/CutoffDetailMSK.cshtml index d21e7a9e..8794b25d 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Templates/CutoffDetailMSK.cshtml +++ b/ds-wms-service/DS.WMS.Core/Op/Templates/CutoffDetailMSK.cshtml @@ -1,4 +1,4 @@ -@* @model DS.WMS.Core.Op.Entity.MailTemplateModel *@ +@model DS.WMS.Core.Op.Entity.MailTemplateModel @{ var item = Model.Primary; } @@ -25,39 +25,81 @@ -

Please kindly note SI/Voucher/CY cut-off change of ALS @item.Vessel/@item.Voyno, bookings were arranged below:

- - - - - - - - - - - - -
ShipmentContainerLoad PortETBETD
- - - - -

Reason: #Reason#

-

New SI cut-off: #SICutDate#

-

New VGM Submission Deadline: #VGMCutDate#

-

New Closing Time of CY cut-off: #CYCutDate#

-

New Closing Time of Voucher cut: #VoucherCutDate#

-

New CY Open Date: #CYOpenDate#

-

请注意,以上开仓日期仅供参考,为避免产生额外费用,请参考码头网站信息、约定免费时间或其他标准协议时间,并按相应时间提箱、还柜.

+

Please kindly note SI/Voucher/CY cut-off change of @item.Vessel/@item.Voyno, bookings were arranged below:

+ @if (Model.Primary.PortloadArea == "SOUTH_PORT") + { + + + + + + + + + + + + + + + + + +
ShipmentContainerLoad PortETBETD
@item.MBLNo@item.ContaNo@item.LoadPort@(item.ETB.HasValue ? item.ETB.Value.ToString("yyyy-MM-dd HH:mm") : "")@(item.ETD.HasValue ? item.ETD.Value.ToString("yyyy-MM-dd HH:mm") : "")
+ + + + +

Reason: @item.Reason

+

New SI cut-off: @(item.SICutDate.HasValue ? item.SICutDate.Value.ToString("yyyy-MM-dd HH:mm") : "")

+

New VGM Submission Deadline: @(item.VGMCutoffTime.HasValue ? item.VGMCutoffTime.Value.ToString("yyyy-MM-dd HH:mm") : "")

+

New Closing Time of CY cut-off: @(item.CYCutoffTime.HasValue ? item.CYCutoffTime.Value.ToString("yyyy-MM-dd HH:mm") : "")

+

New Closing Time of Voucher cut: @(item.VoucherCutoffTime.HasValue ? item.VoucherCutoffTime.Value.ToString("yyyy-MM-dd HH:mm") : "")

+

New CY Open Date: @(item.CYOpenDate.HasValue ? item.CYOpenDate.Value.ToString("yyyy-MM-dd HH:mm") : "")

+

请注意,以上开仓日期仅供参考,为避免产生额外费用,请参考码头网站信息、约定免费时间或其他标准协议时间,并按相应时间提箱、还柜.

+ + + } + else + { + + + + + + + + + + + + + + + + + + + + + + + + + + +
Shipment NumberVessel - voyage样单截止时间 SI Cut Off开港时间 CY Open截港时间 CY cut off舱单-入港清单截止时间MDGF提交截止时间 - 危险品货物船代VGM截止时间海关放行截止时间(Customs Clearance Deadline)
@item.MBLNo@item.Vessel/@item.VoyNo@(item.SICutDate.HasValue ? item.SICutDate.Value.ToString("yyyy-MM-dd HH:mm") : item.SICutDateTxt)@(item.CYOpenDate.HasValue ? item.CYOpenDate.Value.ToString("yyyy-MM-dd HH:mm") : item.CYOpenDateTxt)@(item.CYCutoffTime.HasValue ? item.CYCutoffTime.Value.ToString("yyyy-MM-dd HH:mm") : item.CYCutoffTimeTxt)@(item.ManifestCutDate.HasValue ? item.ManifestCutDate.Value.ToString("yyyy-MM-dd HH:mm") : item.ManifestCutDateTxt)@(item.MDGFCutDate.HasValue ? item.MDGFCutDate.Value.ToString("yyyy-MM-dd HH:mm") : item.MDGFCutDateTxt)@(item.VGMCutoffTime.HasValue ? item.VGMCutoffTime.Value.ToString("yyyy-MM-dd HH:mm") : item.VGMCutoffTimeTxt)@(item.ClosingDate.HasValue ? item.ClosingDate.Value.ToString("yyyy-MM-dd HH:mm") : item.ClosingDateTxt)
+ + + }

对于出口至埃及或加蓬但由非MSK船舶承运:

1)如是危险品, 提单样本截止时间与MDGF截止时间一致

2)如是冷箱和/或其他特种柜货物, 提单样本截止时间与最晚提箱时间保持一致。

-

In case you’re exporting DG shipment, MDGF deadline will be indicated on new booking confirmation which will be sent to you within 8working hours.

+

In case you’re exporting DG shipment, MDGF deadline will be indicated on new booking confirmation which will be sent to you within 8 working hours.

diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/CutDateChange/TaskCutDateChangeShowDto.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/CutDateChange/TaskCutDateChangeShowDto.cs index 4e295f7d..6ffbc6ab 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/CutDateChange/TaskCutDateChangeShowDto.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/CutDateChange/TaskCutDateChangeShowDto.cs @@ -11,6 +11,16 @@ namespace DS.WMS.Core.TaskPlat.Dtos /// public class TaskCutDateChangeShowDto { + /// + /// 装货港区域 NORTH_PORT-华北港口 SOUTH-华南港口 + /// + public string PortloadArea { get; set; } + + /// + /// 订单ID + /// + public long BookingId { get; set; } + /// /// 提单号 ///