Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

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
+{
+    /// <summary>
+    /// 任务截止时间变更通知
+    /// </summary>
+    [SugarTable("task_cut_date_change")]
+    [Description("任务截止时间变更通知")]
+    public class TaskCutDateChangeInfo : TaskManageDbEntity
+    {
+        /// <summary>
+        /// 任务主键
+        /// </summary>
+        public string TASK_ID { get; set; }
+
+        /// <summary>
+        /// 主提单号
+        /// </summary>
+        public string MBLNO { get; set; }
+
+        /// <summary>
+        /// 船名
+        /// </summary>
+        public string VESSEL { get; set; }
+
+        /// <summary>
+        /// 航次
+        /// </summary>
+        public string VOYNO { get; set; }
+
+        /// <summary>
+        /// 样单截止日期
+        /// </summary>
+        public Nullable<DateTime> SI_CUT_DATE { get; set; }
+
+        /// <summary>
+        /// 样单截止日期文本
+        /// </summary>
+        public string SI_CUT_DATE_TXT { get; set; }
+
+        /// <summary>
+        /// 截港时间
+        /// </summary>
+        public Nullable<DateTime> CY_CUTOFF_TIME { get; set; }
+
+        /// <summary>
+        /// 截港时间文本
+        /// </summary>
+        public string CY_CUTOFF_TIME_TXT { get; set; }
+
+        /// <summary>
+        /// 舱单截止时间
+        /// </summary>
+        public Nullable<DateTime> MANIFEST_CUT_DATE { get; set; }
+
+        /// <summary>
+        /// 舱单截止时间文本
+        /// </summary>
+        public string MANIFEST_CUT_DATE_TXT { get; set; }
+
+        /// <summary>
+        /// MDGF提交截止时间
+        /// </summary>
+        public Nullable<DateTime> MDGF_CUT_DATE { get; set; }
+
+        /// <summary>
+        /// MDGF提交截止时间文本
+        /// </summary>
+        public string MDGF_CUT_DATE_TXT { get; set; }
+
+        /// <summary>
+        /// 截VGM时间
+        /// </summary>
+        public Nullable<DateTime> VGM_CUT_DATE { get; set; }
+
+        /// <summary>
+        /// 截VGM时间文本
+        /// </summary>
+        public string VGM_CUT_DATE_TXT { get; set; }
+
+        /// <summary>
+        /// 截关时间
+        /// </summary>
+        public Nullable<DateTime> CLOSING_DATE { get; set; }
+
+        /// <summary>
+        /// 截关时间文本
+        /// </summary>
+        public string CLOSING_DATE_TXT { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string REMARK { get; set; }
+    }
+}

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
+{
+    /// <summary>
+    /// 任务预甩货明细
+    /// </summary>
+    [SugarTable("task_rolling_nomination_detail")]
+    [Description("任务预甩货明细")]
+    public class TaskRollingNominationDetailInfo : TaskManageDbEntity
+    {
+        /// <summary>
+        /// 预甩船主键
+        /// </summary>
+        public string NOM_SHIP_ID { get; set; }
+
+        /// <summary>
+        /// 父主键
+        /// </summary>
+        public string NOM_ID { get; set; }
+
+        /// <summary>
+        /// 预甩状态描述
+        /// </summary>
+        public string NOM_STATUS_NOTE { get; set; }
+
+        /// <summary>
+        /// 订舱抬头
+        /// </summary>
+        public string BOOKED_BY { get; set; }
+
+        /// <summary>
+        /// 合约抬头
+        /// </summary>
+        public string CONTRACTUAL_NAME { get; set; }
+
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string SHIPMENT { get; set; }
+
+        /// <summary>
+        /// 集装箱号
+        /// </summary>
+        public string EQUIPMENT_NUMBER { get; set; }
+
+        /// <summary>
+        /// 集装箱尺码
+        /// </summary>
+        public string EQU_SIZE { get; set; }
+
+        /// <summary>
+        /// 集装箱类型
+        /// </summary>
+        public string CONTAINER_TYPE { get; set; }
+
+        /// <summary>
+        /// 集装箱高
+        /// </summary>
+        public string CONTAINER_HEIGHT { get; set; }
+
+        /// <summary>
+        /// TEU箱量 1-40尺，0.5-20尺
+        /// </summary>
+        public Nullable<decimal> FEE { get; set; }
+
+        /// <summary>
+        /// 箱型代码
+        /// </summary>
+        public string CTNCODE { get; set; }
+
+        /// <summary>
+        /// 箱型
+        /// </summary>
+        public string CTNALL { get; set; }
+
+        /// <summary>
+        /// 箱量
+        /// </summary>
+        public int CTNNUM { get; set; }
+
+        /// <summary>
+        /// 货重
+        /// </summary>
+        public Nullable<decimal> WEIGHT { get; set; }
+
+        /// <summary>
+        /// 收货地
+        /// </summary>
+        public string PLACEOF_RECEIPT { get; set; }
+
+        /// <summary>
+        /// 装货港名称
+        /// </summary>
+        public string LOADPORT_NAME { get; set; }
+
+        /// <summary>
+        /// 卸货港名称
+        /// </summary>
+        public string DISCHARGEPORT_NAME { get; set; }
+
+        /// <summary>
+        /// 交货地名称
+        /// </summary>
+        public string PLACEOF_DELIVERY { get; set; }
+
+        /// <summary>
+        /// 联系邮件
+        /// </summary>
+        public string BBYMAIL { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string REMARK { get; set; }
+    }
+}

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
+{
+    /// <summary>
+    /// 任务预甩货通知
+    /// </summary>
+    [SugarTable("task_rolling_nomination")]
+    [Description("任务预甩货通知")]
+    public class TaskRollingNominationInfo : TaskManageDbEntity
+    {
+        /// <summary>
+        /// 任务主键
+        /// </summary>
+        public string TASK_ID { get; set; }
+
+        /// <summary>
+        /// 计划类型 Rolling-预甩货,Transfer-中转预甩
+        /// </summary>
+        public string PLAN_TYPE { get; set; }
+
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        public string BATCH_NO { get; set;}
+
+        /// <summary>
+        /// 船公司代号
+        /// </summary>
+        public string CARRIERID { get; set; }
+
+        /// <summary>
+        /// 船公司
+        /// </summary>
+        public string CARRIER { get; set; }
+
+        /// <summary>
+        /// 最后确认期限日期
+        /// </summary>
+        public Nullable<DateTime> CONFIRM_DEAD_LINE { get; set; }
+
+        /// <summary>
+        /// 解析生成日期
+        /// </summary>
+        public Nullable<DateTime> READ_CREATE_TIME { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string REMARK { get; set; }
+    }
+}

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
+{
+    /// <summary>
+    /// 任务预甩货船信息
+    /// </summary>
+    [SugarTable("task_rolling_nomination_ship")]
+    [Description("任务预甩货船信息")]
+    public class TaskRollingNominationShipInfo : TaskManageDbEntity
+    {
+        /// <summary>
+        /// 任务主键
+        /// </summary>
+        public string TASK_ID { get; set; }
+
+        /// <summary>
+        /// 父主键
+        /// </summary>
+        public string NOM_ID { get; set; }
+
+        /// <summary>
+        /// 船类型 From-原船,To-换船
+        /// </summary>
+        public string SHIP_TYPE { get; set; }
+
+        /// <summary>
+        /// 船代码
+        /// </summary>
+        public string SHIP_STRING { get; set; }
+
+        /// <summary>
+        /// 船名代码(船公司)
+        /// </summary>
+        public string VSL_CODE { get; set; }
+
+        /// <summary>
+        /// 船名
+        /// </summary>
+        public string VESSEL { get; set; }
+
+        /// <summary>
+        /// 航次
+        /// </summary>
+        public string VOYNO { get; set; }
+
+        /// <summary>
+        /// 装货港名称
+        /// </summary>
+        public string PORT { get; set; }
+
+        /// <summary>
+        /// 装货码头
+        /// </summary>
+        public string TERMINAL { get; set; }
+
+        /// <summary>
+        /// 预计离港时间
+        /// </summary>
+        public Nullable<DateTime> ETD { get; set; }
+
+        /// <summary>
+        /// 样单截止日期
+        /// </summary>
+        public Nullable<DateTime> SI_CUT_DATE { get; set; }
+
+        /// <summary>
+        /// 截港时间
+        /// </summary>
+        public Nullable<DateTime> CY_CUTOFF_TIME { get; set; }
+
+        /// <summary>
+        /// 截VGM时间
+        /// </summary>
+        public Nullable<DateTime> VGM_CUTOFF_TIME { get; set; }
+
+        /// <summary>
+        /// 截凭证时间
+        /// </summary>
+        public Nullable<DateTime> VOUCHER_CUT_DATE { get; set; }
+
+        /// <summary>
+        /// 截关时间
+        /// </summary>
+        public Nullable<DateTime> CLOSING_DATE { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string REMARK { get; set; }
+    }
+}

Myshipping.Application/Enum/TaskBaseTypeEnum.cs

@@ -135,6 +135,17 @@ namespace Myshipping.Application
         /// 截止时间变更通知
         /// </summary>
         [Description("截止时间变更")]
-        CUT_MODIFY
+        CUT_MODIFY,
+        /// <summary>
+        /// Rolling Nomination(预甩货通知)
+        /// </summary>
+        [Description("RollingNomination")]
+        ROLLING_NOMINATION,
+        /// <summary>
+        /// Transfer Nomination(预甩货通知)
+        /// </summary>
+        [Description("TransferNomination")]
+        TRANSFER_NOMINATION
+
     }
 }

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
+{
+    /// <summary>
+    /// 截止时间变更通知
+    /// </summary>
+    public class TaskCutDateChangeDto
+    {
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        public string BatchNo { get; set; }
+
+        /// <summary>
+        /// 船公司代号
+        /// </summary>
+        public string CarrierId { get; set; }
+
+        /// <summary>
+        /// 船公司
+        /// </summary>
+        public string Carrier { get; set; }
+
+        /// <summary>
+        /// 明细
+        /// </summary>
+        public List<CutDateChangeDetailDto> Details { get; set; }
+
+        /// <summary>
+        /// 生成时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+    }
+
+    /// <summary>
+    /// 截止时间变更通知明细
+    /// </summary>
+    public class CutDateChangeDetailDto
+    {
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string MBLNo { get; set; }
+
+        /// <summary>
+        /// 船名
+        /// </summary>
+        public string Vessel { get; set; }
+
+        /// <summary>
+        /// 航次
+        /// </summary>
+        public string VoyNo { get; set; }
+
+        /// <summary>
+        /// 样单截止日期
+        /// </summary>
+        public Nullable<DateTime> SICutDate { get; set; }
+
+        /// <summary>
+        /// 样单截止日期文本
+        /// </summary>
+        public string SICutDateTxt { get; set; }
+
+        /// <summary>
+        /// 开港时间
+        /// </summary>
+        public Nullable<DateTime> CYOpenDate { get; set; }
+
+        /// <summary>
+        /// 开港时间文本
+        /// </summary>
+        public string CYOpenDateTxt { get; set; }
+
+        /// <summary>
+        /// 截港时间
+        /// </summary>
+        public Nullable<DateTime> CYCutoffTime { get; set; }
+
+        /// <summary>
+        /// 截港时间文本
+        /// </summary>
+        public string CYCutoffTimeTxt { get; set; }
+
+        /// <summary>
+        /// 舱单截止时间(舱单-入港清单截止时间)
+        /// </summary>
+        public Nullable<DateTime> ManifestCutDate { get; set; }
+
+        /// <summary>
+        /// 舱单截止时间文本(舱单-入港清单截止时间)
+        /// </summary>
+        public string ManifestCutDateTxt { get; set; }
+
+        /// <summary>
+        /// MDGF提交截止时间(MDGF提交截止时间-危险品货物)
+        /// </summary>
+        public Nullable<DateTime> MDGFCutDate { get; set; }
+
+        /// <summary>
+        /// MDGF提交截止时间文本(MDGF提交截止时间-危险品货物)
+        /// </summary>
+        public string MDGFCutDateTxt { get; set; }
+
+        /// <summary>
+        /// 截VGM时间(船代VGM截止时间)
+        /// </summary>
+        public Nullable<DateTime> VGMCutoffTime { get; set; }
+
+        /// <summary>
+        /// 截VGM时间文本(船代VGM截止时间)
+        /// </summary>
+        public string VGMCutoffTimeTxt { get; set; }
+
+        /// <summary>
+        /// 截关时间 海关放行截止时间(Customs Clearance Deadline)
+        /// </summary>
+        public Nullable<DateTime> ClosingDate { get; set; }
+
+        /// <summary>
+        /// 截关时间文本 海关放行截止时间(Customs Clearance Deadline)
+        /// </summary>
+        public string ClosingDateTxt { get; set; }
+    }
+}

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
+{
+    /// <summary>
+    /// 预甩货通知
+    /// </summary>
+    public class TaskRollingNominationDto
+    {
+        /// <summary>
+        /// 计划类型（Rolling-预甩货 Transfer-中转预甩）
+        /// </summary>
+        public string PlanType { get; set; }
+
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        public string BatchNo { get; set; }
+
+        /// <summary>
+        /// 船公司代号
+        /// </summary>
+        public string CarrierId { get; set; }
+
+        /// <summary>
+        /// 船公司
+        /// </summary>
+        public string Carrier { get; set; }
+
+        /// <summary>
+        /// 最后确认期限日期
+        /// </summary>
+        public Nullable<DateTime> ConfirmDeadLine { get; set; }
+
+        /// <summary>
+        /// 原船记录
+        /// </summary>
+        public TaskRollingNominationShipDto From { get; set; }
+
+        /// <summary>
+        /// 换船记录
+        /// </summary>
+        public List<TaskRollingNominationShipDto> ToDetail { get; set; }
+
+        /// <summary>
+        /// 换船明细
+        /// </summary>
+        public List<TaskRollingNominationShipDetailDto> NominationList { get; set; }
+
+        /// <summary>
+        /// 生成时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+    }
+
+    public class TaskRollingNominationShipDto : TaskRollingNominationShipBaseDto
+    {
+
+    }
+
+    /// <summary>
+    /// 船详情
+    /// </summary>
+    public class TaskRollingNominationShipBaseDto
+    {
+        /// <summary>
+        /// 船类型（From-原船 To-换船）
+        /// </summary>
+        public string ShipType { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ShipString { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string VslCode { get; set; }
+
+        /// <summary>
+        /// 船名
+        /// </summary>
+        public string Vessel { get; set; }
+
+        /// <summary>
+        /// 航次
+        /// </summary>
+        public string VoyNo { get; set; }
+
+        /// <summary>
+        /// 港口
+        /// </summary>
+        public string Port { get; set; }
+
+        /// <summary>
+        /// 码头
+        /// </summary>
+        public string Terminal { get; set; }
+
+        /// <summary>
+        /// 预计到港时间
+        /// </summary>
+        public Nullable<DateTime> ETD { get; set; }
+
+        /// <summary>
+        /// 样单截止日期
+        /// </summary>
+        public Nullable<DateTime> SICutDate { get; set; }
+
+        /// <summary>
+        /// 截港时间
+        /// </summary>
+        public Nullable<DateTime> CYCutoffTime { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<DateTime> VoucherCutDate { get; set; }
+
+        /// <summary>
+        /// 截VGM时间(船代VGM截止时间)
+        /// </summary>
+        public Nullable<DateTime> VGMCutoffTime { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<DateTime> CLPNCLCutDate { get; set; }
+    }
+
+
+    public class TaskRollingNominationShipDetailDto
+    {
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string Status { get; set; }
+
+        /// <summary>
+        /// 订舱抬头
+        /// </summary>
+        public string Bookedby { get; set; }
+
+        /// <summary>
+        /// 订舱抬头
+        /// </summary>
+        public string ContractualName { get; set; }
+
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string Shipment { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        public string EquipmentNumber { get; set; }
+
+        /// <summary>
+        /// 箱型尺寸
+        /// </summary>
+        public string EquSize { get; set; }
+
+        /// <summary>
+        /// 集装箱类型
+        /// </summary>
+        public string ContainerType { get; set; }
+
+        /// <summary>
+        /// 集装箱高度
+        /// </summary>
+        public string ContainerHeight { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> FFE { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> Weight { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string PlaceOfReceipt { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string LoadPortName { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string DischargePortName { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string PlaceOfDelivery { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string BBYMAIL { get; set; }
+    }
+}