1

ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/VW_CM_RentOneWay_NeedRentRes.cs

@@ -17,112 +17,170 @@ public class VW_CM_RentOneWay_NeedRentRes
     /// 主键Id
     /// </summary>
     public long Id { get; set; }
+    /// <summary>
+    /// 租箱业务id
+    /// </summary>
+    public long Pid { get; set; }
+
+    /// <summary>
+    /// Desc:租箱业务号
+    /// </summary>
+    public string? Billno { get; set; }
 
     /// <summary>
     /// Desc:箱号
     /// </summary>
-    public string Cntrno { get; set; }
+    public string? Cntrno { get; set; }
     /// <summary>
     /// 箱型代码
     /// </summary>
-    public string CtnCode { get; set; }
+    public string? CtnCode { get; set; }
     /// <summary>
     /// Desc:箱型
     /// </summary>
-    public string Ctnall { get; set; }
+    public string? Ctnall { get; set; }
 
     /// <summary>
-    /// Desc:箱主Id
+    /// Desc:原箱主Id
     /// </summary>
-    public long CtnOwnerId { get; set; }
+    public long? OldContainerOwnerId { get; set; }
     /// <summary>
-    /// Desc:箱主
+    /// Desc:原箱主
     /// </summary>
-    public string CtnOwner { get; set; }
+    public string? OldContainerOwner { get; set; }
+
+
 
     /// <summary>
-    /// Desc:是否上线id(是否管理中)
+    /// Desc:租箱业务方向Id
     /// </summary>
-    public CM_IsOnlineEnum? IsOnlineId { get; set; } = 0;
+    public CMRentDirectEnum? RentDirectId { get; set; }
     /// <summary>
-    /// Desc:是否上线(是否管理中)
+    /// Desc:租箱业务方向 
     /// </summary>
-    public string IsOnline => IsOnlineId?.GetDescription();
+    public string? RentDirect => RentDirectId?.EnumDescription();
+
+
     /// <summary>
-    /// Desc:箱来源Id:  自有箱/短租租入/长租租入/买箱
+    /// Desc:租箱类型Id 长租1 短租0 单程2 
     /// </summary>
-    public CM_CtnSourceEnum? CtnSourceId { get; set; }
+    public CMRentTypeEnum? RentTypeId { get; set; }
     /// <summary>
-    /// Desc:箱来源:  自有箱/短租租入/长租租入/买箱
+    /// Desc:租箱业务方向 
     /// </summary>
-    public string CtnSource => CtnSourceId?.GetDescription();
+    public string? RentType => RentTypeId?.EnumDescription();
 
     /// <summary>
-    /// Desc:箱业务状态id: 短租租出 长租租出 单程 卖箱
+    /// Desc:业务状态
     /// </summary>
-    public CM_CtnBizStateEnum? CtnBizStateId { get; set; }
+    //public string? BillState { get; set; }
+
+
+    /// <summary>
+    /// Desc:关联放箱单号
+    /// </summary>
+    public string? CtnReleaseNo { get; set; }
+
+
+    /// <summary>
+    /// Desc:租入日期 
+    /// </summary>
+    public DateTime? Bsdate { get; set; }
+
+    /// <summary>
+    /// Desc:开始计费日期
+    /// </summary>
+    public DateTime? FeeStartDate { get; set; }
+
     /// <summary>
-    /// Desc:箱业务状态: 短租租出 长租租出 单程 卖箱
+    /// Desc:币别
     /// </summary>
-    public string CtnBizState => CtnBizStateId?.GetDescription();
+    public string Currency { get; set; } = "USD";
+
+
     /// <summary>
+    /// Desc:日租金
+    /// </summary>
+    public decimal? DailyRate { get; set; } = 0M;
+
+
     /// <summary>
-    /// Desc:箱状态Id 
+    /// Desc:提箱费
     /// </summary>
-    public CMCtnStateEnum? CtnStateId { get; set; }
+    public decimal? PickupFee { get; set; } = 0M;
     /// <summary>
-    /// Desc:箱状态 
+    /// Desc:提箱日期
     /// </summary>
-    public string CtnState => CtnStateId?.GetDescription();
+    public DateTime? PickupDate { get; set; }
 
     /// <summary>
-    /// Desc:箱流转状态Id
+    /// Desc:还箱费
     /// </summary>
-    public CMCtnFlowStateEnum? CtnFlowStateId { get; set; }
+    public decimal? DropoffFee { get; set; } = 0M;
+
+
     /// <summary>
-    /// Desc:箱流转状态 
+    /// Desc:还箱日期
     /// </summary>
-    public string CtnFlowState => CtnFlowStateId?.GetDescription();
+    public DateTime? DropoffDate { get; set; }
+
+
+    /// <summary>
+    /// Desc:提箱港口代码
+    /// </summary>
+    public long? PickupPortid { get; set; }
     /// <summary>
-    /// Desc:当前港口代码
+    /// Desc:提箱港口五字码
     /// </summary>
-    public long? Portid { get; set; }
+    public string PickupPortCode { get; set; }
 
     /// <summary>
-    /// Desc:当前港口五字码
+    /// Desc:提箱港口
     /// </summary>
-    public string PortCode { get; set; }
+    public string? PickupPort { get; set; }
 
     /// <summary>
-    /// Desc:当前港口
+    /// Desc:还箱港口代码
     /// </summary>
-    public string Port { get; set; }
+    public long? DropoffPortid { get; set; }
+    /// <summary>
+    /// Desc:还箱港口五字码
+    /// </summary>
+    public string DropoffPortCode { get; set; }
+    /// <summary>
+    /// Desc:还箱港口
+    /// </summary>
+    public string? DropoffPort { get; set; }
 
     /// <summary>
     /// Desc:业务编号/提单号
     /// </summary>
-    public string Mblno { get; set; }
+    public string? Mblno { get; set; }
 
     /// <summary>
     /// Desc:船名航次
     /// </summary>
-    public string VesselVoyno { get; set; }
+    public string? VesselVoyno { get; set; }
+
 
     /// <summary>
-    /// 状态时间
+    /// Desc:是否上线id(是否管理中)
     /// </summary>
-    public DateTime StateTime { get; set; }
+    public CM_IsOnlineEnum? IsOnlineId { get; set; } = 0;
 
     /// <summary>
-    /// 创建时间
+    /// 箱主Id
     /// </summary>
-    public DateTime CreateTime { get; set; }
-
+    public long CtnOwnerId { get; set; }
     /// <summary>
-    /// Desc:关联放箱单号
+    /// Desc:箱主
     /// </summary>
-    public string? CtnReleaseNo { get; set; }
+    public string CtnOwner { get; set; }
 
+    /// <summary>
+    /// Desc:箱业务状态id: 短租租出 长租租出 单程 卖箱
+    /// </summary>
+    public CM_CtnBizStateEnum? CtnBizStateId { get; set; }
     /// <summary>
     /// 备注
     /// </summary>