diff --git a/Myshipping.Application/Entity/TaskManagePlat/TaskCutDateChangeInfo.cs b/Myshipping.Application/Entity/TaskManagePlat/TaskCutDateChangeInfo.cs new file mode 100644 index 00000000..09b5ee35 --- /dev/null +++ b/Myshipping.Application/Entity/TaskManagePlat/TaskCutDateChangeInfo.cs @@ -0,0 +1,104 @@ +using Myshipping.Application.Entity; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application +{ + /// + /// 任务截止时间变更通知 + /// + [SugarTable("task_cut_date_change")] + [Description("任务截止时间变更通知")] + public class TaskCutDateChangeInfo : TaskManageDbEntity + { + /// + /// 任务主键 + /// + public string TASK_ID { get; set; } + + /// + /// 主提单号 + /// + public string MBLNO { get; set; } + + /// + /// 船名 + /// + public string VESSEL { get; set; } + + /// + /// 航次 + /// + public string VOYNO { get; set; } + + /// + /// 样单截止日期 + /// + public Nullable SI_CUT_DATE { get; set; } + + /// + /// 样单截止日期文本 + /// + public string SI_CUT_DATE_TXT { get; set; } + + /// + /// 截港时间 + /// + public Nullable CY_CUTOFF_TIME { get; set; } + + /// + /// 截港时间文本 + /// + public string CY_CUTOFF_TIME_TXT { get; set; } + + /// + /// 舱单截止时间 + /// + public Nullable MANIFEST_CUT_DATE { get; set; } + + /// + /// 舱单截止时间文本 + /// + public string MANIFEST_CUT_DATE_TXT { get; set; } + + /// + /// MDGF提交截止时间 + /// + public Nullable MDGF_CUT_DATE { get; set; } + + /// + /// MDGF提交截止时间文本 + /// + public string MDGF_CUT_DATE_TXT { get; set; } + + /// + /// 截VGM时间 + /// + public Nullable VGM_CUT_DATE { get; set; } + + /// + /// 截VGM时间文本 + /// + public string VGM_CUT_DATE_TXT { get; set; } + + /// + /// 截关时间 + /// + public Nullable CLOSING_DATE { get; set; } + + /// + /// 截关时间文本 + /// + public string CLOSING_DATE_TXT { get; set; } + + /// + /// 备注 + /// + public string REMARK { get; set; } + } +} diff --git a/Myshipping.Application/Entity/TaskManagePlat/TaskRollingNominationDetailInfo.cs b/Myshipping.Application/Entity/TaskManagePlat/TaskRollingNominationDetailInfo.cs new file mode 100644 index 00000000..e5942dfc --- /dev/null +++ b/Myshipping.Application/Entity/TaskManagePlat/TaskRollingNominationDetailInfo.cs @@ -0,0 +1,124 @@ +using Myshipping.Application.Entity; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application +{ + /// + /// 任务预甩货明细 + /// + [SugarTable("task_rolling_nomination_detail")] + [Description("任务预甩货明细")] + public class TaskRollingNominationDetailInfo : TaskManageDbEntity + { + /// + /// 预甩船主键 + /// + public string NOM_SHIP_ID { get; set; } + + /// + /// 父主键 + /// + public string NOM_ID { get; set; } + + /// + /// 预甩状态描述 + /// + public string NOM_STATUS_NOTE { get; set; } + + /// + /// 订舱抬头 + /// + public string BOOKED_BY { get; set; } + + /// + /// 合约抬头 + /// + public string CONTRACTUAL_NAME { get; set; } + + /// + /// 提单号 + /// + public string SHIPMENT { get; set; } + + /// + /// 集装箱号 + /// + public string EQUIPMENT_NUMBER { get; set; } + + /// + /// 集装箱尺码 + /// + public string EQU_SIZE { get; set; } + + /// + /// 集装箱类型 + /// + public string CONTAINER_TYPE { get; set; } + + /// + /// 集装箱高 + /// + public string CONTAINER_HEIGHT { get; set; } + + /// + /// TEU箱量 1-40尺，0.5-20尺 + /// + public Nullable FEE { get; set; } + + /// + /// 箱型代码 + /// + public string CTNCODE { get; set; } + + /// + /// 箱型 + /// + public string CTNALL { get; set; } + + /// + /// 箱量 + /// + public int CTNNUM { get; set; } + + /// + /// 货重 + /// + public Nullable WEIGHT { get; set; } + + /// + /// 收货地 + /// + public string PLACEOF_RECEIPT { get; set; } + + /// + /// 装货港名称 + /// + public string LOADPORT_NAME { get; set; } + + /// + /// 卸货港名称 + /// + public string DISCHARGEPORT_NAME { get; set; } + + /// + /// 交货地名称 + /// + public string PLACEOF_DELIVERY { get; set; } + + /// + /// 联系邮件 + /// + public string BBYMAIL { get; set; } + + /// + /// 备注 + /// + public string REMARK { get; set; } + } +} diff --git a/Myshipping.Application/Entity/TaskManagePlat/TaskRollingNominationInfo.cs b/Myshipping.Application/Entity/TaskManagePlat/TaskRollingNominationInfo.cs new file mode 100644 index 00000000..02b03d96 --- /dev/null +++ b/Myshipping.Application/Entity/TaskManagePlat/TaskRollingNominationInfo.cs @@ -0,0 +1,59 @@ +using Myshipping.Application.Entity; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application +{ + /// + /// 任务预甩货通知 + /// + [SugarTable("task_rolling_nomination")] + [Description("任务预甩货通知")] + public class TaskRollingNominationInfo : TaskManageDbEntity + { + /// + /// 任务主键 + /// + public string TASK_ID { get; set; } + + /// + /// 计划类型 Rolling-预甩货,Transfer-中转预甩 + /// + public string PLAN_TYPE { get; set; } + + /// + /// 批次号 + /// + public string BATCH_NO { get; set;} + + /// + /// 船公司代号 + /// + public string CARRIERID { get; set; } + + /// + /// 船公司 + /// + public string CARRIER { get; set; } + + /// + /// 最后确认期限日期 + /// + public Nullable CONFIRM_DEAD_LINE { get; set; } + + /// + /// 解析生成日期 + /// + public Nullable READ_CREATE_TIME { get; set; } + + /// + /// 备注 + /// + public string REMARK { get; set; } + } +} diff --git a/Myshipping.Application/Entity/TaskManagePlat/TaskRollingNominationShipInfo.cs b/Myshipping.Application/Entity/TaskManagePlat/TaskRollingNominationShipInfo.cs new file mode 100644 index 00000000..58799128 --- /dev/null +++ b/Myshipping.Application/Entity/TaskManagePlat/TaskRollingNominationShipInfo.cs @@ -0,0 +1,99 @@ +using Myshipping.Application.Entity; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application +{ + /// + /// 任务预甩货船信息 + /// + [SugarTable("task_rolling_nomination_ship")] + [Description("任务预甩货船信息")] + public class TaskRollingNominationShipInfo : TaskManageDbEntity + { + /// + /// 任务主键 + /// + public string TASK_ID { get; set; } + + /// + /// 父主键 + /// + public string NOM_ID { get; set; } + + /// + /// 船类型 From-原船,To-换船 + /// + public string SHIP_TYPE { get; set; } + + /// + /// 船代码 + /// + public string SHIP_STRING { get; set; } + + /// + /// 船名代码(船公司) + /// + public string VSL_CODE { get; set; } + + /// + /// 船名 + /// + public string VESSEL { get; set; } + + /// + /// 航次 + /// + public string VOYNO { get; set; } + + /// + /// 装货港名称 + /// + public string PORT { get; set; } + + /// + /// 装货码头 + /// + public string TERMINAL { get; set; } + + /// + /// 预计离港时间 + /// + public Nullable ETD { get; set; } + + /// + /// 样单截止日期 + /// + public Nullable SI_CUT_DATE { get; set; } + + /// + /// 截港时间 + /// + public Nullable CY_CUTOFF_TIME { get; set; } + + /// + /// 截VGM时间 + /// + public Nullable VGM_CUTOFF_TIME { get; set; } + + /// + /// 截凭证时间 + /// + public Nullable VOUCHER_CUT_DATE { get; set; } + + /// + /// 截关时间 + /// + public Nullable CLOSING_DATE { get; set; } + + /// + /// 备注 + /// + public string REMARK { get; set; } + } +} diff --git a/Myshipping.Application/Enum/TaskBaseTypeEnum.cs b/Myshipping.Application/Enum/TaskBaseTypeEnum.cs index 2d5e23a6..5cf03a2c 100644 --- a/Myshipping.Application/Enum/TaskBaseTypeEnum.cs +++ b/Myshipping.Application/Enum/TaskBaseTypeEnum.cs @@ -135,6 +135,17 @@ namespace Myshipping.Application /// 截止时间变更通知 /// [Description("截止时间变更")] - CUT_MODIFY + CUT_MODIFY, + /// + /// Rolling Nomination(预甩货通知) + /// + [Description("RollingNomination")] + ROLLING_NOMINATION, + /// + /// Transfer Nomination(预甩货通知) + /// + [Description("TransferNomination")] + TRANSFER_NOMINATION + } } diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/CutDateChange/TaskCutDateChangeDto.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/CutDateChange/TaskCutDateChangeDto.cs new file mode 100644 index 00000000..77eb230b --- /dev/null +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/CutDateChange/TaskCutDateChangeDto.cs @@ -0,0 +1,130 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application.Service.TaskManagePlat.Dtos +{ + /// + /// 截止时间变更通知 + /// + public class TaskCutDateChangeDto + { + /// + /// 批次号 + /// + public string BatchNo { get; set; } + + /// + /// 船公司代号 + /// + public string CarrierId { get; set; } + + /// + /// 船公司 + /// + public string Carrier { get; set; } + + /// + /// 明细 + /// + public List Details { get; set; } + + /// + /// 生成时间 + /// + public DateTime CreateTime { get; set; } + } + + /// + /// 截止时间变更通知明细 + /// + public class CutDateChangeDetailDto + { + /// + /// 提单号 + /// + public string MBLNo { get; set; } + + /// + /// 船名 + /// + public string Vessel { get; set; } + + /// + /// 航次 + /// + public string VoyNo { get; set; } + + /// + /// 样单截止日期 + /// + public Nullable SICutDate { get; set; } + + /// + /// 样单截止日期文本 + /// + public string SICutDateTxt { get; set; } + + /// + /// 开港时间 + /// + public Nullable CYOpenDate { get; set; } + + /// + /// 开港时间文本 + /// + public string CYOpenDateTxt { get; set; } + + /// + /// 截港时间 + /// + public Nullable CYCutoffTime { get; set; } + + /// + /// 截港时间文本 + /// + public string CYCutoffTimeTxt { get; set; } + + /// + /// 舱单截止时间(舱单-入港清单截止时间) + /// + public Nullable ManifestCutDate { get; set; } + + /// + /// 舱单截止时间文本(舱单-入港清单截止时间) + /// + public string ManifestCutDateTxt { get; set; } + + /// + /// MDGF提交截止时间(MDGF提交截止时间-危险品货物) + /// + public Nullable MDGFCutDate { get; set; } + + /// + /// MDGF提交截止时间文本(MDGF提交截止时间-危险品货物) + /// + public string MDGFCutDateTxt { get; set; } + + /// + /// 截VGM时间(船代VGM截止时间) + /// + public Nullable VGMCutoffTime { get; set; } + + /// + /// 截VGM时间文本(船代VGM截止时间) + /// + public string VGMCutoffTimeTxt { get; set; } + + /// + /// 截关时间 海关放行截止时间(Customs Clearance Deadline) + /// + public Nullable ClosingDate { get; set; } + + /// + /// 截关时间文本 海关放行截止时间(Customs Clearance Deadline) + /// + public string ClosingDateTxt { get; set; } + } +} diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/Nomination/TaskRollingNominationDto.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/Nomination/TaskRollingNominationDto.cs new file mode 100644 index 00000000..215b11c3 --- /dev/null +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/Nomination/TaskRollingNominationDto.cs @@ -0,0 +1,215 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application +{ + /// + /// 预甩货通知 + /// + public class TaskRollingNominationDto + { + /// + /// 计划类型（Rolling-预甩货 Transfer-中转预甩） + /// + public string PlanType { get; set; } + + /// + /// 批次号 + /// + public string BatchNo { get; set; } + + /// + /// 船公司代号 + /// + public string CarrierId { get; set; } + + /// + /// 船公司 + /// + public string Carrier { get; set; } + + /// + /// 最后确认期限日期 + /// + public Nullable ConfirmDeadLine { get; set; } + + /// + /// 原船记录 + /// + public TaskRollingNominationShipDto From { get; set; } + + /// + /// 换船记录 + /// + public List ToDetail { get; set; } + + /// + /// 换船明细 + /// + public List NominationList { get; set; } + + /// + /// 生成时间 + /// + public DateTime CreateTime { get; set; } + + } + + public class TaskRollingNominationShipDto : TaskRollingNominationShipBaseDto + { + + } + + /// + /// 船详情 + /// + public class TaskRollingNominationShipBaseDto + { + /// + /// 船类型（From-原船 To-换船） + /// + public string ShipType { get; set; } + + /// + /// + /// + public string ShipString { get; set; } + + /// + /// + /// + public string VslCode { get; set; } + + /// + /// 船名 + /// + public string Vessel { get; set; } + + /// + /// 航次 + /// + public string VoyNo { get; set; } + + /// + /// 港口 + /// + public string Port { get; set; } + + /// + /// 码头 + /// + public string Terminal { get; set; } + + /// + /// 预计到港时间 + /// + public Nullable ETD { get; set; } + + /// + /// 样单截止日期 + /// + public Nullable SICutDate { get; set; } + + /// + /// 截港时间 + /// + public Nullable CYCutoffTime { get; set; } + + /// + /// + /// + public Nullable VoucherCutDate { get; set; } + + /// + /// 截VGM时间(船代VGM截止时间) + /// + public Nullable VGMCutoffTime { get; set; } + + /// + /// + /// + public Nullable CLPNCLCutDate { get; set; } + } + + + public class TaskRollingNominationShipDetailDto + { + /// + /// 状态 + /// + public string Status { get; set; } + + /// + /// 订舱抬头 + /// + public string Bookedby { get; set; } + + /// + /// 订舱抬头 + /// + public string ContractualName { get; set; } + + /// + /// 提单号 + /// + public string Shipment { get; set; } + + /// + /// 箱号 + /// + public string EquipmentNumber { get; set; } + + /// + /// 箱型尺寸 + /// + public string EquSize { get; set; } + + /// + /// 集装箱类型 + /// + public string ContainerType { get; set; } + + /// + /// 集装箱高度 + /// + public string ContainerHeight { get; set; } + + /// + /// + /// + public Nullable FFE { get; set; } + + /// + /// + /// + public Nullable Weight { get; set; } + + /// + /// + /// + public string PlaceOfReceipt { get; set; } + + /// + /// + /// + public string LoadPortName { get; set; } + + /// + /// + /// + public string DischargePortName { get; set; } + + /// + /// + /// + public string PlaceOfDelivery { get; set; } + + /// + /// + /// + public string BBYMAIL { get; set; } + } +}